Make user.c independent of command line options.

[adu.git] / create.c

diff --git a/create.c b/create.c
index d08da1c026909de78ccd4386d22d9545de139c80..2925d570d862b150b5786531c6a5dce51f5cb0e5 100644 (file)
--- a/create.c
+++ b/create.c
@@ -4,7 +4,7 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 

-/** \file create.c The create mode of adu. */
+/** \file create.c \brief The create mode of adu. */

 
 #include <dirent.h> /* readdir() */
 #include "format.h"
 
 #include <dirent.h> /* readdir() */
 #include "format.h"


@@ -58,9 +58,7 @@ static int update_user_row(struct osl_table *t, uint64_t dir_num,
                objects[UT_BYTES].size = sizeof(*add);
                objects[UT_FILES].data = &num_files;
                objects[UT_FILES].size = sizeof(num_files);
                objects[UT_BYTES].size = sizeof(*add);
                objects[UT_FILES].data = &num_files;
                objects[UT_FILES].size = sizeof(num_files);

-               INFO_LOG("######################### ret: %d\n", ret);

                ret = osl(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;
                return ret;
        } else { /* add size and increment file count */
                uint64_t num;


@@ -133,11 +131,9 @@ static int scan_dir(char *dirname, uint64_t *parent_dir_num)
                dir_size += size;
                dir_files++;
                uid = s.st_uid;
                dir_size += size;
                dir_files++;
                uid = s.st_uid;

-               ret = search_uid(uid, NULL, CREATE_USER_TABLE | OPEN_USER_TABLE, &ui);
+               ret = create_user_table(conf.database_dir_arg, uid, &ui);

                if (ret < 0)
                        goto out;
                if (ret < 0)
                        goto out;

-               ui->bytes += size;
-               ui->files++;

                ret = update_user_row(ui->table, this_dir_num, &size);
                if (ret < 0)
                        goto out;
                ret = update_user_row(ui->table, this_dir_num, &size);
                if (ret < 0)
                        goto out;


@@ -153,6 +149,11 @@ out:
        return ret;
 }
 
        return ret;
 }
 

+/**
+ * The main function of the create mode.
+ *
+ * \return Standard.
+ */

 int com_create(void)
 {
        uint64_t zero = 0ULL;
 int com_create(void)
 {
        uint64_t zero = 0ULL;


@@ -172,8 +173,7 @@ int com_create(void)
        ret = scan_dir(conf.base_dir_arg, &zero);
        if (ret < 0)
                goto out;
        ret = scan_dir(conf.base_dir_arg, &zero);
        if (ret < 0)
                goto out;

-       ret = write_uid_file();
+       ret = write_uid_file(conf.database_dir_arg);

 out:
 out:

-       close_all_tables();

        return ret;
 }
        return ret;
 }