projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Treat __strftime__ and __strfmon__ like __scanf__.
[gnulib.git]
/
lib
/
findprog.c
diff --git
a/lib/findprog.c
b/lib/findprog.c
index
48c3edf
..
1829197
100644
(file)
--- a/
lib/findprog.c
+++ b/
lib/findprog.c
@@
-1,5
+1,5
@@
/* Locating a program in PATH.
/* Locating a program in PATH.
- Copyright (C) 2001-200
3
Free Software Foundation, Inc.
+ Copyright (C) 2001-200
4, 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
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software; you can redistribute it and/or modify
@@
-14,12
+14,10
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
/* Specification. */
#include "findprog.h"
/* Specification. */
#include "findprog.h"
@@
-27,27
+25,24
@@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#include "xalloc.h"
#include "xalloc.h"
-#include "
path
name.h"
+#include "
file
name.h"
const char *
find_in_path (const char *progname)
{
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;
/* 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)
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);
/* 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. */
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';
;
last = (*cp == '\0');
*cp = '\0';
@@
-79,7
+76,7
@@
find_in_path (const char *progname)
dir = ".";
/* Concatenate dir and progname. */
dir = ".";
/* Concatenate dir and progname. */
- progpathname = concatenated_
path
name (dir, progname, NULL);
+ progpathname = concatenated_
file
name (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
/* 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
+89,10
@@
find_in_path (const char *progname)
{
free (progpathname);
{
free (progpathname);
- /* Add the "./" prefix for real, that concatenated_
path
name()
+ /* Add the "./" prefix for real, that concatenated_
file
name()
optimized away. This avoids a second PATH search when the
caller uses execlp/execvp. */
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);
progpathname[0] = '.';
progpathname[1] = '/';
memcpy (progpathname + 2, progname, strlen (progname) + 1);