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

diff --git a/lib/findprog.c b/lib/findprog.c
index 48c3edf6c..3b8cd39bc 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-2007 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,24 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include "xalloc.h"
-#include "pathname.h"
+#include "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__
+  /* Win32, 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)
@@ -63,13 +57,15 @@ find_in_path (const char *progname)
 
   /* Make a copy, to prepare for destructive modifications.  */
   path = xstrdup (path);
-  for (dir = path; ; dir = cp + 1)
+  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';
@@ -79,7 +75,7 @@ find_in_path (const char *progname)
 	dir = ".";
 
       /* Concatenate dir and progname.  */
-      progpathname = concatenated_pathname (dir, progname, NULL);
+      progpathname = concatenated_filename (dir, progname, NULL);
 
       /* On systems which have the eaccess() system call, let's use it.
 	 On other systems, let's hope that this program is not installed
@@ -92,10 +88,10 @@ find_in_path (const char *progname)
 	    {
 	      free (progpathname);
 
-	      /* Add the "./" prefix for real, that concatenated_pathname()
+	      /* Add the "./" prefix for real, that concatenated_filename()
 		 optimized away.  This avoids a second PATH search when the
 		 caller uses execlp/execvp.  */
-	      progpathname = xmalloc (2 + strlen (progname) + 1);
+	      progpathname = XNMALLOC (2 + strlen (progname) + 1, char);
 	      progpathname[0] = '.';
 	      progpathname[1] = '/';
 	      memcpy (progpathname + 2, progname, strlen (progname) + 1);