From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 28 Aug 2011 17:01:56 +0000 (+0200)
Subject: ipcrm: exit if unknown error occurs
X-Git-Tag: v2.21-rc1~402^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6054d3a7741fce0f1f96562db21ffa46ab8bc02a;p=thirdparty%2Futil-linux.git

ipcrm: exit if unknown error occurs

Previously for instance lack of memory space caused unknown
reason to be printed, and ipcrm tried to continue.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c
index 65d9ecb8c2..3ee1d51377 100644
--- a/sys-utils/ipcrm.c
+++ b/sys-utils/ipcrm.c
@@ -221,8 +221,7 @@ int main(int argc, char **argv)
 					errmsg = _("invalid key");
 					break;
 				default:
-					errmsg = _("unknown error in key");
-					break;
+					err(EXIT_FAILURE, _("key failed"));
 				}
 				warnx("%s (%s)", errmsg, optarg);
 				continue;
@@ -257,10 +256,9 @@ int main(int argc, char **argv)
 					: _("already removed id");
 				break;
 			default:
-				errmsg = iskey
-					? _("unknown error in key")
-					: _("unknown error in id");
-				break;
+				if (iskey)
+				        err(EXIT_FAILURE, _("key failed"));
+                                err(EXIT_FAILURE, _("id failed"));
 			}
 			warnx("%s (%s)", errmsg, optarg);
 			continue;