#include "string.h"
#include "error.h"
#include "portable_io.h"
+#include "select.cmdline.h"
/** Global dir count. */
static uint64_t num_dirs;
static const char size_unit_abbrevs[] = " BKMGT";
static const char count_unit_abbrevs[] = " kmgt";
+struct select_args_info select_conf;
+static struct uid_range *admissible_uids;
static enum enum_size_unit format_size_value(enum enum_size_unit unit,
uint64_t value, int print_unit, char *result)
uint64_t val = *dirnum;
struct osl_object obj;
int ret;
+ char *pfx;
again:
obj.data = &val;
ret = osl(osl_get_object(dir_table, row, DT_NAME, &obj));
if (ret < 0)
goto out;
- if (val || conf.print_base_dir_given) {
- if (result) {
- tmp = make_message("%s/%s", (char *)obj.data, result);
- free(result);
- result = tmp;
- } else
- result = adu_strdup((char *)obj.data);
- }
+ pfx = (conf.print_base_dir_given || val)? (char *)obj.data : ".";
+ tmp = make_message("%s/%s", pfx, result? result : "");
+ free(result);
+ result = tmp;
if (val)
goto again;
out:
if (ret < 0) {
free(result);
*name = NULL;
- } else
+ } else {
+ assert(result);
*name = result;
+ }
return ret;
}
{
struct osl_object obj;
int ret;
- char *this_dir, *prefix = NULL;
*name = NULL;
- ret = osl(osl_get_object(dir_table, dir_table_row, DT_NAME, &obj));
+ ret = osl(osl_get_object(dir_table, dir_table_row, DT_NUM, &obj));
if (ret < 0)
return ret;
- this_dir = adu_strdup((char *)obj.data);
- ret = osl(osl_get_object(dir_table, dir_table_row, DT_PARENT_NUM, &obj));
- if (ret < 0)
- goto out;
- if (!*(uint64_t *)obj.data) {
- *name = this_dir;
- return 1;
- }
- ret = get_dir_name_by_number((uint64_t *)obj.data, &prefix);
- if (ret < 0)
- goto out;
- *name = make_message("%s/%s", prefix, this_dir);
- free(prefix);
- ret = 1;
-out:
- free(this_dir);
- return ret;
+ return get_dir_name_by_number((uint64_t *)obj.data, name);
}
+
static int user_stats_loop_function(struct osl_row *row, void *data)
{
struct user_stats_info *usi = data;
|| ula == user_list_arg_both);
if (print_size_list) {
- usi.count = conf.limit_arg;
+ usi.count = select_conf.limit_arg;
usi.ui = ui;
usi.flags = USF_PRINT_DIRNAME | USF_PRINT_BYTES | USF_COMPUTE_SUMMARY;
if (!conf.no_headers_given)
printf("%s (uid %u), by file count%s:\n",
ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid,
count_unit_buf);
- usi.count = conf.limit_arg,
+ usi.count = select_conf.limit_arg,
usi.ui = ui;
usi.flags = USF_PRINT_DIRNAME | USF_PRINT_FILES;
ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
printf("\n");
}
if (ula == user_list_arg_none && !conf.no_user_summary_given) {
- usi.count = conf.limit_arg;
+ usi.count = select_conf.limit_arg;
usi.ui = ui;
usi.flags = USF_COMPUTE_SUMMARY;
ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
|| gla == global_list_arg_both);
if (print_size_list) {
- gsi.count = conf.limit_arg;
+ gsi.count = select_conf.limit_arg;
gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_BYTES | GSF_COMPUTE_SUMMARY;
if (!conf.no_headers_given)
printf("By size%s:\n", size_unit_buf);
printf("\n");
}
if (gla == global_list_arg_file_count || gla == global_list_arg_both) {
- gsi.count = conf.limit_arg;
+ gsi.count = select_conf.limit_arg;
gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_FILES;
if (!print_size_list)
gsi.flags |= GSF_COMPUTE_SUMMARY;
}
if (gla == global_list_arg_none && !conf.no_global_summary_given) {
/* must compute summary */
- gsi.count = conf.limit_arg;
+ gsi.count = select_conf.limit_arg;
gsi.flags = GSF_COMPUTE_SUMMARY;
ret = adu_loop_reverse(dir_table, DT_FILES, &gsi,
global_stats_loop_function, &gsi.ret, &gsi.osl_errno);
create_hash_table(bits);
for (n = 0; n < num_uids; n++) {
uint32_t uid = read_u32(map + n * sizeof(uid));
- ret = search_uid(uid, OPEN_USER_TABLE, NULL);
+ ret = search_uid(uid, admissible_uids, OPEN_USER_TABLE, NULL);
if (ret < 0)
goto out;
}
int com_select(void)
{
int ret;
+ struct select_cmdline_parser_params params = {
+ .override = 1,
+ .initialize = 1,
+ .check_required = 1,
+ .check_ambiguity = 1,
+ .print_errors = 1
+ };
+
+ if (conf.select_options_given) {
+ if (select_cmdline_parser_string_ext(conf.select_options_arg,
+ &select_conf, "select", ¶ms))
+ return -E_SYNTAX;
+ ret = parse_uid_arg(select_conf.uid_arg, &admissible_uids);
+ if (ret < 0)
+ return ret;
+ }
if (conf.count_unit_arg != count_unit_arg_h)
count_unit_buf[1] = count_unit_abbrevs[conf.count_unit_arg];