projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: make Include sections of modules consistent
[gnulib.git]
/
lib
/
findprog.c
diff --git
a/lib/findprog.c
b/lib/findprog.c
index
568c934
..
b064245
100644
(file)
--- a/
lib/findprog.c
+++ b/
lib/findprog.c
@@
-1,11
+1,11
@@
/* Locating a program in PATH.
/* Locating a program in PATH.
- Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006
-2008
Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
@@
-27,8
+26,13
@@
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-#include "xalloc.h"
-#include "pathname.h"
+/* Avoid collision between findprog.c and findprog-lgpl.c. */
+#if IN_FINDPROG_LGPL || ! GNULIB_FINDPROG_LGPL
+
+#if !IN_FINDPROG_LGPL
+# include "xalloc.h"
+#endif
+#include "concat-filename.h"
const char *
const char *
@@
-42,7
+46,7
@@
find_in_path (const char *progname)
#else
/* Unix */
char *path;
#else
/* Unix */
char *path;
- char *
dir
;
+ char *
path_rest
;
char *cp;
if (strchr (progname, '/') != NULL)
char *cp;
if (strchr (progname, '/') != NULL)
@@
-57,14
+61,23
@@
find_in_path (const char *progname)
return progname;
/* Make a copy, to prepare for destructive modifications. */
return progname;
/* Make a copy, to prepare for destructive modifications. */
+# if !IN_FINDPROG_LGPL
path = xstrdup (path);
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. */
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';
@@
-74,7
+87,17
@@
find_in_path (const char *progname)
dir = ".";
/* Concatenate dir and progname. */
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
/* On systems which have the eaccess() system call, let's use it.
On other systems, let's hope that this program is not installed
@@
-87,10
+110,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
xconcatenated_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);
@@
-111,3
+134,5
@@
find_in_path (const char *progname)
return progname;
#endif
}
return progname;
#endif
}
+
+#endif