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

* src/chpasswd.c: Use a bool when possible instead of int

Browse Source 
integers.
	* src/chpasswd.c: Avoid implicit conversion of pointers / integers
	/ chars to booleans.
	* src/chpasswd.c: Ignore return value of setlocale(),
	bindtextdomain(), and textdomain().
This commit is contained in:
nekral-guest 2008-06-09 19:46:11 +00:00
parent 24a7015f64
commit 827f8882bc
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-06-09 Nicolas François <nicolas.francois@centraliens.net>
* src/chpasswd.c: Use a bool when possible instead of int
integers.
* src/chpasswd.c: Avoid implicit conversion of pointers / integers
/ chars to booleans.
* src/chpasswd.c: Ignore return value of setlocale(),
bindtextdomain(), and textdomain().
2008-06-09 Nicolas François <nicolas.francois@centraliens.net> 2008-06-09 Nicolas François <nicolas.francois@centraliens.net>
* src/pwconv.c: Use a bool when possible instead of int integers. * src/pwconv.c: Use a bool when possible instead of int integers.

32
src/chpasswd.c
View File

@ -52,15 +52,15 @@
* Global variables * Global variables
*/ */
static char *Prog; static char *Prog;
static int cflg = 0; static bool cflg = false;
static int eflg = 0; static bool eflg = false;
static int md5flg = 0; static bool md5flg = false;
static int sflg = 0; static bool sflg = false;
static const char *crypt_method = NULL; static const char *crypt_method = NULL;
static long sha_rounds = 5000; static long sha_rounds = 5000;
static int is_shadow_pwd; static bool is_shadow_pwd;
#ifdef USE_PAM #ifdef USE_PAM
static pam_handle_t *pamh = NULL; static pam_handle_t *pamh = NULL;
@ -130,22 +130,22 @@ static void process_flags (int argc, char **argv)
long_options, &option_index)) != -1) { long_options, &option_index)) != -1) {
switch (c) { switch (c) {
case 'c': case 'c':
cflg = 1; cflg = true;
crypt_method = optarg; crypt_method = optarg;
break; break;
case 'e': case 'e':
eflg = 1; eflg = true;
break; break;
case 'h': case 'h':
usage (); usage ();
break; break;
case 'm': case 'm':
md5flg = 1; md5flg = true;
break; break;
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT
case 's': case 's':
sflg = 1; sflg = true;
if (!getlong(optarg, &sha_rounds)) { if (getlong(optarg, &sha_rounds) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: invalid numeric argument '%s'\n"), _("%s: invalid numeric argument '%s'\n"),
Prog, optarg); Prog, optarg);
@ -324,14 +324,14 @@ int main (int argc, char **argv)
struct passwd newpw; struct passwd newpw;
int errors = 0; int errors = 0;
int line = 0; int line = 0;
long now = time ((long *) 0) / (24L * 3600L); long now = time ((time_t *)NULL) / (24L * 3600L);
int ok; int ok;
Prog = Basename (argv[0]); Prog = Basename (argv[0]);
setlocale (LC_ALL, ""); (void) setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR); (void) bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE); (void) textdomain (PACKAGE);
process_flags (argc, argv); process_flags (argc, argv);
@ -443,7 +443,7 @@ int main (int argc, char **argv)
ok = pw_update (&newpw); ok = pw_update (&newpw);
} }
if (!ok) { if (0 == ok) {
fprintf (stderr, fprintf (stderr,
_ _
("%s: line %d: cannot update password entry\n"), ("%s: line %d: cannot update password entry\n"),
@ -460,7 +460,7 @@ int main (int argc, char **argv)
* changes to be written out all at once, and then unlocked * changes to be written out all at once, and then unlocked
* afterwards. * afterwards.
*/ */
if (errors) { if (0 != errors) {
fprintf (stderr, fprintf (stderr,
_("%s: error detected, changes ignored\n"), Prog); _("%s: error detected, changes ignored\n"), Prog);
if (is_shadow_pwd) { if (is_shadow_pwd) {