Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/loginutils/addgroup.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/loginutils/addgroup.c (modified) (6 diffs)

branches/3.3/mindi-busybox/loginutils/addgroup.c

@@ -10 +10 @@
  *
  */
+//config:config ADDGROUP
+//config:   bool "addgroup"
+//config:   default y
+//config:   help
+//config:     Utility for creating a new group account.
+//config:
+//config:config FEATURE_ADDGROUP_LONG_OPTIONS
+//config:   bool "Enable long options"
+//config:   default y
+//config:   depends on ADDGROUP && LONG_OPTS
+//config:   help
+//config:     Support long options for the addgroup applet.
+//config:
+//config:config FEATURE_ADDUSER_TO_GROUP
+//config:   bool "Support for adding users to groups"
+//config:   default y
+//config:   depends on ADDGROUP
+//config:   help
+//config:     If  called  with two non-option arguments,
+//config:     addgroup will add an existing user to an
+//config:     existing group.
+
+//applet:IF_ADDGROUP(APPLET(addgroup, BB_DIR_USR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_ADDGROUP) += addgroup.o
 
 //usage:#define addgroup_trivial_usage
-//usage:       "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
+//usage:       "[-g GID] [-S] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
 //usage:#define addgroup_full_usage "\n\n"
-//usage:       "Add a group " IF_FEATURE_ADDUSER_TO_GROUP("or add a user to a group") "\n"
+//usage:       "Add a group" IF_FEATURE_ADDUSER_TO_GROUP(" or add a user to a group") "\n"
 //usage:     "\n    -g GID  Group id"
 //usage:     "\n    -S  Create a system group"
@@ -23 +48 @@
 #error Bad LAST_SYSTEM_ID or FIRST_SYSTEM_ID in .config
 #endif
+#if CONFIG_LAST_ID < CONFIG_LAST_SYSTEM_ID
+#error Bad LAST_ID or LAST_SYSTEM_ID in .config
+#endif
 
 #define OPT_GID                       (1 << 0)
 #define OPT_SYSTEM_ACCOUNT            (1 << 1)
 
-/* We assume GID_T_MAX == INT_MAX */
 static void xgroup_study(struct group *g)
 {
-    unsigned max = INT_MAX;
+    unsigned max = CONFIG_LAST_ID;
 
     /* Make sure gr_name is unused */
@@ -47 +74 @@
         } else {
             g->gr_gid = CONFIG_LAST_SYSTEM_ID + 1;
-            max = 64999;
         }
     }
@@ -126 +152 @@
 {
     unsigned opts;
-    unsigned gid = 0;
+    const char *gid = "0";
 
     /* need to be root */
@@ -140 +166 @@
      *  addgroup user group
      * Check for min, max and missing args */
-    opt_complementary = "-1:?2:g+";
+    opt_complementary = "-1:?2";
     opts = getopt32(argv, "g:S", &gid);
     /* move past the commandline options */
@@ -176 +202 @@
     {
         die_if_bad_username(argv[0]);
-        new_group(argv[0], gid);
+        new_group(argv[0], xatou_range(gid, 0, CONFIG_LAST_ID));
     }
     /* Reached only on success */