X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffindprog.c;h=1535dcef0427bcaf2b02666d4560624374dcbc85;hb=3667f8e75409ce7df7bc3f561ddd8d03d5be39f2;hp=27eee3ba6b4cd07d3a8cdaf4e78e8e2ea405ab9c;hpb=222b0486b7db1b09293e05512873d633440efcb3;p=gnulib.git

diff --git a/lib/findprog.c b/lib/findprog.c
index 27eee3ba6..1535dcef0 100644
--- a/lib/findprog.c
+++ b/lib/findprog.c
@@ -1,5 +1,5 @@
 /* Locating a program in PATH.
-   Copyright (C) 2001-2004 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006 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
@@ -17,9 +17,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "findprog.h"
@@ -27,10 +25,7 @@
 #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"
@@ -47,7 +42,7 @@ find_in_path (const char *progname)
 #else
   /* Unix */
   char *path;
-  char *dir;
+  char *path_rest;
   char *cp;
 
   if (strchr (progname, '/') != NULL)
@@ -63,13 +58,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';