diff options
author | Bruno Haible <bruno@clisp.org> | 2020-04-10 15:57:10 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2020-04-10 15:57:10 +0200 |
commit | 7b1de4a62f8766787160f785217671b074e0f0f2 (patch) | |
tree | 59c80ebdaa034f40c9bbf8d8a3f71b3f1d054d34 | |
parent | 242644e7d7ab831b2d0c138bcad21d6b2758fbcc (diff) | |
download | gnulib-7b1de4a62f8766787160f785217671b074e0f0f2.tar.gz |
findprog, relocatable-prog: Ignore directories during PATH search.
Reported by Frederick Eaton via Dmitry Goncharov in
<https://lists.gnu.org/archive/html/bug-gnulib/2020-03/msg00003.html>.
* lib/findprog.c (find_in_path): When the file found in a PATH element
is a directory, continue searching.
* modules/findprog (Depends-on): Add sys_stat, stat.
* modules/findprog-lgpl (Depends-on): Likewise.
* lib/progreloc.c (maybe_executable): When the file found in a PATH
element is a directory, continue searching.
* lib/relocwrapper.c: Update comments.
* modules/relocatable-prog-wrapper (Files): Add m4/largefile.m4.
(configure.ac-early): New section.
-rw-r--r-- | ChangeLog | 17 | ||||
-rw-r--r-- | lib/findprog.c | 38 | ||||
-rw-r--r-- | lib/progreloc.c | 20 | ||||
-rw-r--r-- | lib/relocwrapper.c | 7 | ||||
-rw-r--r-- | modules/findprog | 2 | ||||
-rw-r--r-- | modules/findprog-lgpl | 2 | ||||
-rw-r--r-- | modules/relocatable-prog-wrapper | 4 |
7 files changed, 64 insertions, 26 deletions
@@ -1,5 +1,22 @@ 2020-04-10 Bruno Haible <bruno@clisp.org> + findprog, relocatable-prog: Ignore directories during PATH search. + Reported by Frederick Eaton via Dmitry Goncharov in + <https://lists.gnu.org/archive/html/bug-gnulib/2020-03/msg00003.html>. + + * lib/findprog.c (find_in_path): When the file found in a PATH element + is a directory, continue searching. + * modules/findprog (Depends-on): Add sys_stat, stat. + * modules/findprog-lgpl (Depends-on): Likewise. + + * lib/progreloc.c (maybe_executable): When the file found in a PATH + element is a directory, continue searching. + * lib/relocwrapper.c: Update comments. + * modules/relocatable-prog-wrapper (Files): Add m4/largefile.m4. + (configure.ac-early): New section. + +2020-04-10 Bruno Haible <bruno@clisp.org> + MODULES.html.sh: Support for reproducible builds from git-less tarballs. Reported by Bernhard M. Wiedemann <bwiedemann@suse.de> in <https://lists.gnu.org/archive/html/bug-gnulib/2020-03/msg00061.html>. diff --git a/lib/findprog.c b/lib/findprog.c index d0d41791e2..b562e9da6a 100644 --- a/lib/findprog.c +++ b/lib/findprog.c @@ -25,6 +25,9 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#if !(defined _WIN32 || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__) +# include <sys/stat.h> +#endif /* Avoid collision between findprog.c and findprog-lgpl.c. */ #if IN_FINDPROG_LGPL || ! GNULIB_FINDPROG_LGPL @@ -105,22 +108,29 @@ find_in_path (const char *progname) design flaw. */ if (eaccess (progpathname, X_OK) == 0) { - /* Found! */ - if (strcmp (progpathname, progname) == 0) + /* Check that the progpathname does not point to a directory. */ + struct stat statbuf; + + if (stat (progpathname, &statbuf) >= 0 + && ! S_ISDIR (statbuf.st_mode)) { - free (progpathname); - - /* Add the "./" prefix for real, that xconcatenated_filename() - optimized away. This avoids a second PATH search when the - caller uses execlp/execvp. */ - progpathname = XNMALLOC (2 + strlen (progname) + 1, char); - progpathname[0] = '.'; - progpathname[1] = '/'; - memcpy (progpathname + 2, progname, strlen (progname) + 1); + /* Found! */ + if (strcmp (progpathname, progname) == 0) + { + free (progpathname); + + /* Add the "./" prefix for real, that xconcatenated_filename() + optimized away. This avoids a second PATH search when the + caller uses execlp/execvp. */ + progpathname = XNMALLOC (2 + strlen (progname) + 1, char); + progpathname[0] = '.'; + progpathname[1] = '/'; + memcpy (progpathname + 2, progname, strlen (progname) + 1); + } + + free (path); + return progpathname; } - - free (path); - return progpathname; } free (progpathname); diff --git a/lib/progreloc.c b/lib/progreloc.c index b555211317..45be1ca5a4 100644 --- a/lib/progreloc.c +++ b/lib/progreloc.c @@ -154,7 +154,7 @@ static int executable_fd = -1; /* Define this function only when it's needed. */ #if !(defined WINDOWS_NATIVE || defined __EMX__) -/* Tests whether a given pathname may belong to the executable. */ +/* Tests whether a given filename may belong to the executable. */ static bool maybe_executable (const char *filename) { @@ -173,18 +173,20 @@ maybe_executable (const char *filename) struct stat statfile; if (fstat (executable_fd, &statexe) >= 0) - { - if (stat (filename, &statfile) < 0) - return false; - if (!(statfile.st_dev + return (stat (filename, &statfile) >= 0 + && statfile.st_dev && statfile.st_dev == statexe.st_dev - && statfile.st_ino == statexe.st_ino)) - return false; - } + && statfile.st_ino == statexe.st_ino); } # endif - return true; + /* Check that the filename does not point to a directory. */ + { + struct stat statfile; + + return (stat (filename, &statfile) >= 0 + && ! S_ISDIR (statfile.st_mode)); + } } #endif diff --git a/lib/relocwrapper.c b/lib/relocwrapper.c index dfe7e4f1fa..e3dc197dca 100644 --- a/lib/relocwrapper.c +++ b/lib/relocwrapper.c @@ -19,14 +19,15 @@ relocwrapper -> progname -> progreloc + -> stat + -> filename + -> pathmax + -> verify -> areadlink -> careadlinkat -> allocator -> readlink -> stat - -> filename - -> pathmax - -> verify -> canonicalize-lgpl -> filename -> malloca diff --git a/modules/findprog b/modules/findprog index d48158b791..b5f3c20d51 100644 --- a/modules/findprog +++ b/modules/findprog @@ -9,9 +9,11 @@ m4/eaccess.m4 Depends-on: stdbool +sys_stat xalloc xconcat-filename access +stat unistd configure.ac: diff --git a/modules/findprog-lgpl b/modules/findprog-lgpl index 477eccb003..3c56f0245d 100644 --- a/modules/findprog-lgpl +++ b/modules/findprog-lgpl @@ -10,9 +10,11 @@ m4/eaccess.m4 Depends-on: stdbool +sys_stat strdup concat-filename access +stat unistd configure.ac: diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper index 3cc3d76a45..f97fdae656 100644 --- a/modules/relocatable-prog-wrapper +++ b/modules/relocatable-prog-wrapper @@ -25,6 +25,7 @@ lib/relocatable.c lib/setenv.c lib/c-ctype.h lib/c-ctype.c +m4/largefile.m4 m4/malloca.m4 m4/canonicalize.m4 m4/eealloc.m4 @@ -50,6 +51,9 @@ string verify xalloc-oversized +configure.ac-early: +AC_REQUIRE([AC_SYS_LARGEFILE]) + configure.ac: AC_REQUIRE([AC_C_RESTRICT]) gl_FUNC_READLINK_SEPARATE |