X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffindprog.c;h=5cb697f2ec76b157429953f4f4fca1879202f279;hb=533101a268dc5015a140ff4695d8eeb04fbe57b6;hp=48c3edf6c5c9227d50e71b72964bff16880b291b;hpb=3964b40991c1676eb0a982a1e93d57224663cc17;p=gnulib.git

diff --git a/lib/findprog.c b/lib/findprog.c
index 48c3edf6c..5cb697f2e 100644
--- a/lib/findprog.c
+++ b/lib/findprog.c
@@ -1,11 +1,11 @@
 /* Locating a program in PATH.
-   Copyright (C) 2001-2003 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
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,13 +13,10 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "findprog.h"
@@ -27,27 +24,29 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+/* Avoid collision between findprog.c and findprog-lgpl.c.  */
+#if IN_FINDPROG_LGPL || ! GNULIB_FINDPROG_LGPL
 
-#include "xalloc.h"
-#include "pathname.h"
+#if !IN_FINDPROG_LGPL
+# include "xalloc.h"
+#endif
+#include "concat-filename.h"
 
 
 const char *
 find_in_path (const char *progname)
 {
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* 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;
 #else
   /* Unix */
   char *path;
-  char *dir;
+  char *path_rest;
   char *cp;
 
   if (strchr (progname, '/') != NULL)
@@ -62,53 +61,72 @@ find_in_path (const char *progname)
     return progname;
 
   /* Make a copy, to prepare for destructive modifications.  */
+# if !IN_FINDPROG_LGPL
   path = xstrdup (path);
-  for (dir = path; ; dir = cp + 1)
+# else
+  path = strdup (path);
+  if (path == NULL)
+    /* Out of memory.  */
+    return progname;
+# endif
+  for (path_rest = path; ; path_rest = cp + 1)
     {
+      const char *dir;
       bool last;
       char *progpathname;
 
       /* Extract next directory in PATH.  */
-      for (cp = dir; *cp != '\0' && *cp != ':'; cp++)
-	;
+      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.  */
-      progpathname = concatenated_pathname (dir, progname, NULL);
+# if !IN_FINDPROG_LGPL
+      progpathname = xconcatenated_filename (dir, progname, NULL);
+# else
+      progpathname = concatenated_filename (dir, progname, NULL);
+      if (progpathname == NULL)
+        {
+          /* 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 concatenated_pathname()
-		 optimized away.  This avoids a second PATH search when the
-		 caller uses execlp/execvp.  */
-	      progpathname = xmalloc (2 + strlen (progname) + 1);
-	      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.  */
@@ -116,3 +134,5 @@ find_in_path (const char *progname)
   return progname;
 #endif
 }
+
+#endif