emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* libmisc/log.c: Avoid assignments in comparisons.

Browse Source 
* libmisc/log.c: Add brackets and parenthesis.
	* libmisc/log.c: read() returns a ssize_t (note size_t).
	* libmisc/log.c: Avoid implicit conversion of pointers to
	booleans.
	* libmisc/log.c: Ignore return value of time() when use with a
	non NULL argument.
This commit is contained in:
nekral-guest 2008-06-13 19:50:49 +00:00
parent 815ffb7d3e
commit fe0e4f635e
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/log.c: Avoid assignments in comparisons.
* libmisc/log.c: Add brackets and parenthesis.
* libmisc/log.c: read() returns a ssize_t (note size_t).
* libmisc/log.c: Avoid implicit conversion of pointers to
booleans.
* libmisc/log.c: Ignore return value of time() when use with a
non NULL argument.
2008-06-13 Nicolas François <nicolas.francois@centraliens.net> 2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/strtoday.c: Avoid implicit conversion of pointers to * libmisc/strtoday.c: Avoid implicit conversion of pointers to

16
libmisc/log.c
View File

@ -62,8 +62,10 @@ dolastlog (struct lastlog *ll, const struct passwd *pw, const char *line,
* If the file does not exist, don't create it. * If the file does not exist, don't create it.
*/ */
if ((fd = open (LASTLOG_FILE, O_RDWR)) == -1) fd = open (LASTLOG_FILE, O_RDWR);
if (-1 == fd) {
return; return;
}
/* /*
* The file is indexed by UID number. Seek to the record * The file is indexed by UID number. Seek to the record
@ -83,19 +85,23 @@ dolastlog (struct lastlog *ll, const struct passwd *pw, const char *line,
* the way we read the old one in. * the way we read the old one in.
*/ */
if (read (fd, (char *) &newlog, sizeof newlog) != sizeof newlog) if (read (fd, (char *) &newlog, sizeof newlog) != (ssize_t) sizeof newlog) {
memzero (&newlog, sizeof newlog); memzero (&newlog, sizeof newlog);
if (ll) }
if (NULL != ll) {
*ll = newlog; *ll = newlog;
}
ll_time = newlog.ll_time; ll_time = newlog.ll_time;
time (&ll_time); (void) time (&ll_time);
newlog.ll_time = ll_time; newlog.ll_time = ll_time;
strncpy (newlog.ll_line, line, sizeof newlog.ll_line); strncpy (newlog.ll_line, line, sizeof newlog.ll_line);
#if HAVE_LL_HOST #if HAVE_LL_HOST
strncpy (newlog.ll_host, host, sizeof newlog.ll_host); strncpy (newlog.ll_host, host, sizeof newlog.ll_host);
#endif #endif
if (lseek (fd, offset, SEEK_SET) == offset) if (lseek (fd, offset, SEEK_SET) == offset) {
write (fd, (char *) &newlog, sizeof newlog); write (fd, (char *) &newlog, sizeof newlog);
}
close (fd); close (fd);
} }