Rename error message for E_OUTPUT.

[adu.git] / select.c

diff --git a/select.c b/select.c
index 949fd92755a369c7a2c572a2a96a1e782055c82e..3ec359eb07096f4f5ecc5fa815351757d935f99b 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)
@@ -657,7 +661,7 @@ int parse_select_options(char *string, struct select_cmdline_parser_params *para
        char *fmt = NULL;
        struct atom *atoms;
 
-       if (conf.select_options_given) {
+       if (string) {
                int argc;
                char **argv;
 
@@ -678,24 +682,34 @@ int parse_select_options(char *string, struct select_cmdline_parser_params *para
        if (ret < 0)
                return ret;
 
+       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);
 help:
        line = select_conf.detailed_help_given?