mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 10:54:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixincludes: don't abort() on access failure [PR103306]

Browse Source 
Some distro may ship dangling symlinks in include directories, triggers
the access failure.  Skip it and continue to next header instead of
being to panic.

Restore to old behavior before r12-5234 but without resurrecting the
problematic getcwd() call, by using the environment variable "INPUT"
exported by fixinc.sh.

Tested on x86_64-linux-gnu, with a dangling symlink intentionally
injected into /usr/include.

fixincludes/

	PR bootstrap/103306
	* fixincl.c (process): Don't call abort().
This commit is contained in:
Xi Ruoyao 2021-11-18 18:46:12 +08:00
parent d6024c85a1
commit 3363022ed8
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fixincludes/fixincl.c
View File

@ -1352,10 +1352,19 @@ process (void)
if (access (pz_curr_file, R_OK) != 0) if (access (pz_curr_file, R_OK) != 0)
{ {
/* Some really strange error happened. */ /* It may happens if for e. g. the distro ships some broken symlinks
fprintf (stderr, "Cannot access %s: %s\n", pz_curr_file, in /usr/include. */
/* "INPUT" is exported in fixinc.sh, which is the pwd where fixincl
runs. It's used instead of getcwd to avoid allocating a buffer
with unknown length. */
const char *cwd = getenv ("INPUT");
if (!cwd)
cwd = "the working directory";
fprintf (stderr, "Cannot access %s from %s: %s\n", pz_curr_file, cwd,
xstrerror (errno)); xstrerror (errno));
abort (); return;
} }
pz_curr_data = load_file (pz_curr_file); pz_curr_data = load_file (pz_curr_file);