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)
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)
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)
free(dirname);
ret = output("%s", buf);
free(buf);
+ if (ret < 0)
+ goto err;
if (gli->count > 0)
gli->count--;
return ret;
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)
#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)
int ret;
const char **line;
char *fmt = NULL;
- struct atom *atoms;
- if (conf.select_options_given) {
+ if (string) {
int argc;
char **argv;
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;
-
- 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 setup_format_string(fmt, fi);
help:
line = select_conf.detailed_help_given?
select_args_info_detailed_help : select_args_info_help;