From: Karel Zak <kzak@redhat.com>
Date: Mon, 20 Jul 2015 09:56:44 +0000 (+0200)
Subject: lsipc: default to --global
X-Git-Tag: v2.27-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25456d5da3dac2f563c8d7e44dab0bb4143426d9;p=thirdparty%2Futil-linux.git

lsipc: default to --global

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

diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c
index 032ba7f0a0..7a648bf1f2 100644
--- a/sys-utils/lsipc.c
+++ b/sys-utils/lsipc.c
@@ -1200,14 +1200,7 @@ int main(int argc, char *argv[])
 			break;
 		case 'g':
 			global = 1;
-			add_column(columns, ncolumns++, COL_RESOURCE);
-			add_column(columns, ncolumns++, COL_DESC);
-			add_column(columns, ncolumns++, COL_LIMIT);
-			add_column(columns, ncolumns++, COL_USED);
-			add_column(columns, ncolumns++, COL_USEPERC);
-			LOWER = COLDESC_IDX_SUM_FIRST;
-			UPPER = COLDESC_IDX_SUM_LAST;
-			break;
+						break;
 		case 'q':
 			msg = 1;
 			add_column(columns, ncolumns++, COL_KEY);
@@ -1284,12 +1277,19 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (msg + shm + sem != 1 && !global)
-		errx (EXIT_FAILURE,
-		      _("One of --shmems, --queues, --semaphores or --glocal must be specified"));
-
-	if (global && msg + shm + sem == 0)
-		msg = shm = sem = 1;
+	/* default is global */
+	if (msg + shm + sem == 0)
+		msg = shm = sem = global = 1;
+
+	if (global) {
+		add_column(columns, ncolumns++, COL_RESOURCE);
+		add_column(columns, ncolumns++, COL_DESC);
+		add_column(columns, ncolumns++, COL_LIMIT);
+		add_column(columns, ncolumns++, COL_USED);
+		add_column(columns, ncolumns++, COL_USEPERC);
+		LOWER = COLDESC_IDX_SUM_FIRST;
+		UPPER = COLDESC_IDX_SUM_LAST;
+	}
 
 	if (!ctl->time_mode)
 		ctl->time_mode = ctl->outmode == OUT_PRETTY ? TIME_FULL : TIME_SHORT;