X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=pwhich;h=ebb54c3aed93520b14ca87a0d92e5103bb7661d6;hp=47aa80cbad326c2c5d404769188de1d5c873aded;hb=c750295af1ae879b6aa974bd750cd101eb54fc12;hpb=9b218e3408d6544bfce111bfe48746b9444285c6

diff --git a/pwhich b/pwhich
old mode 100644
new mode 100755
index 47aa80c..ebb54c3
--- a/pwhich
+++ b/pwhich
@@ -1,16 +1,30 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 RET=1
 for PROGRAM in "$@"; do
  IFS_SAVE="$IFS"
  IFS=:
- for ELEMENT in $PATH; do
-  if [ -f "$ELEMENT/$PROGRAM" -a -x "$ELEMENT/$PROGRAM" ]; then
-   echo "$ELEMENT/$PROGRAM"
-   RET=0
-   break
-  fi
- done
+ case $PROGRAM in
+  */*)
+   if [ -x "$PROGRAM" ]; then
+    printf '%s\n' "$PROGRAM"
+    RET=0
+   fi
+   ;;
+  *)
+   for ELEMENT in $PATH; do
+    if [ -z "$ELEMENT" ]; then
+     ELEMENT=.
+    fi
+    if [ -f "$ELEMENT/$PROGRAM" ] && [ -x "$ELEMENT/$PROGRAM" ]; then
+     printf '%s\n' "$ELEMENT/$PROGRAM"
+     RET=0
+     break
+    fi
+   done
+   ;;
+ esac
  IFS="$IFS_SAVE"
 done