diff options
Diffstat (limited to 'contrib/opie/libmissing/getutline.c')
-rw-r--r-- | contrib/opie/libmissing/getutline.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/opie/libmissing/getutline.c b/contrib/opie/libmissing/getutline.c index 0ceb76b..59df92b 100644 --- a/contrib/opie/libmissing/getutline.c +++ b/contrib/opie/libmissing/getutline.c @@ -1,13 +1,15 @@ /* getutline.c: A replacement for the getutline() function %%% copyright-cmetz-96 -This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved. +This software is Copyright 1996-1998 by Craig Metz, All Rights Reserved. The Inner Net License Version 2 applies to this software. You should have received a copy of the license with this software. If you didn't get a copy, you may request one from <license@inner.net>. History: + Modified by cmetz for OPIE 2.32. Fixed check for fread() return + value. Modified by cmetz for OPIE 2.31. If the OS won't tell us where _PATH_UTMP is, play the SVID game, then use Autoconf-discovered values. @@ -41,14 +43,14 @@ struct utmp *getutline FUNCTION((utmp), struct utmp *utmp) if (i = ttyslot()) { if (fseek(f, i * sizeof(struct utmp), SEEK_SET) < 0) goto ret; - if (fread(&u, sizeof(struct utmp), 1, f) != sizeof(struct utmp)) + if (fread(&u, sizeof(struct utmp), 1, f) != 1) goto ret; fclose(f); return &u; } #endif /* HAVE_TTYSLOT */ - while(fread(&u, sizeof(struct utmp), 1, f) == sizeof(struct utmp)) { + while(fread(&u, sizeof(struct utmp), 1, f) == 1) { if (!strncmp(utmp->ut_line, u.ut_line, sizeof(u.ut_line) - 1)) { fclose(f); return &u; |