#include "portable_io.h"
DEFINE_ERRLIST;
+int osl_errno;
/** Command line and config file options. */
static struct gengetopt_args_info conf;
dir_objects[DT_BYTES].size = sizeof(*dir_size);
dir_objects[DT_FILES].data = dir_files;
dir_objects[DT_FILES].size = sizeof(*dir_files);
-
- return osl_add_row(dir_table, dir_objects);
+ return osl(osl_add_row(dir_table, dir_objects));
}
static uint32_t num_uids;
INFO_LOG(".............................uid #%u: %u\n",
(unsigned)num_uids, (unsigned)ui->uid);
if (create) {
- ret = osl_create_table(ui->desc);
+ ret = osl(osl_create_table(ui->desc));
if (ret < 0)
goto err;
num_uids++;
}
- ret = osl_open_table(ui->desc, &ui->table);
+ ret = osl(osl_open_table(ui->desc, &ui->table));
if (ret < 0)
goto err;
return 1;
int ret;
dir_table_desc.dir = para_strdup(conf.database_dir_arg);
- ret = osl_create_table(&dir_table_desc);
+ ret = osl(osl_create_table(&dir_table_desc));
if (ret < 0)
return ret;
create_hash_table();
struct osl_row *row;
struct osl_object obj = {.data = &dir_num, .size = sizeof(dir_num)};
- int ret = osl_get_row(t, UT_DIR_NUM, &obj, &row);
+ int ret = osl(osl_get_row(t, UT_DIR_NUM, &obj, &row));
- if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
+ if (ret == -E_OSL && osl_errno != E_OSL_RB_KEY_NOT_FOUND)
return ret;
if (ret < 0) { /* this is the first file we add */
struct osl_object objects[NUM_UT_COLUMNS];
objects[UT_FILES].data = &num_files;
objects[UT_FILES].size = sizeof(num_files);
INFO_LOG("######################### ret: %d\n", ret);
- ret = osl_add_row(t, objects);
+ ret = osl(osl_add_row(t, objects));
INFO_LOG("######################### ret: %d\n", ret);
return ret;
} else { /* add size and increment file count */
uint64_t num;
struct osl_object obj1, obj2 = {.data = &num, .size = sizeof(num)};
- ret = osl_get_object(t, row, UT_BYTES, &obj1);
+ ret = osl(osl_get_object(t, row, UT_BYTES, &obj1));
if (ret < 0)
return ret;
num = *(uint64_t *)obj1.data + *add;
- ret = osl_update_object(t, row, UT_BYTES, &obj2);
+ ret = osl(osl_update_object(t, row, UT_BYTES, &obj2));
if (ret < 0)
return ret;
- ret = osl_get_object(t, row, UT_FILES, &obj1);
+ ret = osl(osl_get_object(t, row, UT_FILES, &obj1));
if (ret < 0)
return ret;
num = *(uint64_t *)obj1.data + 1;
- return osl_update_object(t, row, UT_FILES, &obj2);
+ return osl(osl_update_object(t, row, UT_FILES, &obj2));
}
}
int ret;
again:
- ret = osl_get_row(dir_table, DT_NUM, &obj, &row);
+ ret = osl(osl_get_row(dir_table, DT_NUM, &obj, &row));
if (ret < 0)
goto out;
- ret = osl_get_object(dir_table, row, DT_NAME, &obj);
+ ret = osl(osl_get_object(dir_table, row, DT_NAME, &obj));
if (ret < 0)
goto out;
if (result) {
result = tmp;
} else
result = para_strdup((char *)obj.data);
- ret = osl_get_object(dir_table, row, DT_PARENT_NUM, &obj);
+ ret = osl(osl_get_object(dir_table, row, DT_PARENT_NUM, &obj));
if (ret < 0)
goto out;
val = *(uint64_t *)obj.data;
char *this_dir, *prefix = NULL;
*name = NULL;
- ret = osl_get_object(dir_table, dir_table_row, DT_NAME, &obj);
+ ret = osl(osl_get_object(dir_table, dir_table_row, DT_NAME, &obj));
if (ret < 0)
return ret;
this_dir = para_strdup((char *)obj.data);
- ret = osl_get_object(dir_table, dir_table_row, DT_PARENT_NUM, &obj);
+ ret = osl(osl_get_object(dir_table, dir_table_row, DT_PARENT_NUM, &obj));
if (ret < 0)
goto out;
if (!*(uint64_t *)obj.data) {
struct global_stats_info {
uint32_t count;
+ int ret;
+ int osl_errno;
enum global_stats_flags flags;
};
char *dirname, formated_value[25];
int ret, summary = gsi->flags & GSF_COMPUTE_SUMMARY;
- if (!gsi->count && !summary)
- return -E_LOOP_COMPLETE;
+ if (!gsi->count && !summary) {
+ ret = -E_LOOP_COMPLETE;
+ goto err;
+ }
if (gsi->count && (gsi->flags & GSF_PRINT_DIRNAME)) {
ret = get_dir_name_of_row(row, &dirname);
if (ret < 0)
- return ret;
+ goto err;
printf("%s%s", dirname,
(gsi->flags & (GSF_PRINT_FILES | GSF_PRINT_BYTES))?
"\t" : "\n"
}
if (summary || (gsi->count && (gsi->flags & GSF_PRINT_FILES))) {
uint64_t files;
- ret = osl_get_object(dir_table, row, DT_FILES, &obj);
+ ret = osl(osl_get_object(dir_table, row, DT_FILES, &obj));
if (ret < 0)
- return ret;
+ goto err;
files = *(uint64_t *)obj.data;
if (gsi->count && (gsi->flags & GSF_PRINT_FILES)) {
format_size_value(conf.size_unit_arg, files,
}
if (summary || (gsi->count && (gsi->flags & GSF_PRINT_BYTES))) {
uint64_t bytes;
- ret = osl_get_object(dir_table, row, DT_BYTES, &obj);
+ ret = osl(osl_get_object(dir_table, row, DT_BYTES, &obj));
if (ret < 0)
- return ret;
+ goto err;
bytes = *(uint64_t *)obj.data;
if (gsi->count && (gsi->flags & GSF_PRINT_BYTES)) {
format_size_value(conf.size_unit_arg, bytes,
if (gsi->count > 0)
gsi->count--;
return 1;
+err:
+ gsi->ret = ret;
+ gsi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
+ return -1;
}
static void print_id_stats(void)
struct user_stats_info {
uint32_t count;
enum user_stats_flags flags;
+ int ret;
+ int osl_errno;
struct user_info *ui;
};
static int user_stats_loop_function(struct osl_row *row, void *data)
{
struct user_stats_info *usi = data;
- struct osl_row *dir_row;
struct osl_object obj;
int ret, summary = usi->flags & GSF_COMPUTE_SUMMARY;
char formated_value[25];
- if (!usi->count && !summary)
- return -E_LOOP_COMPLETE;
+ if (!usi->count && !summary) {
+ ret = -E_LOOP_COMPLETE;
+ goto err;
+ }
if (usi->count && (usi->flags & USF_PRINT_DIRNAME)) {
char *dirname;
- ret = osl_get_object(usi->ui->table, row, UT_DIR_NUM, &obj);
+ ret = osl(osl_get_object(usi->ui->table, row, UT_DIR_NUM, &obj));
if (ret < 0)
- return ret;
+ goto err;
ret = get_dir_name_by_number((uint64_t *)obj.data, &dirname);
if (ret < 0)
- return ret;
+ goto err;
printf("%s%s",
dirname,
(usi->flags & (USF_PRINT_FILES | USF_PRINT_BYTES))?
}
if (summary || (usi->count && (usi->flags & USF_PRINT_FILES))) {
uint64_t files;
- ret = osl_get_object(usi->ui->table, row, UT_FILES, &obj);
+ ret = osl(osl_get_object(usi->ui->table, row, UT_FILES, &obj));
if (ret < 0)
- return ret;
+ goto err;
files = *(uint64_t *)obj.data;
if (usi->count && (usi->flags & USF_PRINT_FILES)) {
format_size_value(conf.size_unit_arg, files,
}
if (summary || (usi->count && (usi->flags & USF_PRINT_BYTES))) {
uint64_t bytes;
- ret = osl_get_object(usi->ui->table, row, UT_BYTES, &obj);
+ ret = osl(osl_get_object(usi->ui->table, row, UT_BYTES, &obj));
if (ret < 0)
- return ret;
+ goto err;
bytes = *(uint64_t *)obj.data;
if (usi->count && (usi->flags & USF_PRINT_BYTES)) {
format_size_value(conf.size_unit_arg, bytes,
if (usi->count > 0)
usi->count--;
return 1;
+err:
+ usi->ret = ret;
+ usi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
+ return -1;
}
-static void print_user_stats(void)
+static int check_loop_return(int ret, int loop_ret, int loop_osl_errno)
+{
+ if (ret >= 0)
+ return ret;
+ assert(ret == -E_OSL);
+ if (osl_errno != E_OSL_LOOP)
+ /* error not caused by loop function returning negative. */
+ return ret;
+ assert(loop_ret < 0);
+ if (loop_ret == -E_LOOP_COMPLETE) /* no error */
+ return 1;
+ if (loop_ret == -E_OSL) { /* osl error in loop function */
+ assert(loop_osl_errno);
+ osl_errno = loop_osl_errno;
+ }
+ return loop_ret;
+}
+
+static int adu_loop_reverse(struct osl_table *t, unsigned col_num, void *private_data,
+ osl_rbtree_loop_func *func, int *loop_ret, int *loop_osl_errno)
+{
+ int ret = osl(osl_rbtree_loop_reverse(t, col_num, private_data, func));
+ return check_loop_return(ret, *loop_ret, *loop_osl_errno);
+}
+
+static int print_user_stats(void)
{
struct user_info *ui;
+ int ret;
FOR_EACH_USER(ui) {
struct user_stats_info usi = {
printf("************************************************ uid %u\n",
(unsigned) ui->uid);
printf("----------------- Largest dirs -------------------\n");
- osl_rbtree_loop_reverse(ui->table, UT_BYTES, &usi,
- user_stats_loop_function);
+ ret = adu_loop_reverse(ui->table, UT_BYTES, &usi, user_stats_loop_function,
+ &usi.ret, &usi.osl_errno);
+ if (ret < 0)
+ return ret;
printf("---------- dirs containing most files ------------\n");
usi.count = conf.limit_arg,
usi.flags = USF_PRINT_DIRNAME | USF_PRINT_FILES;
- osl_rbtree_loop_reverse(ui->table, UT_FILES, &usi,
- user_stats_loop_function);
+ ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
+ &usi.ret, &usi.osl_errno);
+ if (ret < 0)
+ return ret;
}
+ return 1;
}
static int print_statistics(void)
};
printf("----------------- Largest dirs -------------------\n");
- ret = osl_rbtree_loop_reverse(dir_table, DT_BYTES, &gsi,
- global_stats_loop_function);
- if (ret < 0 && ret != -E_LOOP_COMPLETE)
+ ret = adu_loop_reverse(dir_table, DT_BYTES, &gsi,
+ global_stats_loop_function, &gsi.ret, &gsi.osl_errno);
+ if (ret < 0)
return ret;
gsi.count = conf.limit_arg;
gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_FILES;
printf("---------- dirs containing most files ------------\n");
- ret = osl_rbtree_loop_reverse(dir_table, DT_FILES, &gsi,
- global_stats_loop_function);
- if (ret < 0 && ret != -E_LOOP_COMPLETE)
+ ret = adu_loop_reverse(dir_table, DT_FILES, &gsi,
+ global_stats_loop_function, &gsi.ret, &gsi.osl_errno);
+ if (ret < 0)
return ret;
-
printf("------------------ Global summary (dirs/files/bytes)\n"
"%llu\t%llu\t%llu\n",
(long long unsigned)num_dirs, (long long unsigned)num_files,
{
if (!dir_table_desc.dir) /* we did not create the table */
dir_table_desc.dir = para_strdup(conf.database_dir_arg);
- return osl_open_table(&dir_table_desc, &dir_table);
+ return osl(osl_open_table(&dir_table_desc, &dir_table));
}
static void close_dir_table(void)
if (!dir_table)
return;
- ret = osl_close_table(dir_table, OSL_MARK_CLEAN);
+ ret = osl(osl_close_table(dir_table, OSL_MARK_CLEAN));
if (ret < 0)
- ERROR_LOG("failed to close dir table: %s\n", error_txt(-ret));
+ ERROR_LOG("failed to close dir table: %s\n", adu_strerror(-ret));
free((char *)dir_table_desc.dir);
dir_table = NULL;
}
if (!ui || !ui_used(ui) || !ui_admissible(ui))
return;
- ret = osl_close_table(ui->table, OSL_MARK_CLEAN);
+ ret = osl(osl_close_table(ui->table, OSL_MARK_CLEAN));
if (ret < 0)
ERROR_LOG("failed to close user table %u: %s\n",
- (unsigned) ui->uid, error_txt(-ret));
+ (unsigned) ui->uid, adu_strerror(-ret));
free((char *)ui->desc->name);
ui->desc->name = NULL;
free((char *)ui->desc->dir);
{
int i, ret;
+ /* remove trailing slashes from base-dir arg */
+ if (conf.base_dir_given) {
+ size_t len = strlen(conf.base_dir_arg);
+ for (;;) {
+ if (!len) /* empty string */
+ return -ERRNO_TO_ERROR(EINVAL);
+ if (!--len) /* length 1 is always OK */
+ break;
+ if (conf.base_dir_arg[len] != '/')
+ break; /* no trailing slash, also OK */
+ conf.base_dir_arg[len] = '\0';
+ }
+ }
if (!conf.uid_given)
return 0;
-
admissible_uids = para_malloc(conf.uid_given * sizeof(*admissible_uids));
-
for (i = 0; i < conf.uid_given; i++) {
ret = parse_uid_range(conf.uid_arg[i], admissible_uids + i);
if (ret < 0)
out:
free(admissible_uids);
if (ret < 0) {
- ERROR_LOG("%s\n", error_txt(-ret));
+ ERROR_LOG("%s\n", adu_strerror(-ret));
return -EXIT_FAILURE;
}
return EXIT_SUCCESS;
projects / adu.git / blobdiff