Commit Diff

Commit:
3a9f3a51ce25717813da7321d4771dca11a25af8
From:
Anselm R. Garbe <arg@suckless.org>
Date:
Message:
I agree with the race fix of JG, but I dislike the SUSV3-breaking find, and I don't care about PATH changes, keep it simple, stupid
Actions:
Patch | Tree
commit - 53e92b5c1797ae5d259942b0a3f20a63c1a02f1e
commit + 3a9f3a51ce25717813da7321d4771dca11a25af8
blob - 35690771c0cfb6634c08cc91d8237def091d33e7
blob + d0a32c5ef2494295ea0405f3aa1ce27cbbffd057
--- dmenu_path
+++ dmenu_path
@@ -1,26 +1,26 @@
-#!/bin/sh -f
+#!/bin/sh
 CACHE=$HOME/.dmenu_cache
 IFS=:
 
-qfind() {
-	find "$@" 2>/dev/null
+uptodate() {
+	test ! -f $CACHE && return 1
+	for dir in $PATH
+	do
+		test $dir -nt $CACHE && return 1
+	done
+	return 0
 }
 
-uptodate() {                                                                       
-	test -f $CACHE &&
-		test "$(echo "$PATH")" = "$(sed 1q "$CACHE")" &&
-		! qfind $PATH -maxdepth 0 -newer $CACHE >/dev/null
-}
-
 if ! uptodate
 then
-	{
-		echo "$PATH"
-		qfind $PATH -type f -maxdepth 1 '(' -perm -u+x -o -perm -g+x -o -perm -o+x ')' |
-			sed 's,.*/,,' | sort | uniq
-	}
-	mv $CACHE.$pid $CACHE
+	for dir in $PATH
+	do
+		for file in "$dir"/*
+		do
+			test -x "$file" && echo "${file##*/}"
+		done
+	done | sort | uniq > $CACHE.$$
+	mv $CACHE.$$ $CACHE
 fi
 
-tail -n +2 $CACHE
-
+cat $CACHE