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
2fa8c92
..
71a913d
100644
(file)
--- a/
lib/readutmp.c
+++ b/
lib/readutmp.c
@@
-1,5
+1,5
@@
/* GNU's read utmp module.
/* GNU's read utmp module.
- Copyright (C) 1992-2001 Free Software Foundation, Inc.
+ Copyright (C) 1992-2001
, 2003
Free Software Foundation, Inc.
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
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
@@
-23,17
+23,12
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-# include <string.h>
-#else
-# include <strings.h>
-#endif /* STDC_HEADERS || HAVE_STRING_H */
+#include <string.h>
+#include <stdlib.h>
#include "readutmp.h"
#include "unlocked-io.h"
#include "readutmp.h"
#include "unlocked-io.h"
-
-char *xmalloc ();
-char *realloc ();
+#include "xalloc.h"
/* Copy UT->ut_name into storage obtained from malloc. Then remove any
trailing spaces from the copy, NUL terminate it, and return the copy. */
/* Copy UT->ut_name into storage obtained from malloc. Then remove any
trailing spaces from the copy, NUL terminate it, and return the copy. */
@@
-109,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 = (STRUCT_UTMP *) 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;