Move code for setting up the format string to an own function.

[adu.git] / select.c

diff --git a/select.c b/select.c
index 949fd92755a369c7a2c572a2a96a1e782055c82e..c26b54859fde1549f03f475fe961b70b3c43cd41 100644 (file)
--- a/select.c
+++ b/select.c
@@ -282,7 +282,7 @@ static int global_summary_loop_function(struct osl_row *row, void *data)
 err:
        gsi->ret = ret;
        gsi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
-       return -1;
+       return ret;
 }
 
 static int print_global_summary(struct format_info *fi)
@@ -334,7 +334,7 @@ static int user_summary_loop_function(struct osl_row *row, void *data)
 err:
        usi->ret = ret;
        usi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
-       return -1;
+       return ret;
 }
 
 static int compute_user_summary(struct user_info *ui, __a_unused void *data)
@@ -468,12 +468,14 @@ static int user_list_loop_function(struct osl_row *row, void *data)
        free(dirname);
        ret = output("%s", buf);
        free(buf);
+       if (ret < 0)
+               goto err;
        uli->count--;
        return ret;
 err:
        uli->ret = ret;
        uli->osl_errno = (ret == -E_OSL)? osl_errno : 0;
-       return -1;
+       return ret;
 }
 
 static int print_user_list(struct user_info *ui, void *data)
@@ -536,6 +538,8 @@ static int global_list_loop_function(struct osl_row *row, void *data)
        free(dirname);
        ret = output("%s", buf);
        free(buf);
+       if (ret < 0)
+               goto err;
        if (gli->count > 0)
                gli->count--;
        return ret;
@@ -578,7 +582,7 @@ static int print_statistics(struct format_info *fi)
                        return print_user_summary(fi);
        };
        ERROR_LOG("bad select mode\n");
-       return ERRNO_TO_ERROR(-EINVAL);
+       return -ERRNO_TO_ERROR(-EINVAL);
 }
 
 static int read_uid_file(struct uid_range *admissible_uids)
@@ -648,6 +652,41 @@ out:
 #define USER_LIST_DFLT_FMT "%(size:r:5) %(files:r:5) %(dirname)\n"
 #define USER_SUMMARY_DFLT_FMT "%(pw_name:l:16) %(uid:r:5) %(dirs:r:5) %(files:r:5) %(size:r:5)\n"
 
+static int setup_format_string(char *fmt, struct format_info **fi)
+{
+       struct atom *atoms;
+
+       if (!fmt)
+               INFO_LOG("using default format string\n");
+       switch (select_conf.select_mode_arg) {
+       case select_mode_arg_global_list:
+               if (!fmt)
+                       fmt = GLOBAL_LIST_DFLT_FMT;
+               atoms = global_list_atoms;
+               break;
+       case select_mode_arg_global_summary:
+               if (!fmt)
+                       fmt = GLOBAL_SUMMARY_DFLT_FMT;
+               atoms = global_summary_atoms;
+               break;
+       case select_mode_arg_user_list:
+               if (!fmt)
+                       fmt = USER_LIST_DFLT_FMT;
+               atoms = user_list_atoms;
+               break;
+       case select_mode_arg_user_summary:
+               if (!fmt)
+                       fmt = USER_SUMMARY_DFLT_FMT;
+               atoms = user_summary_atoms;
+               break;
+       default:
+               ERROR_LOG("bad select mode\n");
+               return -ERRNO_TO_ERROR(-EINVAL);
+       };
+       INFO_LOG("format string: %s\n", fmt);
+       return parse_format_string(fmt, atoms, fi);
+}
+
 /* return: < 0: error, >0: OK, == 0: help given */
 int parse_select_options(char *string, struct select_cmdline_parser_params *params,
                struct uid_range **admissible_uids, struct format_info **fi)
@@ -655,9 +694,8 @@ int parse_select_options(char *string, struct select_cmdline_parser_params *para
        int ret;
        const char **line;
        char *fmt = NULL;
-       struct atom *atoms;
 
-       if (conf.select_options_given) {
+       if (string) {
                int argc;
                char **argv;
 
@@ -672,31 +710,11 @@ int parse_select_options(char *string, struct select_cmdline_parser_params *para
                if (select_conf.help_given || select_conf.detailed_help_given)
                        goto help;
                fmt = select_conf.format_arg;
-
        }
        ret = parse_uid_arg(select_conf.uid_arg, admissible_uids);
        if (ret < 0)
                return ret;
-
-       switch (select_conf.select_mode_arg) {
-               case select_mode_arg_global_list:
-                       if (!fmt)
-                               fmt = GLOBAL_LIST_DFLT_FMT;
-                       atoms = global_list_atoms;
-               case select_mode_arg_global_summary:
-                       if (!fmt)
-                               fmt = GLOBAL_SUMMARY_DFLT_FMT;
-                       atoms = global_summary_atoms;
-               case select_mode_arg_user_list:
-                       if (!fmt)
-                               fmt = USER_LIST_DFLT_FMT;
-                       atoms = user_list_atoms;
-               case select_mode_arg_user_summary:
-                       if (!fmt)
-                               fmt = USER_SUMMARY_DFLT_FMT;
-                       atoms = user_summary_atoms;
-       };
-       return parse_format_string(fmt, atoms, fi);
+       return setup_format_string(fmt, fi);
 help:
        line = select_conf.detailed_help_given?
                select_args_info_detailed_help : select_args_info_help;