summaryrefslogtreecommitdiffstats
path: root/misc-utils/lsblk.c
diff options
context:
space:
mode:
authorBernhard Voelker2012-06-15 15:40:35 +0200
committerKarel Zak2012-06-19 11:06:48 +0200
commitf6da50d49bdd187534672ef002192787455044f0 (patch)
treed797e6fe8ecef99bfc57d3836c92d453098b6970 /misc-utils/lsblk.c
parentuuidd: move from /var/run/uuidd to /run/uuidd (diff)
downloadkernel-qcow2-util-linux-f6da50d49bdd187534672ef002192787455044f0.tar.gz
kernel-qcow2-util-linux-f6da50d49bdd187534672ef002192787455044f0.tar.xz
kernel-qcow2-util-linux-f6da50d49bdd187534672ef002192787455044f0.zip
lsblk: permit option --exclude more than once
Previously, `lsblk -e 8 -e 11` did not exlude maj:8 as requested. Signed-off-by: Bernhard Voelker <mail@bernhard-voelker.de>
Diffstat (limited to 'misc-utils/lsblk.c')
-rw-r--r--misc-utils/lsblk.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 24fb44f6d..bd5e6b782 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -153,8 +153,8 @@ struct lsblk *lsblk; /* global handler */
int columns[NCOLS];/* enabled columns */
int ncolumns; /* number of enabled columns */
-int excludes[256];
-size_t nexcludes;
+static int excludes[256];
+static size_t nexcludes;
static struct libmnt_table *mtab, *swaps;
static struct libmnt_cache *mntcache;
@@ -1080,8 +1080,6 @@ leave:
static void parse_excludes(const char *str)
{
- nexcludes = 0;
-
while (str && *str) {
char *end = NULL;
unsigned long n;