CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-13 23:36:10 +02:00
Code Issues Projects Releases Wiki Activity

(read_utmp): New variable: size to avoid type warnings.

Browse Source
This commit is contained in:
Jim Meyering
1994-09-24 16:18:11 +00:00
parent 3d74506f21
commit cbee99cebe
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/who.c
View File

@@ -288,14 +288,16 @@ read_utmp (filename)
FILE *utmp;
struct stat file_stats;
int n_read;
size_t size;
utmp = fopen (filename, "r");
if (utmp == NULL)
error (1, errno, "%s", filename);
fstat (fileno (utmp), &file_stats);
if (file_stats.st_size > 0)
utmp_contents = (STRUCT_UTMP *) xmalloc ((unsigned) file_stats.st_size);
size = file_stats.st_size;
if (size > 0)
utmp_contents = (STRUCT_UTMP *) xmalloc (size);
else
{
fclose (utmp);
@@ -303,12 +305,12 @@ read_utmp (filename)
}
/* Use < instead of != in case the utmp just grew. */
n_read = fread (utmp_contents, 1, file_stats.st_size, utmp);
n_read = fread (utmp_contents, 1, size, utmp);
if (ferror (utmp) || fclose (utmp) == EOF
|| n_read < file_stats.st_size)
|| n_read < size)
error (1, errno, "%s", filename);
return file_stats.st_size / sizeof (STRUCT_UTMP);
return size / sizeof (STRUCT_UTMP);
}
#ifdef WHO