id: unsigned long is excessive for option bitmask

[oweals/busybox.git] / loginutils / addgroup.c

diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index b25f8171df7416f2baacf03052b5aa7740b0644d..89414d7381fbfadedb165efe5fc61fae49c7b20f 100644 (file)
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -72,7 +72,7 @@ static void new_group(char *group, gid_t gid)
 #if ENABLE_FEATURE_ADDUSER_TO_GROUP
 static void add_user_to_group(char **args,
                const char *path,
-               FILE *(*fopen_func)(const char *fileName, const char *mode))
+               FILE* FAST_FUNC (*fopen_func)(const char *fileName, const char *mode))
 {
        char *line;
        int len = strlen(args[1]);
@@ -83,7 +83,7 @@ static void add_user_to_group(char **args,
 
        if (!group_file) return;
 
-       while ((line = xmalloc_getline(group_file))) {
+       while ((line = xmalloc_fgetline(group_file)) != NULL) {
                /* Find the group */
                if (!strncmp(line, args[1], len)
                 && line[len] == ':'
@@ -123,7 +123,7 @@ static void add_user_to_group(char **args,
  * will add an existing user to an existing group.
  */
 int addgroup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int addgroup_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int addgroup_main(int argc UNUSED_PARAM, char **argv)
 {
        char *group;
        gid_t gid = 0;
@@ -173,8 +173,11 @@ int addgroup_main(int argc ATTRIBUTE_UNUSED, char **argv)
 #endif
        } else
 #endif /* ENABLE_FEATURE_ADDUSER_TO_GROUP */
+       {
+               die_if_bad_username(argv[0]);
                new_group(argv[0], gid);
 
+       }
        /* Reached only on success */
        return EXIT_SUCCESS;
 }