X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-dirent-safer.c;h=13bf02e14df957ceb743deea354b2de1c64842ce;hb=88418d5fd24c99aac393d3e2f564f6939e4e2fe3;hp=045d29b44bb33e2259b176598418ea3f41652266;hpb=9a3454362bbd242121df2ba63aef92fc96a1e390;p=gnulib.git diff --git a/tests/test-dirent-safer.c b/tests/test-dirent-safer.c index 045d29b44..13bf02e14 100644 --- a/tests/test-dirent-safer.c +++ b/tests/test-dirent-safer.c @@ -1,5 +1,5 @@ /* Test that directory streams leave standard fds alone. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -48,7 +48,7 @@ main (void) gnulib version of fdopendir is unable to guarantee that dirfd(fdopendir(fd))==fd, but we can at least guarantee that if they are not equal, the fd returned by dirfd is safe. */ -#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR +#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR int dfd; #endif @@ -57,7 +57,7 @@ main (void) || (myerr = fdopen (BACKUP_STDERR_FILENO, "w")) == NULL) return 2; -#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR +#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR dfd = open (".", O_RDONLY); ASSERT (STDERR_FILENO < dfd); #endif @@ -73,7 +73,7 @@ main (void) ASSERT (dirfd (dp) == -1 || STDERR_FILENO < dirfd (dp)); ASSERT (closedir (dp) == 0); -#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR +#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR { int fd = dup_safer (dfd); ASSERT (STDERR_FILENO < fd); @@ -88,7 +88,7 @@ main (void) #endif } -#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR +#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR ASSERT (close (dfd) == 0); #endif