projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 'free' module.
[gnulib.git]
/
lib
/
readutmp.c
diff --git
a/lib/readutmp.c
b/lib/readutmp.c
index
1a6af08
..
71a913d
100644
(file)
--- a/
lib/readutmp.c
+++ b/
lib/readutmp.c
@@
-104,23
+104,33
@@
read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
if (utmp == NULL)
return 1;
if (utmp == NULL)
return 1;
- fstat (fileno (utmp), &file_stats);
+ if (fstat (fileno (utmp), &file_stats) != 0)
+ {
+ int e = errno;
+ fclose (utmp);
+ errno = e;
+ return 1;
+ }
size = file_stats.st_size;
size = file_stats.st_size;
- if (size > 0)
-
buf = xmalloc (size
);
- else
+ buf = xmalloc (size);
+
n_read = fread (buf, sizeof *buf, size / sizeof *buf, utmp
);
+ if (ferror (utmp))
{
{
+ int e = errno;
+ free (buf);
fclose (utmp);
fclose (utmp);
+ errno = e;
+ return 1;
+ }
+ if (fclose (utmp) != 0)
+ {
+ int e = errno;
+ free (buf);
+ errno = e;
return 1;
}
return 1;
}
- /* Use < instead of != in case the utmp just grew. */
- n_read = fread (buf, 1, size, utmp);
- if (ferror (utmp) || fclose (utmp) == EOF
- || n_read < size)
- return 1;
-
- *n_entries = size / sizeof (STRUCT_UTMP);
+ *n_entries = n_read;
*utmp_buf = buf;
return 0;
*utmp_buf = buf;
return 0;