ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zramctl: fix show all non-zero zram devices 

Addresses: https://github.com/karelzak/util-linux/issues/521
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
James Sanford 2017-10-14 00:57:20 -07:00 committed by Karel Zak
parent 4847bb5ee9
commit e1b1c7b082
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys-utils/zramctl.c
View File

@ -23,6 +23,8 @@
#include <string.h>
#include <stdarg.h>
#include <assert.h>
#include <sys/types.h>
#include <dirent.h>
#include <libsmartcols.h>
@ -476,6 +478,8 @@ static void status(struct zram *z)
{
struct libscols_table *tb;
size_t i;
DIR *dir;
struct dirent *d;
scols_init_debug(0);
@ -493,22 +497,29 @@ static void status(struct zram *z)
err(EXIT_FAILURE, _("failed to initialize output column"));
}
if (z)
fill_table_row(tb, z); /* just one device specified */
else {
/* list all used devices */
z = new_zram(NULL);
for (i = 0; ; i++) {
zram_set_devname(z, NULL, i);
if (!zram_exist(z))
break;
if (zram_used(z))
fill_table_row(tb, z);
}
free_zram(z);
if (z) {
/* just one device specified */
fill_table_row(tb, z);
goto print_table;
}
/* list all used devices */
z = new_zram(NULL);
if (!(dir = opendir(_PATH_DEV)))
err(EXIT_FAILURE, _("cannot open %s"), _PATH_DEV);
while ((d = readdir(dir))) {
int n;
if (sscanf(d->d_name, "zram%d", &n) != 1)
continue;
zram_set_devname(z, NULL, n);
if (zram_exist(z) && zram_used(z))
fill_table_row(tb, z);
}
closedir(dir);
free_zram(z);
print_table:
scols_print_table(tb);
scols_unref_table(tb);
}