Revert my last commit, due to compilation errors.

1 files changed, 14 insertions, 21 deletions

diff --git a/lib/findprog.c b/lib/findprog.c
index d834301bd7..d0d41791e2 100644
--- a/lib/findprog.c
+++ b/lib/findprog.c
@@ -105,29 +105,22 @@ find_in_path (const char *progname)
          design flaw.  */
       if (eaccess (progpathname, X_OK) == 0)
         {
-          /* Check that the progpathname does not point to a directory.  */
-          struct stat statbuf;
-
-          if (stat (progpathname, &statbuf) >= 0
-              && ! S_ISDIR (statbuf.st_mode))
+          /* Found!  */
+          if (strcmp (progpathname, progname) == 0)
             {
-              /* Found!  */
-              if (strcmp (progpathname, progname) == 0)
-                {
-                  free (progpathname);
-
-                  /* Add the "./" prefix for real, that xconcatenated_filename()
-                     optimized away.  This avoids a second PATH search when the
-                     caller uses execlp/execvp.  */
-                  progpathname = XNMALLOC (2 + strlen (progname) + 1, char);
-                  progpathname[0] = '.';
-                  progpathname[1] = '/';
-                  memcpy (progpathname + 2, progname, strlen (progname) + 1);
-                }
-
-              free (path);
-              return progpathname;
+              free (progpathname);
+
+              /* Add the "./" prefix for real, that xconcatenated_filename()
+                 optimized away.  This avoids a second PATH search when the
+                 caller uses execlp/execvp.  */
+              progpathname = XNMALLOC (2 + strlen (progname) + 1, char);
+              progpathname[0] = '.';
+              progpathname[1] = '/';
+              memcpy (progpathname + 2, progname, strlen (progname) + 1);
             }
+
+          free (path);
+          return progpathname;
         }
 
       free (progpathname);