#include "adu.h"
#include <dirent.h> /* readdir() */
#include <pwd.h>
+#include "format.h"
+#include "select.h"
#include "gcc-compat.h"
#include "cmdline.h"
/** Command line and config file options. */
struct gengetopt_args_info conf;
+/** Options passed to --select-options. */
+struct select_args_info select_conf;
+
/** The number of different uids found so far. */
uint32_t num_uids = 0;
*/
struct osl_table *dir_table = NULL;
-/**
- * The array of all uid ranges that were given at the command line.
- */
-struct uid_range *admissible_uids;
-
-
/**
* Compare the size of two directories
*
.column_descriptions = dir_table_cols,
};
+/*
+ * The columns of the per-user tables.
+ *
+ * Adu tracks disk usage on a per-user basis. For each user, a user table is
+ * being created. The rows of the user table have three columns: The directory
+ * number that may be resolved to the path using the directory table, the
+ * number of bytes and the number of files in that directory owned by the given
+ * user.
+ */
static struct osl_column_description user_table_cols[] = {
[UT_DIR_NUM] = {
.storage_type = OSL_MAPPED_STORAGE,
% uid_hash_table_size;
}
-static int uid_is_admissible(uint32_t uid)
+static int uid_is_admissible(uint32_t uid, struct uid_range *urs)
{
- int i;
-
- for (i = 0; i < conf.uid_given; i++) {
- struct uid_range *ur = admissible_uids + i;
+ struct uid_range *ur;
+ int ret = 1;
+ if (!urs) /* empty array means all uids are allowed */
+ return 1;
+ FOR_EACH_UID_RANGE(ur, urs)
if (ur->low <= uid && ur->high >= uid)
- break;
- }
- i = !conf.uid_given || i < conf.uid_given;
+ goto out;
+ ret = 0;
+out:
DEBUG_LOG("uid %u is %sadmissible\n", (unsigned)uid,
- i? "" : "not ");
- return i;
+ ret? "" : "not ");
+ return ret;
}
-int search_uid(uint32_t uid, enum search_uid_flags flags,
- struct user_info **ui_ptr)
+int search_uid(uint32_t uid, struct uid_range *urs,
+ enum search_uid_flags flags, struct user_info **ui_ptr)
{
uint32_t p;
return -E_BAD_UID;
ui->uid = uid;
ui->flags |= UI_FL_SLOT_USED;
- if (!uid_is_admissible(uid))
+ if (!uid_is_admissible(uid, urs))
return 0;
ui->flags |= UI_FL_ADMISSIBLE;
ret = open_user_table(ui, flags & CREATE_USER_TABLE);
static int check_args(void)
{
- int i, ret;
-
-
if (conf.create_given && !conf.base_dir_given)
return -E_SYNTAX;
conf.base_dir_arg[len] = '\0';
}
}
- if (!conf.uid_given)
- return 0;
- admissible_uids = adu_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)
- goto err;
- }
return 1;
-err:
- free(admissible_uids);
- admissible_uids = NULL;
- return ret;
}
int main(int argc, char **argv)
if (ret < 0)
goto out;
out:
- free(admissible_uids);
if (ret < 0) {
ERROR_LOG("%s\n", adu_strerror(-ret));
return -EXIT_FAILURE;