* lib/openat.c (rpl_openat):
Don’t assume O_RDONLY is disjoint from O_RDWR.
-2020-03-07 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.
- * lib/progreloc.c (maybe_executable): Likewise.
-
2020-03-07 Bruno Haible <bruno@clisp.org>
openat: Fix theoretically possible issue on GNU/Hurd.
design flaw. */
if (eaccess (progpathname, X_OK) == 0)
{
- /* Check that the progpathname does not point to a directory. */
- struct stat statbuf;
-
- if (stat (progpathname, &statbuf) >= 0
- && ! S_ISDIR (statbuf.st_mode))
+ /* Found! */
+ if (strcmp (progpathname, progname) == 0)
{
- /* 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 (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 (progpathname);
/* Define this function only when it's needed. */
#if !(defined WINDOWS_NATIVE || defined __EMX__)
-/* Tests whether a given filename may belong to the executable. */
+/* Tests whether a given pathname may belong to the executable. */
static bool
maybe_executable (const char *filename)
{
struct stat statfile;
if (fstat (executable_fd, &statexe) >= 0)
- return (stat (filename, &statfile) >= 0
- && statfile.st_dev
+ {
+ if (stat (filename, &statfile) < 0)
+ return false;
+ if (!(statfile.st_dev
&& statfile.st_dev == statexe.st_dev
- && statfile.st_ino == statexe.st_ino);
+ && statfile.st_ino == statexe.st_ino))
+ return false;
+ }
}
# endif
- /* Check that the filename does not point to a directory. */
- {
- struct stat statfile;
-
- return (stat (filename, &statfile) >= 0
- && ! S_ISDIR (statfile.st_mode));
- }
+ return true;
}
#endif