sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

glob: sparse fixes 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2010-10-15 08:22:22 +02:00
parent 278ca6847f
commit e7ef703f07
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/glob.c
View File

@ -100,11 +100,8 @@ const __ptr_t b;
`glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
Otherwise, `glob' returns zero. */
int glob(pattern, flags, errfunc, pglob)
const char *pattern;
int flags;
int (*errfunc) __P((const char *, int));
glob_t *pglob;
int glob(const char *pattern, int flags,
int (*errfunc) __P((const char *, int)), glob_t *pglob)
{
const char *filename;
char *dirname = NULL;
@ -171,7 +168,7 @@ glob_t *pglob;
For each name we found, call glob_in_dir on it and FILENAME,
appending the results to PGLOB. */
for (i = 0; i < dirs.gl_pathc; ++i) {
int oldcount;
int oldcount1;
#ifdef SHELL
{
@ -186,7 +183,7 @@ glob_t *pglob;
}
#endif /* SHELL. */
oldcount = pglob->gl_pathc;
oldcount1 = pglob->gl_pathc;
status = glob_in_dir(filename, dirs.gl_pathv[i],
(flags | GLOB_APPEND) &
~GLOB_NOCHECK, errfunc, pglob);
@ -202,8 +199,8 @@ glob_t *pglob;
/* Stick the directory on the front of each name. */
prefix_array(dirs.gl_pathv[i],
&pglob->gl_pathv[oldcount],
pglob->gl_pathc - oldcount,
&pglob->gl_pathv[oldcount1],
pglob->gl_pathc - oldcount1,
flags & GLOB_MARK);
}
@ -286,11 +283,8 @@ out:
unless DIRNAME is just "/". Each old element of ARRAY is freed.
If ADD_SLASH is non-zero, allocate one character more than
necessary, so that a slash can be appended later. */
static int prefix_array(dirname, array, n, add_slash)
const char *dirname;
char **array;
size_t n;
int add_slash;
static int prefix_array(const char *dirname, char **array, size_t n,
int add_slash)
{
register size_t i;
size_t dirlen = strlen(dirname);
@ -319,12 +313,8 @@ int add_slash;
and matches are searched for in DIRECTORY.
The GLOB_NOSORT bit in FLAGS is ignored. No sorting is ever done.
The GLOB_APPEND flag is assumed to be set (always appends). */
static int glob_in_dir(pattern, directory, flags, errfunc, pglob)
const char *pattern;
const char *directory;
int flags;
int (*errfunc) __P((const char *, int));
glob_t *pglob;
static int glob_in_dir(const char *pattern, const char *directory,
int flags, int (*errfunc) __P((const char *, int)), glob_t *pglob)
{
__ptr_t stream;
@ -457,12 +447,10 @@ glob_t *pglob;
#endif /* CONFIG_FAKE_GLOB */
/* Free storage allocated in PGLOB by a previous `glob' call. */
void globfree(pglob)
register glob_t *pglob;
void globfree(glob_t *pglob)
{
if (pglob->gl_pathv != NULL) {
register int i =
pglob->gl_flags & GLOB_DOOFFS ? pglob->gl_offs : 0;
int i = pglob->gl_flags & GLOB_DOOFFS ? pglob->gl_offs : 0;
for (; i < pglob->gl_pathc; ++i)
if (pglob->gl_pathv[i] != NULL)
free((__ptr_t) pglob->gl_pathv[i]);