From 13824e6c6765b7a1d67b0ffaab60aa0612bee252 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sat, 11 Jul 2015 21:09:50 +0000 Subject: check the gecos format early: at the moment the -c option is parsed --- pw/pw.c | 3 +++ pw/pw_user.c | 7 +++---- pw/pwupd.h | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'pw') diff --git a/pw/pw.c b/pw/pw.c index 112b1f0..3d4fcf2 100644 --- a/pw/pw.c +++ b/pw/pw.c @@ -254,6 +254,9 @@ main(int argc, char *argv[]) case 'a': conf.all = true; break; + case 'c': + conf.gecos = pw_checkname(optarg, 1); + break; case 'g': if (which == 0) { /* for user* */ addarg(&arglist, 'g', optarg); diff --git a/pw/pw_user.c b/pw/pw_user.c index 7e8534e..9e16793 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -650,10 +650,9 @@ pw_user(int mode, char *name, long id, struct cargs * args) /* * Shared add/edit code */ - if ((arg = getarg(args, 'c')) != NULL) { - char *gecos = pw_checkname(arg->val, 1); - if (strcmp(pwd->pw_gecos, gecos) != 0) { - pwd->pw_gecos = gecos; + if (conf.gecos != NULL) { + if (strcmp(pwd->pw_gecos, conf.gecos) != 0) { + pwd->pw_gecos = conf.gecos; edited = 1; } } diff --git a/pw/pwupd.h b/pw/pwupd.h index 669cbb1..7a0cd2d 100644 --- a/pw/pwupd.h +++ b/pw/pwupd.h @@ -85,6 +85,7 @@ struct pwconf { char etcpath[MAXPATHLEN]; char *newname; char *config; + char *gecos; int fd; int which; bool quiet; -- cgit v1.2.3