projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix signal handler.
[gnulib.git]
/
tests
/
test-read-file.c
diff --git
a/tests/test-read-file.c
b/tests/test-read-file.c
index
1e90cd4
..
423b19e
100644
(file)
--- a/
tests/test-read-file.c
+++ b/
tests/test-read-file.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2006 Free Software Foundation
+ * Copyright (C) 2006
-2007
Free Software Foundation
* Written by Simon Josefsson
*
* This program is free software; you can redistribute it and/or modify
* Written by Simon Josefsson
*
* This program is free software; you can redistribute it and/or modify
@@
-24,6
+24,8
@@
#include "read-file.h"
#include <stdio.h>
#include "read-file.h"
#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
#define FILE1 "/etc/resolv.conf"
#define FILE2 "/dev/null"
#define FILE1 "/etc/resolv.conf"
#define FILE2 "/dev/null"
@@
-31,35
+33,69
@@
int
main (void)
{
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);
+ /* 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 %d from %s...\n", len, FILE2);
-
- free (out);
- }
-
- return 0;
+ return err;
}
}