X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffindprog.c;h=5cb697f2ec76b157429953f4f4fca1879202f279;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=b064245a3ec5652473e9a42f964796e1c2cfe42a;hpb=30037de99a1d5ec038598f85121c27cd04d9deac;p=gnulib.git

diff --git a/lib/findprog.c b/lib/findprog.c
index b064245a3..5cb697f2e 100644
--- a/lib/findprog.c
+++ b/lib/findprog.c
@@ -1,5 +1,5 @@
 /* Locating a program in PATH.
-   Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -39,7 +39,7 @@ const char *
 find_in_path (const char *progname)
 {
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, Cygwin, OS/2, DOS */
+  /* Native Windows, Cygwin, OS/2, DOS */
   /* The searching rules with .COM, .EXE, .BAT, .CMD etc. suffixes are
      too complicated.  Leave it to the OS.  */
   return progname;
@@ -78,13 +78,13 @@ find_in_path (const char *progname)
       /* Extract next directory in PATH.  */
       dir = path_rest;
       for (cp = path_rest; *cp != '\0' && *cp != ':'; cp++)
-	;
+        ;
       last = (*cp == '\0');
       *cp = '\0';
 
       /* Empty PATH components designate the current directory.  */
       if (dir == cp)
-	dir = ".";
+        dir = ".";
 
       /* Concatenate dir and progname.  */
 # if !IN_FINDPROG_LGPL
@@ -92,41 +92,41 @@ find_in_path (const char *progname)
 # else
       progpathname = concatenated_filename (dir, progname, NULL);
       if (progpathname == NULL)
-	{
-	  /* Out of memory.  */
-	  free (path);
-	  return progname;
-	}
+        {
+          /* Out of memory.  */
+          free (path);
+          return progname;
+        }
 # endif
 
       /* On systems which have the eaccess() system call, let's use it.
-	 On other systems, let's hope that this program is not installed
-	 setuid or setgid, so that it is ok to call access() despite its
-	 design flaw.  */
+         On other systems, let's hope that this program is not installed
+         setuid or setgid, so that it is ok to call access() despite its
+         design flaw.  */
       if (eaccess (progpathname, X_OK) == 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;
-	}
+        {
+          /* 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);
 
       if (last)
-	break;
+        break;
     }
 
   /* Not found in PATH.  An error will be signalled at the first call.  */