/* 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.
- 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
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 <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 *
return progname;
/* Make a copy, to prepare for destructive modifications. */
+# if !IN_FINDPROG_LGPL
path = xstrdup (path);
+# else
+ path = strdup (path);
+ if (path == NULL)
+ /* Out of memory. */
+ return progname;
+# endif
for (path_rest = path; ; path_rest = cp + 1)
{
const char *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
{
free (progpathname);
- /* Add the "./" prefix for real, that concatenated_pathname()
+ /* Add the "./" prefix for real, that xconcatenated_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);
return progname;
#endif
}
+
+#endif