diff options
author | Ron Yorston <rmy@pobox.com> | 2019-08-16 09:42:39 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2019-08-16 09:45:21 +0100 |
commit | 517cf74f6265ec4308b790b637b3f9778cbdc6e0 (patch) | |
tree | be9337069b60ca1bb03565d8575bacfc71181003 /shell/shell_common.c | |
parent | ae65dc37bcc9b1d9cef0b111131c79dc4ba1bf51 (diff) | |
parent | ac78f2ac96b3efd6551a08e7dc609efa1fb69481 (diff) | |
download | busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.gz busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.bz2 busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/shell_common.c')
-rw-r--r-- | shell/shell_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/shell_common.c b/shell/shell_common.c index d1df5888c..06a6b6e5f 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c | |||
@@ -668,7 +668,7 @@ shell_builtin_ulimit(char **argv) | |||
668 | limit.rlim_cur = val; | 668 | limit.rlim_cur = val; |
669 | //bb_error_msg("setrlimit(%d, %lld, %lld)", limits_tbl[i].cmd, (long long)limit.rlim_cur, (long long)limit.rlim_max); | 669 | //bb_error_msg("setrlimit(%d, %lld, %lld)", limits_tbl[i].cmd, (long long)limit.rlim_cur, (long long)limit.rlim_max); |
670 | if (setrlimit(limits_tbl[i].cmd, &limit) < 0) { | 670 | if (setrlimit(limits_tbl[i].cmd, &limit) < 0) { |
671 | bb_perror_msg("error setting limit"); | 671 | bb_simple_perror_msg("error setting limit"); |
672 | return EXIT_FAILURE; | 672 | return EXIT_FAILURE; |
673 | } | 673 | } |
674 | } | 674 | } |