X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-read-file.c;h=de7a0bb9f39795270d628d89d53094a0fc7c69fb;hb=f462d86108d41b1ca0f48b51caad6c696d67d8fd;hp=423b19e3a866a53520b1d7fd1b59a7c611c96387;hpb=9c9ede9d21a19d835107ecb5152e499d4e95b60d;p=gnulib.git

diff --git a/tests/test-read-file.c b/tests/test-read-file.c
index 423b19e3a..de7a0bb9f 100644
--- a/tests/test-read-file.c
+++ b/tests/test-read-file.c
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2006-2007 Free Software Foundation
+ * Copyright (C) 2006-2007, 2010-2011 Free Software Foundation, Inc.
  * Written by Simon Josefsson
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,13 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.  */
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "read-file.h"
 
@@ -45,25 +41,37 @@ main (void)
 
       if (!out)
         {
-	  perror ("Could not read file");
-	  err = 1;
-	}
+          perror ("Could not read file");
+          err = 1;
+        }
       else
-	{
-	  if (out[len] != '\0')
-	    {
-	      perror ("BAD: out[len] not zero");
-	      err = 1;
-	    }
+        {
+          if (out[len] != '\0')
+            {
+              perror ("BAD: out[len] not zero");
+              err = 1;
+            }
 
-	  /* Assume FILE1 is a regular file or a symlink to a regular file.  */
-	  if (len != statbuf.st_size)
-	    {
-	      fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE1);
-	      err = 1;
-	    }
-	  free (out);
-	}
+          if (S_ISREG (statbuf.st_mode))
+            {
+              /* FILE1 is a regular file or a symlink to a regular file.  */
+              if (len != statbuf.st_size)
+                {
+                  fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE1);
+                  err = 1;
+                }
+            }
+          else
+            {
+              /* Assume FILE1 is not empty.  */
+              if (len == 0)
+                {
+                  fprintf (stderr, "Read nothing from %s\n", FILE1);
+                  err = 1;
+                }
+            }
+          free (out);
+        }
     }
 
   /* We can perform the test only if the file exists and is readable.
@@ -75,26 +83,26 @@ main (void)
 
       if (!out)
         {
-	  perror ("Could not read file");
-	  err = 1;
-	}
+          perror ("Could not read file");
+          err = 1;
+        }
       else
-	{
-	  if (out[len] != '\0')
-	    {
-	      perror ("BAD: out[len] not zero");
-	      err = 1;
-	    }
+        {
+          if (out[len] != '\0')
+            {
+              perror ("BAD: out[len] not zero");
+              err = 1;
+            }
 
-	  /* /dev/null should always be empty.  Ignore statbuf.st_size, since it
-	     is not a regular file.  */
-	  if (len != 0)
-	    {
-	      fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE2);
-	      err = 1;
-	    }
-	  free (out);
-	}
+          /* /dev/null should always be empty.  Ignore statbuf.st_size, since it
+             is not a regular file.  */
+          if (len != 0)
+            {
+              fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE2);
+              err = 1;
+            }
+          free (out);
+        }
     }
 
   return err;