X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-read-file.c;h=de7a0bb9f39795270d628d89d53094a0fc7c69fb;hb=95f7c57ff4090a5dee062044d2c7b99879077808;hp=1e90cd4566ef38188b5067b3800f50992d1ef6de;hpb=08c03e591ea25f38405e5e06f1565e01feabb591;p=gnulib.git
diff --git a/tests/test-read-file.c b/tests/test-read-file.c
index 1e90cd456..de7a0bb9f 100644
--- a/tests/test-read-file.c
+++ b/tests/test-read-file.c
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2006 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,17 +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"
@@ -31,35 +29,81 @@
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 %d from %s...\n", len, FILE1);
+ 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);
+ }
+ }
- 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 %d from %s...\n", len, FILE2);
-
- free (out);
- }
-
- return 0;
+ return err;
}