1 files changed, 24 insertions, 22 deletions

diff --git a/fstests/fstests.c b/fstests/fstests.c
index 600eb3ef..4a0b35d5 100644
--- a/fstests/fstests.c
+++ b/fstests/fstests.c
@@ -1,5 +1,5 @@
 /* Test filesystem behavior
-   Copyright (C) 1993, 1994 Free Software Foundation
+   Copyright (C) 1993,94,2000,01,02 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -27,6 +27,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <hurd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <error.h>
 #include <unistd.h>
 
 int check_refs (mach_port_t port) /* To call from gdb */
@@ -38,56 +39,57 @@ int check_refs (mach_port_t port) /* To call from gdb */
   return err ? -err : refs;
 }
 
-void
+int
 main ()
 {
   mach_port_t root;
+#if HURDISH_TESTS
   extern file_t *_hurd_init_dtable;
   char string[] = "Did this get into the file?\n";
-#if 0
   file_t filetowrite;
   retry_type retry;
   char pathbuf[1024];
   int written;
-  int err;
+  error_t err;
 #endif
 
   root = getcrdir ();
 
   printf ("fstests running...\n");
 
-#if 0
+#if HURDISH_TESTS
   if ((err = dir_unlink (root, "CREATED")) && err != ENOENT)
-    printf ("Error on unlink: %d\n", err);
-  else if (err = dir_pathtrans (root, "CREATED", O_WRITE | O_CREAT, 0666,
-				&retry, pathbuf, &filetowrite))
-    printf ("Error on pathtrans: %d\n", err);
+    error (0, err, "Error on unlink");
+  else if (err = dir_lookup (root, "CREATED", O_WRITE | O_CREAT, 0666,
+			     &retry, pathbuf, &filetowrite))
+    error (0, err, "Error on lookup");
   else if (err = io_write (filetowrite, string, strlen (string), -1, &written))
-    printf ("Error on write: %d\n", err);
+    error (0, err, "Error on write");
   else if (written != strlen (string))
-    printf ("Short write: %d\n", written);
+    error (0, 0, "Short write: %d\n", written);
   else if (err = file_syncfs (filetowrite, 1, 0))
-    printf ("Error on sync: %d\n", err);
+    error (0, err, "Error on sync");
 #else
 
   if (unlink ("/newdir"))
-    perror ("unlink");
+    error (0, errno, "unlink");
   if (rmdir ("/newdir"))
-    perror ("1st rmdir");
+    error (0, errno, "1st rmdir");
   if (mkdir ("/newdir", 0777))
-    perror ("1st mkdir");
+    error (0, errno, "1st mkdir");
   if (rename ("/newdir", "/newdir2"))
-    perror ("1st rename");
+    error (0, errno, "1st rename");
   if (rmdir ("/foo"))
-    perror ("2nd rmdir");
+    error (0, errno, "2nd rmdir");
   if (mkdir ("/foo", 0777))
-    perror ("2nd mkdir");
+    error (0, errno, "2nd mkdir");
   if (rename ("/newdir2", "/foo"))
-    perror ("2nd rename");
-  if (sync ())
-    perror ("sync");
+    error (0, errno, "2nd rename");
+  sync ();
 #endif
 
   printf ("All done.\n");
   malloc (0);
+
+  return 0;
 }