X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-read-file.c;h=392c4f7eaf3962c14a9254c26b6c43f69c44a854;hb=b5a7c093d06c497ca3e35ed35b147bf52a1103df;hp=d163b60280a170baf46d66cbc6af324aed4ae2ca;hpb=4f87874de0991adc35c4777dbc3542677ca8dec9;p=gnulib.git
diff --git a/tests/test-read-file.c b/tests/test-read-file.c
index d163b6028..392c4f7ea 100644
--- a/tests/test-read-file.c
+++ b/tests/test-read-file.c
@@ -2,10 +2,10 @@
* Copyright (C) 2006-2007 Free Software Foundation
* 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,18 +13,15 @@
* 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 . */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "read-file.h"
#include
#include
+#include
#define FILE1 "/etc/resolv.conf"
#define FILE2 "/dev/null"
@@ -32,35 +29,69 @@
int
main (void)
{
- {
- size_t len;
- char *out = read_file (FILE1, &len);
+ struct stat statbuf;
+ int err = 0;
- if (!out)
- perror ("Could not read file");
+ /* We can perform the test only if the file exists and is readable.
+ Test whether it exists, then assume it is world-readable. */
+ if (stat (FILE1, &statbuf) >= 0)
+ {
+ size_t len;
+ char *out = read_file (FILE1, &len);
- if (out[len] != '\0')
- perror ("BAD: out[len] not zero");
+ if (!out)
+ {
+ perror ("Could not read file");
+ err = 1;
+ }
+ else
+ {
+ if (out[len] != '\0')
+ {
+ perror ("BAD: out[len] not zero");
+ err = 1;
+ }
- printf ("Read %ld from %s...\n", (unsigned long) len, FILE1);
+ /* 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);
+ }
+ }
- free (out);
- }
+ /* We can perform the test only if the file exists and is readable.
+ Test whether it exists, then assume it is world-readable. */
+ if (stat (FILE2, &statbuf) >= 0)
+ {
+ size_t len;
+ char *out = read_file (FILE2, &len);
- {
- size_t len;
- char *out = read_file (FILE2, &len);
+ if (!out)
+ {
+ perror ("Could not read file");
+ err = 1;
+ }
+ else
+ {
+ if (out[len] != '\0')
+ {
+ perror ("BAD: out[len] not zero");
+ err = 1;
+ }
- if (!out)
- perror ("Could not read file");
+ /* /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);
+ }
+ }
- if (out[len] != '\0')
- perror ("BAD: out[len] not zero");
-
- printf ("Read %ld from %s...\n", (unsigned long) len, FILE2);
-
- free (out);
- }
-
- return 0;
+ return err;
}