Do not use "B" suffix for quantities that are not bytes.

[adu.git] / adu.c

diff --git a/adu.c b/adu.c
index 8721089f67eec9064967a46b399f02bb284e3613..8af09cd21358c5fa68138c95ef008f86e4db9232 100644 (file)
--- a/adu.c
+++ b/adu.c
@@ -80,10 +80,8 @@ static int parse_uid_range(const char *orig_arg, struct uid_range *ur)
        int ret;
        char *arg = para_strdup(orig_arg), *p = strchr(arg, '-');
 
-       if (!p || p == arg) {
-               if (p == arg) /* -42 */
-                       p++;
-               ret = check_uid_arg(p, &ur->high);
+       if (!p || p == arg) { /* -42 or 42 */
+               ret = check_uid_arg(p? p + 1 : arg, &ur->high);
                if (ret < 0)
                        goto out;
                ur->low = p? 0 : ur->high;
@@ -709,7 +707,7 @@ static int global_stats_loop_function(struct osl_row *row, void *data)
                        goto err;
                files = *(uint64_t *)obj.data;
                if (gsi->count && (gsi->flags & GSF_PRINT_FILES)) {
-                       format_size_value(conf.size_unit_arg, files,
+                       format_count_value(conf.size_unit_arg, files,
                                formated_value);
                        printf("%s%s", formated_value,
                                (gsi->flags & GSF_PRINT_BYTES)? "\t" : "\n");
@@ -724,7 +722,7 @@ static int global_stats_loop_function(struct osl_row *row, void *data)
                        goto err;
                bytes = *(uint64_t *)obj.data;
                if (gsi->count && (gsi->flags & GSF_PRINT_BYTES)) {
-                       format_size_value(conf.size_unit_arg, bytes,
+                       format_count_value(conf.size_unit_arg, bytes,
                                formated_value);
                        printf("%s\n", formated_value);
                }
@@ -750,7 +748,7 @@ static void print_id_stats(void)
        FOR_EACH_USER(ui) {
                char formated_dir_count[25], formated_file_count[25],
                        formated_bytes[25];
-               if (!ui_used(ui))
+               if (!ui_used(ui) || !ui_admissible(ui))
                        continue;
                format_count_value(conf.count_unit_arg, ui->dirs,
                        formated_dir_count);
@@ -813,7 +811,7 @@ static int user_stats_loop_function(struct osl_row *row, void *data)
                        goto err;
                files = *(uint64_t *)obj.data;
                if (usi->count && (usi->flags & USF_PRINT_FILES)) {
-                       format_size_value(conf.size_unit_arg, files,
+                       format_count_value(conf.size_unit_arg, files,
                                formated_value);
                        printf("%s%s", formated_value,
                                (usi->flags & USF_PRINT_BYTES)? "\t" : "\n"
@@ -829,7 +827,7 @@ static int user_stats_loop_function(struct osl_row *row, void *data)
                        goto err;
                bytes = *(uint64_t *)obj.data;
                if (usi->count && (usi->flags & USF_PRINT_BYTES)) {
-                       format_size_value(conf.size_unit_arg, bytes,
+                       format_count_value(conf.size_unit_arg, bytes,
                                formated_value);
                        printf("%s\n", formated_value);
                }