src/useradd.c: create_home(): Cosmetic

-  Invert conditional to reduce indentation.
-  Rewrite while loop calling strtok(3) as a for loop.  This allows
   doing more simplification inside the loop (see next commit).

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/src/useradd.c b/src/useradd.c
index 305ac64b08c134e7c1ed9c556d2a3d3b47f2c370..bde45032ddef4e845f0d7ff684899144fe6ed9b8 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -2282,119 +2282,117 @@ static void usr_update (unsigned long subuid_count, unsigned long subgid_count)
  */
 static void create_home (void)
 {
-       if (access (prefix_user_home, F_OK) != 0) {
-               char    path[strlen(prefix_user_home) + 2];
-               char    *bhome, *cp;
-               mode_t  mode;
+       char    path[strlen(prefix_user_home) + 2];
+       char    *bhome, *cp;
+       mode_t  mode;
 
-               path[0] = '\0';
-               bhome = strdup(prefix_user_home);
-               if (!bhome) {
-                       fprintf(stderr,
-                               _("%s: error while duplicating string %s\n"),
-                               Prog, user_home);
-                       fail_exit(E_HOMEDIR);
-               }
+       if (access (prefix_user_home, F_OK) == 0)
+               return;
+
+       path[0] = '\0';
+       bhome = strdup(prefix_user_home);
+       if (!bhome) {
+               fprintf(stderr,
+                       _("%s: error while duplicating string %s\n"),
+                       Prog, user_home);
+               fail_exit(E_HOMEDIR);
+       }
 
 #ifdef WITH_SELINUX
-               if (set_selinux_file_context(prefix_user_home, S_IFDIR) != 0) {
-                       fprintf(stderr,
-                               _("%s: cannot set SELinux context for home directory %s\n"),
-                               Prog, user_home);
-                       fail_exit(E_HOMEDIR);
-               }
+       if (set_selinux_file_context(prefix_user_home, S_IFDIR) != 0) {
+               fprintf(stderr,
+                       _("%s: cannot set SELinux context for home directory %s\n"),
+                       Prog, user_home);
+               fail_exit(E_HOMEDIR);
+       }
 #endif
 
-               /* Check for every part of the path, if the directory
-                  exists. If not, create it with permissions 755 and
-                  owner root:root.
-                */
-               cp = strtok(bhome, "/");
-               while (cp) {
-                        /* Avoid turning a relative path into an absolute path.
-                         */
-                        if (bhome[0] == '/' || strlen(path) != 0) {
-                               strcat(path, "/");
-                        }
-                       strcat(path, cp);
-                       if (access(path, F_OK) != 0) {
-                               /* Check if parent directory is BTRFS, fail if requesting
-                                  subvolume but no BTRFS. The paths could be different by the
-                                  trailing slash
-                                */
+       /* Check for every part of the path, if the directory
+          exists. If not, create it with permissions 755 and
+          owner root:root.
+        */
+       for (cp = strtok(bhome, "/"); cp != NULL; cp = strtok(NULL, "/")) {
+               /* Avoid turning a relative path into an absolute path. */
+               if (bhome[0] == '/' || strlen(path) != 0) {
+                       strcat(path, "/");
+               }
+               strcat(path, cp);
+               if (access(path, F_OK) != 0) {
+                       /* Check if parent directory is BTRFS, fail if requesting
+                          subvolume but no BTRFS. The paths could be different by the
+                          trailing slash
+                        */
 #if WITH_BTRFS
-                               if (subvolflg && (strlen(prefix_user_home) - (int)strlen(path)) <= 1) {
-                                       char *btrfs_check = strdup(path);
-
-                                       if (!btrfs_check) {
-                                               fprintf(stderr,
-                                                       _("%s: error while duplicating string in BTRFS check %s\n"),
-                                                       Prog, path);
-                                               fail_exit(E_HOMEDIR);
-                                       }
-                                       btrfs_check[strlen(path) - strlen(cp) - 1] = '\0';
-                                       if (is_btrfs(btrfs_check) <= 0) {
-                                               fprintf(stderr,
-                                                       _("%s: home directory \"%s\" must be mounted on BTRFS\n"),
-                                                       Prog, path);
-                                               fail_exit(E_HOMEDIR);
-                                       }
-                                       // make subvolume to mount for user instead of directory
-                                       if (btrfs_create_subvolume(path)) {
-                                               fprintf(stderr,
-                                                       _("%s: failed to create BTRFS subvolume: %s\n"),
-                                                       Prog, path);
-                                               fail_exit(E_HOMEDIR);
-                                       }
-                               }
-                               else
-#endif
-                               if (mkdir(path, 0) != 0) {
-                                       fprintf(stderr, _("%s: cannot create directory %s\n"),
-                                               Prog, path);
-#ifdef WITH_AUDIT
-                                       audit_logger(AUDIT_ADD_USER, Prog, "adding home directory",
-                                                    user_name, user_id, SHADOW_AUDIT_FAILURE);
-#endif
+                       if (subvolflg && (strlen(prefix_user_home) - (int)strlen(path)) <= 1) {
+                               char *btrfs_check = strdup(path);
+
+                               if (!btrfs_check) {
+                                       fprintf(stderr,
+                                               _("%s: error while duplicating string in BTRFS check %s\n"),
+                                               Prog, path);
                                        fail_exit(E_HOMEDIR);
                                }
-                               if (chown(path, 0, 0) < 0) {
+                               btrfs_check[strlen(path) - strlen(cp) - 1] = '\0';
+                               if (is_btrfs(btrfs_check) <= 0) {
                                        fprintf(stderr,
-                                               _("%s: warning: chown on `%s' failed: %m\n"),
-                                               Prog, path);
+                                               _("%s: home directory \"%s\" must be mounted on BTRFS\n"),
+                                               Prog, path);
+                                       fail_exit(E_HOMEDIR);
                                }
-                               if (chmod(path, 0755) < 0) {
+                               // make subvolume to mount for user instead of directory
+                               if (btrfs_create_subvolume(path)) {
                                        fprintf(stderr,
-                                               _("%s: warning: chmod on `%s' failed: %m\n"),
-                                               Prog, path);
+                                               _("%s: failed to create BTRFS subvolume: %s\n"),
+                                               Prog, path);
+                                       fail_exit(E_HOMEDIR);
                                }
                        }
-                       cp = strtok(NULL, "/");
+                       else
+#endif
+                       if (mkdir(path, 0) != 0) {
+                               fprintf(stderr, _("%s: cannot create directory %s\n"),
+                                       Prog, path);
+#ifdef WITH_AUDIT
+                               audit_logger(AUDIT_ADD_USER, Prog, "adding home directory",
+                                            user_name, user_id, SHADOW_AUDIT_FAILURE);
+#endif
+                               fail_exit(E_HOMEDIR);
+                       }
+                       if (chown(path, 0, 0) < 0) {
+                               fprintf(stderr,
+                                       _("%s: warning: chown on `%s' failed: %m\n"),
+                                       Prog, path);
+                       }
+                       if (chmod(path, 0755) < 0) {
+                               fprintf(stderr,
+                                       _("%s: warning: chmod on `%s' failed: %m\n"),
+                                       Prog, path);
+                       }
                }
-               free(bhome);
+       }
+       free(bhome);
 
-               (void) chown(prefix_user_home, user_id, user_gid);
-               mode = getdef_num("HOME_MODE",
-                                 0777 & ~getdef_num("UMASK", GETDEF_DEFAULT_UMASK));
-               if (chmod(prefix_user_home, mode)) {
-                       fprintf(stderr, _("%s: warning: chown on '%s' failed: %m\n"),
-                               Prog, path);
-               }
-               home_added = true;
+       (void) chown(prefix_user_home, user_id, user_gid);
+       mode = getdef_num("HOME_MODE",
+                         0777 & ~getdef_num("UMASK", GETDEF_DEFAULT_UMASK));
+       if (chmod(prefix_user_home, mode)) {
+               fprintf(stderr, _("%s: warning: chown on '%s' failed: %m\n"),
+                       Prog, path);
+       }
+       home_added = true;
 #ifdef WITH_AUDIT
-               audit_logger(AUDIT_ADD_USER, Prog, "adding home directory",
-                            user_name, user_id, SHADOW_AUDIT_SUCCESS);
+       audit_logger(AUDIT_ADD_USER, Prog, "adding home directory",
+                    user_name, user_id, SHADOW_AUDIT_SUCCESS);
 #endif
 #ifdef WITH_SELINUX
-               /* Reset SELinux to create files with default contexts */
-               if (reset_selinux_file_context() != 0) {
-                       fprintf(stderr,
-                               _("%s: cannot reset SELinux file creation context\n"),
-                               Prog);
-                       fail_exit(E_HOMEDIR);
-               }
-#endif
+       /* Reset SELinux to create files with default contexts */
+       if (reset_selinux_file_context() != 0) {
+               fprintf(stderr,
+                       _("%s: cannot reset SELinux file creation context\n"),
+                       Prog);
+               fail_exit(E_HOMEDIR);
        }
+#endif
 }
 
 /*