From f15620c3774c164ee6c1e2fbf9dd481b606a95a1 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 8 Mar 2010 23:28:30 +0100
Subject: shell/ulimit: code shrink by 10 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
shell/builtin_ulimit.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'shell')
diff --git a/shell/builtin_ulimit.c b/shell/builtin_ulimit.c
index 7e8678341..9f9205eb6 100644
--- a/shell/builtin_ulimit.c
+++ b/shell/builtin_ulimit.c
@@ -175,15 +175,16 @@ int FAST_FUNC shell_builtin_ulimit(char **argv)
opt_char = 'f';
for (l = limits_tbl; l != &limits_tbl[ARRAY_SIZE(limits_tbl)]; l++) {
if (opt_char == l->option) {
- char *val_str = optarg ? optarg : (argv[optind] && argv[optind][0] != '-' ? argv[optind] : NULL);
+ char *val_str;
getrlimit(l->cmd, &limit);
+
+ val_str = optarg;
+ if (!val_str && argv[optind] && argv[optind][0] != '-')
+ val_str = argv[optind++]; /* ++ skips NN in "-c NN" case */
if (val_str) {
rlim_t val;
- if (!optarg) /* -c NNN: make getopt skip NNN */
- optind++;
-
if (strcmp(val_str, "unlimited") == 0)
val = RLIM_INFINITY;
else {
--
cgit v1.2.3-55-g6feb