X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=pwhich;h=262dc838553b1a370621ce1443330718f0736182;hp=bf877c20768eae669dd968e53684157ff15f6c31;hb=b238980e7533a97a6e14c1fdbc7f4da91e924001;hpb=56cdeb76285342e9d07f847e6df9868821e9bd3f

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