X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-fchdir.c;h=7a6de80494278e5289d59bf93b4abbb6c291faad;hb=4779b635ef35c7b0bc4044fcb5bc746d06f158c4;hp=f5cce49d6cd3ae3ff342a0e3c15373485f11a89d;hpb=987e5651e8d1c5aa933c9ce88562806af4093702;p=gnulib.git

diff --git a/tests/test-fchdir.c b/tests/test-fchdir.c
index f5cce49d6..7a6de8049 100644
--- a/tests/test-fchdir.c
+++ b/tests/test-fchdir.c
@@ -1,5 +1,5 @@
 /* Test changing to a directory named by a file descriptor.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2013 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
@@ -34,14 +34,30 @@ SIGNATURE_CHECK (fchdir, int, (int));
 int
 main (void)
 {
-  char *cwd = getcwd (NULL, 0);
-  int fd = open (".", O_RDONLY);
+  char *cwd;
+  int fd;
   int i;
 
+  cwd = getcwd (NULL, 0);
   ASSERT (cwd);
+
+  fd = open (".", O_RDONLY);
   ASSERT (0 <= fd);
 
-  /* Check for failure cases.  */
+  /* Test behaviour for invalid file descriptors.  */
+  {
+    errno = 0;
+    ASSERT (fchdir (-1) == -1);
+    ASSERT (errno == EBADF);
+  }
+  {
+    close (99);
+    errno = 0;
+    ASSERT (fchdir (99) == -1);
+    ASSERT (errno == EBADF);
+  }
+
+  /* Check for other failure cases.  */
   {
     int bad_fd = open ("/dev/null", O_RDONLY);
     ASSERT (0 <= bad_fd);
@@ -49,15 +65,12 @@ main (void)
     ASSERT (fchdir (bad_fd) == -1);
     ASSERT (errno == ENOTDIR);
     ASSERT (close (bad_fd) == 0);
-    errno = 0;
-    ASSERT (fchdir (-1) == -1);
-    ASSERT (errno == EBADF);
   }
 
   /* Repeat test twice, once in '.' and once in '..'.  */
   for (i = 0; i < 2; i++)
     {
-      ASSERT (chdir (".." + 1 - i) == 0);
+      ASSERT (chdir (&".."[1 - i]) == 0);
       ASSERT (fchdir (fd) == 0);
       {
         size_t len = strlen (cwd) + 1;
@@ -84,7 +97,7 @@ main (void)
           ASSERT (close (fd) == 0);
           ASSERT (fcntl (new_fd, F_DUPFD, fd) == fd);
           ASSERT (close (new_fd) == 0);
-#if GNULIB_DUP3
+#if GNULIB_TEST_DUP3
           ASSERT (dup3 (fd, new_fd, 0) == new_fd);
           ASSERT (dup3 (new_fd, fd, 0) == fd);
           ASSERT (close (new_fd) == 0);