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

Avoid assignments in comparisons.

Browse Source
This commit is contained in:
nekral-guest 2007-12-28 22:24:02 +00:00
parent b9eec1ea49
commit 908e2cbcc7
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -7,6 +7,7 @@
* src/chpasswd.c: Other new functions: open_files(), close_files(). * src/chpasswd.c: Other new functions: open_files(), close_files().
This force flushing the password database after the password file is This force flushing the password database after the password file is
unlocked. unlocked.
* src/chpasswd.c: Avoid assignments in comparisons.
2007-12-28 Nicolas François <nicolas.francois@centraliens.net> 2007-12-28 Nicolas François <nicolas.francois@centraliens.net>
@ -45,7 +46,7 @@
* libmisc/copydir.c: -1 is used to indicate an error, directly set err * libmisc/copydir.c: -1 is used to indicate an error, directly set err
to -1, instead of incrementing it, and checking if not nul at the to -1, instead of incrementing it, and checking if not nul at the
end. end.
* libmisc/copydir.c: Avoid assignment in comparisons. * libmisc/copydir.c: Avoid assignments in comparisons.
* libmisc/copydir.c: Document selinux_file_context. * libmisc/copydir.c: Document selinux_file_context.
* libmisc/copydir.c: Avoid implicit brackets. * libmisc/copydir.c: Avoid implicit brackets.
* libmisc/copydir.c: Avoid implicit conversions to booleans. * libmisc/copydir.c: Avoid implicit conversions to booleans.
@ -64,7 +65,7 @@
* src/gpasswd.c: New functions: check_perms(), get_group(), * src/gpasswd.c: New functions: check_perms(), get_group(),
change_passwd(), check_flags(). Split out of main() to simplify main(). change_passwd(), check_flags(). Split out of main() to simplify main().
* src/gpasswd.c: Avoid implicit brackets. * src/gpasswd.c: Avoid implicit brackets.
* src/gpasswd.c: Avoid assignment in comparisons. * src/gpasswd.c: Avoid assignments in comparisons.
* src/gpasswd.c: Avoid implicit conversions to booleans. * src/gpasswd.c: Avoid implicit conversions to booleans.
2007-12-27 Nicolas François <nicolas.francois@centraliens.net> 2007-12-27 Nicolas François <nicolas.francois@centraliens.net>

9
src/chpasswd.c
View File

@ -346,7 +346,8 @@ int main (int argc, char **argv)
*/ */
while (fgets (buf, sizeof buf, stdin) != (char *) 0) { while (fgets (buf, sizeof buf, stdin) != (char *) 0) {
line++; line++;
if ((cp = strrchr (buf, '\n'))) { cp = strrchr (buf, '\n');
if (NULL != cp) {
*cp = '\0'; *cp = '\0';
} else { } else {
fprintf (stderr, _("%s: line %d: line too long\n"), fprintf (stderr, _("%s: line %d: line too long\n"),
@ -365,8 +366,10 @@ int main (int argc, char **argv)
*/ */
name = buf; name = buf;
if ((cp = strchr (name, ':'))) { cp = strchr (name, ':');
*cp++ = '\0'; if (NULL != cp) {
*cp = '\0';
cp++;
} else { } else {
fprintf (stderr, fprintf (stderr,
_("%s: line %d: missing new password\n"), _("%s: line %d: missing new password\n"),