system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

posix: accept inode 0 is a valid inode number (BZ #19971)

Browse Source 
According to this kernel commit 2adc376c55194, d_ino 0 is a regular inode
number on Linux (which also matches POSIX, as it does not treat the value
as special).  This patch makes glob accept is a valid inode number.

This is also a sync with gnulib commit c8e57c1.

Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.

	[BZ #1062]
	[BZ #19971]
	* posix/glob.c (struct readdir_result): Remove skip_entry member.
	(readdir_result_skip_entry, D_INO_TO_RESULT): Remove.
	All uses removed.
This commit is contained in:
Adhemerval Zanella 2017-09-04 14:55:25 -03:00
parent c66c908230
commit 686f2ea183
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2017-09-08 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2017-09-08 Adhemerval Zanella <adhemerval.zanella@linaro.org>
[BZ #1062]
[BZ #19971]
* posix/glob.c (struct readdir_result): Remove skip_entry member.
(readdir_result_skip_entry, D_INO_TO_RESULT): Remove.
All uses removed.
[BZ #1062] [BZ #1062]
* posix/Makefile (routines): Add globfree, globfree64, and * posix/Makefile (routines): Add globfree, globfree64, and
glob_pattern_p. glob_pattern_p.

21
posix/glob.c
View File

@ -113,9 +113,6 @@ struct readdir_result
#if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE #if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE
dirent_type type; dirent_type type;
#endif #endif
#if defined _LIBC || defined D_INO_IN_DIRENT
bool skip_entry;
#endif
}; };
/* Initialize and return type member of struct readdir_result. */ /* Initialize and return type member of struct readdir_result. */
@ -131,28 +128,12 @@ readdir_result_type (struct readdir_result d)
#endif #endif
} }
/* Initialize and return skip_entry member of struct readdir_result. */
static bool
readdir_result_skip_entry (struct readdir_result d)
{
/* Initializer for skip_entry. POSIX does not require that the d_ino
field be present, and some systems do not provide it. */
#if defined _LIBC || defined D_INO_IN_DIRENT
# define D_INO_TO_RESULT(source) (source)->d_ino == 0,
return d.skip_entry;
#else
# define D_INO_TO_RESULT(source)
return false;
#endif
}
/* Construct an initializer for a struct readdir_result object from a /* Construct an initializer for a struct readdir_result object from a
struct dirent *. No copy of the name is made. */ struct dirent *. No copy of the name is made. */
#define READDIR_RESULT_INITIALIZER(source) \ #define READDIR_RESULT_INITIALIZER(source) \
{ \ { \
source->d_name, \ source->d_name, \
D_TYPE_TO_RESULT (source) \ D_TYPE_TO_RESULT (source) \
D_INO_TO_RESULT (source) \
} }
/* Call gl_readdir on STREAM. This macro can be overridden to reduce /* Call gl_readdir on STREAM. This macro can be overridden to reduce
@ -1542,8 +1523,6 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
} }
if (d.name == NULL) if (d.name == NULL)
break; break;
if (readdir_result_skip_entry (d))
continue;
/* If we shall match only directories use the information /* If we shall match only directories use the information
provided by the dirent call if possible. */ provided by the dirent call if possible. */