espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-06 07:28:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

* source.c (is_regular_file): New arg errno_ptr.

Browse Source 
gdb/ChangeLog:

	* source.c (is_regular_file): New arg errno_ptr.
	All callers updated.

gdb/testsuite/ChangeLog:

	* gdb.base/bad-file.exp: New file.
This commit is contained in:
Doug Evans
2016-04-19 09:01:44 -07:00
parent 73e6209fae
commit a55411b9ff
4 changed files with 92 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gdb/source.c
View File

@ -685,9 +685,12 @@ source_info (char *ignore, int from_tty)
}
/* Return True if the file NAME exists and is a regular file. */
/* Return True if the file NAME exists and is a regular file.
If the result is false then *ERRNO_PTR is set to a useful value assuming
we're expecting a regular file. */
static int
is_regular_file (const char *name)
is_regular_file (const char *name, int *errno_ptr)
{
struct stat st;
const int status = stat (name, &st);
@ -698,9 +701,21 @@ is_regular_file (const char *name)
on obscure systems where stat does not work as expected. */
if (status != 0)
return (errno != ENOENT);
{
if (errno != ENOENT)
return 1;
*errno_ptr = ENOENT;
return 0;
}
return S_ISREG (st.st_mode);
if (S_ISREG (st.st_mode))
return 1;
if (S_ISDIR (st.st_mode))
*errno_ptr = EISDIR;
else
*errno_ptr = EINVAL;
return 0;
}
/* Open a file named STRING, searching path PATH (dir names sep by some char)
@ -775,22 +790,23 @@ openp (const char *path, int opts, const char *string,
if ((opts & OPF_TRY_CWD_FIRST) || IS_ABSOLUTE_PATH (string))
{
int i;
int i, reg_file_errno;
if (is_regular_file (string))
if (is_regular_file (string, &reg_file_errno))
{
filename = (char *) alloca (strlen (string) + 1);
strcpy (filename, string);
fd = gdb_open_cloexec (filename, mode, 0);
if (fd >= 0)
goto done;
last_errno = errno;
}
else
{
filename = NULL;
fd = -1;
last_errno = reg_file_errno;
}
last_errno = errno;
if (!(opts & OPF_SEARCH_IN_PATH))
for (i = 0; string[i]; i++)
@ -821,6 +837,7 @@ openp (const char *path, int opts, const char *string,
for (ix = 0; VEC_iterate (char_ptr, dir_vec, ix, dir); ++ix)
{
size_t len = strlen (dir);
int reg_file_errno;
if (strcmp (dir, "$cwd") == 0)
{
@ -879,13 +896,15 @@ openp (const char *path, int opts, const char *string,
strcat (filename + len, SLASH_STRING);
strcat (filename, string);
if (is_regular_file (filename))
if (is_regular_file (filename, &reg_file_errno))
{
fd = gdb_open_cloexec (filename, mode, 0);
if (fd >= 0)
break;
last_errno = errno;
}
else
last_errno = reg_file_errno;
}
do_cleanups (back_to);