diff options
| author | Rob Landley <rob@landley.net> | 2018-08-25 15:32:22 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2018-08-25 15:32:22 -0500 |
| commit | 482c422f8e8ec517de071266d425b425c4628103 (patch) | |
| tree | 709d459ba58b1416c340ffedab69faf21d4bee99 /toys/posix/ulimit.c | |
| parent | 79c403179b603a9f3c8cd120a93c2f560017864b (diff) | |
| download | toybox-482c422f8e8ec517de071266d425b425c4628103.tar.gz | |
Convert more argument variables in GLOBALS() to new style.
Diffstat (limited to 'toys/posix/ulimit.c')
| -rw-r--r-- | toys/posix/ulimit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/toys/posix/ulimit.c b/toys/posix/ulimit.c index 0aedd2cc..4fa01618 100644 --- a/toys/posix/ulimit.c +++ b/toys/posix/ulimit.c @@ -17,6 +17,7 @@ * runtime). We support -P to affect processes other than us. USE_ULIMIT(NEWTOY(ulimit, ">1P#<1SHavutsrRqpnmlifedc[-SH][!apvutsrRqnmlifedc]", TOYFLAG_USR|TOYFLAG_BIN)) +USE_ULIMIT(OLDTOY(prlimit, ulimit, TOYFLAG_USR|TOYFLAG_BIN)) config ULIMIT bool "ulimit" @@ -45,7 +46,7 @@ config ULIMIT #include "toys.h" GLOBALS( - long pid; + long P; ) // This is a linux kernel syscall added in 2.6.36 (git c022a0acad53) which @@ -70,14 +71,14 @@ void ulimit_main(void) if ((toys.optflags&(FLAG_a|FLAG_p)) && toys.optc) error_exit("can't set -ap"); // Fetch data - if (!(toys.optflags&FLAG_P)) TT.pid = getppid(); + if (!(toys.optflags&FLAG_P)) TT.P = getppid(); for (i=0; i<sizeof(map); i++) { char *flags="cdefilmnpqRrstuv"; int get = toys.optflags&(FLAG_a|(1<<i)); - if (get && prlimit(TT.pid, map[i], 0, &rr)) perror_exit("-%c", flags[i]); + if (get && prlimit(TT.P, map[i], 0, &rr)) perror_exit("-%c", flags[i]); if (!toys.optc) { if (toys.optflags&FLAG_a) printf("-%c: ", flags[i]); if (get) { @@ -112,6 +113,6 @@ void ulimit_main(void) if (toys.optflags&FLAG_H) rr.rlim_max = val; else rr.rlim_cur = val; - if (prlimit(TT.pid, map[i], &rr, 0)) perror_exit(0); + if (prlimit(TT.P, map[i], &rr, 0)) perror_exit(0); } } |