mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Update.
2003-01-12 Ulrich Drepper <drepper@redhat.com> * io/ftw.c (process_entry): Use relative path when using chdir() to change direcoty after call to ftw_dir. * io/ftwtest-sh: Add test for relative path argument to nftw() with FTW_CHDIR option.
This commit is contained in:
13
io/ftw.c
13
io/ftw.c
@ -212,7 +212,7 @@ open_dir_stream (struct ftw_data *data, struct dir_data *dirp)
|
||||
{
|
||||
char *newp;
|
||||
bufsize += MAX (1024, 2 * this_len);
|
||||
newp = realloc (buf, bufsize);
|
||||
newp = (char *) realloc (buf, bufsize);
|
||||
if (newp == NULL)
|
||||
{
|
||||
/* No more memory. */
|
||||
@ -357,15 +357,8 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name,
|
||||
result = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Please note that we overwrite a slash. */
|
||||
data->dirbuf[data->ftw.base - 1] = '\0';
|
||||
|
||||
if (__chdir (data->dirbuf) < 0)
|
||||
result = -1;
|
||||
|
||||
data->dirbuf[data->ftw.base - 1] = '/';
|
||||
}
|
||||
if (__chdir ("..") < 0)
|
||||
result = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user