[Pkg-shadow-commits] r3385 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-07-14 13:29:10 +0000 (Thu, 14 Jul 2011)
New Revision: 3385

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/usermod.c
Log:
	* src/usermod.c (process_flags): Report usage if no options are
	provided. Update the error message.
	* src/usermod.c (process_flags): Check option compatibility and
	dependency before options are discarded when no changes are
	requested.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-07-14 13:29:05 UTC (rev 3384)
+++ upstream/trunk/ChangeLog	2011-07-14 13:29:10 UTC (rev 3385)
@@ -4,6 +4,11 @@
 	* src/usermod.c (move_home): It is always an error to use -m if
 	the new home directory already exist (independently from the
 	existence of the old home directory did not exist)
+	* src/usermod.c (process_flags): Report usage if no options are
+	provided. Update the error message.
+	* src/usermod.c (process_flags): Check option compatibility and
+	dependency before options are discarded when no changes are
+	requested.
 
 2011-07-08  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2011-07-14 13:29:05 UTC (rev 3384)
+++ upstream/trunk/src/usermod.c	2011-07-14 13:29:10 UTC (rev 3385)
@@ -1053,12 +1053,39 @@
 		}
 	}
 
-
 	if (!anyflag) {
-		fprintf (stderr, _("%s: no flags given\n"), Prog);
-		exit (E_USAGE);
+		fprintf (stderr, _("%s: no options\n"), Prog);
+		usage (E_USAGE);
 	}
 
+	if (aflg && (!Gflg)) {
+		fprintf (stderr,
+		         _("%s: %s flag is only allowed with the %s flag\n"),
+		         Prog, "-a", "-G");
+		usage (E_USAGE);
+	}
+
+	if ((Lflg && (pflg || Uflg)) || (pflg && Uflg)) {
+		fprintf (stderr,
+		         _("%s: the -L, -p, and -U flags are exclusive\n"),
+		         Prog);
+		usage (E_USAGE);
+	}
+
+	if (oflg && !uflg) {
+		fprintf (stderr,
+		         _("%s: %s flag is only allowed with the %s flag\n"),
+		         Prog, "-o", "-u");
+		usage (E_USAGE);
+	}
+
+	if (mflg && !dflg) {
+		fprintf (stderr,
+		         _("%s: %s flag is only allowed with the %s flag\n"),
+		         Prog, "-m", "-d");
+		usage (E_USAGE);
+	}
+
 	if (user_newid == user_id) {
 		uflg = false;
 		oflg = false;
@@ -1106,38 +1133,6 @@
 		exit (E_USAGE);
 	}
 
-	if (aflg && (!Gflg)) {
-		fprintf (stderr,
-		         _("%s: %s flag is only allowed with the %s flag\n"),
-		         Prog, "-a", "-G");
-		usage (E_USAGE);
-		exit (E_USAGE);
-	}
-
-	if ((Lflg && (pflg || Uflg)) || (pflg && Uflg)) {
-		fprintf (stderr,
-		         _("%s: the -L, -p, and -U flags are exclusive\n"),
-		         Prog);
-		usage (E_USAGE);
-		exit (E_USAGE);
-	}
-
-	if (oflg && !uflg) {
-		fprintf (stderr,
-		         _("%s: %s flag is only allowed with the %s flag\n"),
-		         Prog, "-o", "-u");
-		usage (E_USAGE);
-		exit (E_USAGE);
-	}
-
-	if (mflg && !dflg) {
-		fprintf (stderr,
-		         _("%s: %s flag is only allowed with the %s flag\n"),
-		         Prog, "-m", "-d");
-		usage (E_USAGE);
-		exit (E_USAGE);
-	}
-
 	/* local, no need for xgetpwnam */
 	if (lflg && (getpwnam (user_newname) != NULL)) {
 		fprintf (stderr,