X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=pwhich;h=262dc838553b1a370621ce1443330718f0736182;hp=30d4c67cc8c724a9e483235b5b0e77c90390f087;hb=3dc97c2465315fa4952e9a2e23dd68f2982a723d;hpb=4d874edda2413f8fc160092ffa29e3432e8a4704

diff --git a/pwhich b/pwhich
index 30d4c67..262dc83 100755
--- a/pwhich
+++ b/pwhich
@@ -7,14 +7,17 @@ for PROGRAM in "$@"; do
  IFS=:
  case $PROGRAM in
   */*)
-   if [ -x "$PROGRAM" ]; then
+   if [ -f "$PROGRAM" ] && [ -x "$PROGRAM" ]; then
     printf '%s\n' "$PROGRAM"
     RET=0
    fi
    ;;
   *)
    for ELEMENT in $PATH; do
-    if [ -x "$ELEMENT/$PROGRAM" ]; then
+    if [ -z "$ELEMENT" ]; then
+     ELEMENT=.
+    fi
+    if [ -f "$ELEMENT/$PROGRAM" ] && [ -x "$ELEMENT/$PROGRAM" ]; then
      printf '%s\n' "$ELEMENT/$PROGRAM"
      RET=0
      break