Update.
2001-12-17 Ulrich Drepper <drepper@redhat.com> * io/ftw.c (ftw_dir): Handle inaccessibility of toplevel dir different than implemented in last patch. * io/bug-ftw3.c: Adjust test for changed handling of inaccessibility of toplevel dir.
This commit is contained in:
parent
0e24e73d6d
commit
46089c83d1
|
@ -1,3 +1,10 @@
|
||||||
|
2001-12-17 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* io/ftw.c (ftw_dir): Handle inaccessibility of toplevel dir
|
||||||
|
different than implemented in last patch.
|
||||||
|
* io/bug-ftw3.c: Adjust test for changed handling of
|
||||||
|
inaccessibility of toplevel dir.
|
||||||
|
|
||||||
2001-12-16 Roland McGrath <roland@frob.com>
|
2001-12-16 Roland McGrath <roland@frob.com>
|
||||||
|
|
||||||
* nss/nsswitch.c (__nss_next): Don't use __FUNCTION__ as literal.
|
* nss/nsswitch.c (__nss_next): Don't use __FUNCTION__ as literal.
|
||||||
|
|
|
@ -4,10 +4,13 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
static int cb_called;
|
||||||
|
|
||||||
static int
|
static int
|
||||||
cb (const char *fname, const struct stat *st, int flag)
|
cb (const char *fname, const struct stat *st, int flag)
|
||||||
{
|
{
|
||||||
printf ("%s %d\n", fname, flag);
|
printf ("%s %d\n", fname, flag);
|
||||||
|
cb_called = 1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,7 +18,9 @@ int
|
||||||
main (void)
|
main (void)
|
||||||
{
|
{
|
||||||
char tmp[] = "/tmp/ftwXXXXXX";
|
char tmp[] = "/tmp/ftwXXXXXX";
|
||||||
|
char tmp2[] = "/tmp/ftwXXXXXX/ftwXXXXXX";
|
||||||
char *dname;
|
char *dname;
|
||||||
|
char *dname2;
|
||||||
int r;
|
int r;
|
||||||
int e;
|
int e;
|
||||||
|
|
||||||
|
@ -26,13 +31,23 @@ main (void)
|
||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (chmod (dname, S_IWUSR|S_IXUSR|S_IWGRP|S_IXGRP|S_IWOTH|S_IXOTH) != 0)
|
memcpy (tmp2, tmp, strlen (tmp));
|
||||||
|
dname2 = mkdtemp (tmp2);
|
||||||
|
if (dname2 == NULL)
|
||||||
{
|
{
|
||||||
printf ("chmod: %m\n");
|
printf ("mkdtemp: %m\n");
|
||||||
|
rmdir (dname);
|
||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
r = ftw (dname, cb, 10);
|
if (chmod (dname, S_IWUSR|S_IWGRP|S_IWOTH) != 0)
|
||||||
|
{
|
||||||
|
printf ("chmod: %m\n");
|
||||||
|
rmdir (dname);
|
||||||
|
exit (1);
|
||||||
|
}
|
||||||
|
|
||||||
|
r = ftw (dname2, cb, 10);
|
||||||
e = errno;
|
e = errno;
|
||||||
printf ("r = %d", r);
|
printf ("r = %d", r);
|
||||||
if (r != 0)
|
if (r != 0)
|
||||||
|
@ -40,7 +55,8 @@ main (void)
|
||||||
puts ("");
|
puts ("");
|
||||||
|
|
||||||
chmod (dname, S_IRWXU|S_IRWXG|S_IRWXO);
|
chmod (dname, S_IRWXU|S_IRWXG|S_IRWXO);
|
||||||
|
rmdir (dname2);
|
||||||
rmdir (dname);
|
rmdir (dname);
|
||||||
|
|
||||||
return r != -1 && e == EACCES;
|
return (r != -1 && e == EACCES) || cb_called;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue