X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=select.c;h=9a19825ba0caf0bda41608242455b78a8fc3e564;hb=f101e2eebec54c87f2675a8e2a57f3418a824b9b;hp=949fd92755a369c7a2c572a2a96a1e782055c82e;hpb=de525e7c5b6592b41f8681f919d5d53406801861;p=adu.git

diff --git a/select.c b/select.c
index 949fd92..9a19825 100644
--- a/select.c
+++ b/select.c
@@ -578,7 +578,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 +657,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 +678,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?