lslocks: add --bytes cleanup SIZE usage

The new command line option --bytes disables human readable output for
the SIZE and keep size in bytes. We use the same concept for all our
utils.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/misc-utils/lslocks.8 b/misc-utils/lslocks.8
index 5c7fb6f9e70d3d52e610e11c184ab7fb4cc66ff4..ba0f4475291bfe5f910ff6d8f7186de36566d1c1 100644 (file)
--- a/misc-utils/lslocks.8
+++ b/misc-utils/lslocks.8
@@ -20,6 +20,9 @@ since Linux 3.15, see \fBfcntl\fR(2) for more details.
 
 .SH OPTIONS
 .TP
+.BR \-b , " \-\-bytes"
+Print the SIZE column in bytes rather than in a human-readable format.
+.TP
 .BR \-i , " \-\-noinaccessible"
 Ignore lock files which are inaccessible for the current user.
 .TP

diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index 91711116871dd1d6a10882cbb7d9f610b4ff3488..ffafdcb0ba68ea8cb221f09c0a28f98624e27938 100644 (file)
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -94,6 +94,7 @@ static int no_headings;
 static int no_inaccessible;
 static int raw;
 static int json;
+static int bytes;
 
 struct lock {
        struct list_head locks;
@@ -107,7 +108,7 @@ struct lock {
        off_t end;
        unsigned int mandatory :1,
                     blocked   :1;
-       char *size;
+       uint64_t size;
        int id;
 };
 
@@ -117,7 +118,6 @@ static void rem_lock(struct lock *lock)
                return;
 
        free(lock->path);
-       free(lock->size);
        free(lock->mode);
        free(lock->cmdname);
        free(lock->type);
@@ -318,10 +318,9 @@ static int get_local_locks(struct list_head *locks)
                if (!l->path) {
                        /* probably no permission to peek into l->pid's path */
                        l->path = get_fallback_filename(dev);
-                       l->size = xstrdup("");
+                       l->size = 0;
                } else
-                       /* avoid leaking */
-                       l->size = size_to_human_string(SIZE_SUFFIX_1LETTER, sz);
+                       l->size = sz;
 
                list_add(&l->locks, locks);
        }
@@ -407,7 +406,12 @@ static void add_scols_line(struct libscols_table *table, struct lock *l, struct
                        xasprintf(&str, "%s", l->type);
                        break;
                case COL_SIZE:
-                       xasprintf(&str, "%s", l->size);
+                       if (!l->size)
+                               break;
+                       if (bytes)
+                               xasprintf(&str, "%ju", l->size);
+                       else
+                               str = size_to_human_string(SIZE_SUFFIX_1LETTER, l->size);
                        break;
                case COL_MODE:
                        xasprintf(&str, "%s%s", l->mode, l->blocked ? "*" : "");
@@ -501,6 +505,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("List local system locks.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
+       fputs(_(" -b, --bytes            print SIZE in bytes rather than in human readable format\n"), out);
        fputs(_(" -J, --json             use JSON output format\n"), out);
        fputs(_(" -i, --noinaccessible   ignore locks without read permissions\n"), out);
        fputs(_(" -n, --noheadings       don't print headings\n"), out);
@@ -528,6 +533,7 @@ int main(int argc, char *argv[])
        struct list_head locks;
        char *outarg = NULL;
        static const struct option long_opts[] = {
+               { "bytes",      no_argument,       NULL, 'b' },
                { "json",       no_argument,       NULL, 'J' },
                { "pid",        required_argument, NULL, 'p' },
                { "help",       no_argument,       NULL, 'h' },
@@ -551,11 +557,14 @@ int main(int argc, char *argv[])
        atexit(close_stdout);
 
        while ((c = getopt_long(argc, argv,
-                               "iJp:o:nruhV", long_opts, NULL)) != -1) {
+                               "biJp:o:nruhV", long_opts, NULL)) != -1) {
 
                err_exclusive_options(c, long_opts, excl, excl_st);
 
                switch(c) {
+               case 'b':
+                       bytes = 1;
+                       break;
                case 'i':
                        no_inaccessible = 1;
                        break;