diff options
Diffstat (limited to 'Src/Builtins')
| -rw-r--r-- | Src/Builtins/rlimits.c | 18 | ||||
| -rw-r--r-- | Src/Builtins/sched.c | 26 |
2 files changed, 26 insertions, 18 deletions
diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c index 7d20ab07b..228bba344 100644 --- a/Src/Builtins/rlimits.c +++ b/Src/Builtins/rlimits.c @@ -283,15 +283,15 @@ printulimit(int lim, int hard, int head) /**/ static int -bin_limit(char *nam, char **argv, char *ops, int func) +bin_limit(char *nam, char **argv, Options ops, int func) { char *s; int hard, limnum, lim; rlim_t val; int ret = 0; - hard = ops['h']; - if (ops['s'] && !*argv) + hard = OPT_ISSET(ops,'h'); + if (OPT_ISSET(ops,'s') && !*argv) return setlimits(NULL); /* without arguments, display limits */ if (!*argv) { @@ -380,7 +380,7 @@ bin_limit(char *nam, char **argv, char *ops, int func) return 1; } else limits[lim].rlim_cur = val; - if (ops['s'] && zsetlimit(lim, "limit")) + if (OPT_ISSET(ops,'s') && zsetlimit(lim, "limit")) ret++; } return ret; @@ -391,13 +391,13 @@ bin_limit(char *nam, char **argv, char *ops, int func) /**/ static int -bin_unlimit(char *nam, char **argv, char *ops, int func) +bin_unlimit(char *nam, char **argv, Options ops, int func) { int hard, limnum, lim; int ret = 0; uid_t euid = geteuid(); - hard = ops['h']; + hard = OPT_ISSET(ops,'h'); /* Without arguments, remove all limits. */ if (!*argv) { for (limnum = 0; limnum != RLIM_NLIMITS; limnum++) { @@ -409,7 +409,7 @@ bin_unlimit(char *nam, char **argv, char *ops, int func) } else limits[limnum].rlim_cur = limits[limnum].rlim_max; } - if (ops['s']) + if (OPT_ISSET(ops,'s')) ret += setlimits(nam); if (ret) zwarnnam(nam, "can't remove hard limits", NULL, 0); @@ -443,7 +443,7 @@ bin_unlimit(char *nam, char **argv, char *ops, int func) limits[lim].rlim_max = RLIM_INFINITY; } else limits[lim].rlim_cur = limits[lim].rlim_max; - if (ops['s'] && zsetlimit(lim, nam)) + if (OPT_ISSET(ops,'s') && zsetlimit(lim, nam)) ret++; } } @@ -454,7 +454,7 @@ bin_unlimit(char *nam, char **argv, char *ops, int func) /**/ static int -bin_ulimit(char *name, char **argv, char *ops, int func) +bin_ulimit(char *name, char **argv, Options ops, int func) { int res, resmask = 0, hard = 0, soft = 0, nres = 0; char *options; diff --git a/Src/Builtins/sched.c b/Src/Builtins/sched.c index b4914899e..05e3cfb3f 100644 --- a/Src/Builtins/sched.c +++ b/Src/Builtins/sched.c @@ -46,7 +46,7 @@ static struct schedcmd *schedcmds; /**/ static int -bin_sched(char *nam, char **argv, char *ops, int func) +bin_sched(char *nam, char **argv, Options ops, int func) { char *s = *argv++; time_t t; @@ -143,9 +143,7 @@ bin_sched(char *nam, char **argv, char *ops, int func) of scheduled commands. */ sch = (struct schedcmd *) zcalloc(sizeof *sch); sch->time = t; - PERMALLOC { - sch->cmd = zjoin(argv, ' '); - } LASTALLOC; + sch->cmd = zjoin(argv, ' ', 0); sch->next = NULL; for (sch2 = (struct schedcmd *)&schedcmds; sch2->next; sch2 = sch2->next); sch2->next = sch; @@ -185,7 +183,14 @@ static struct builtin bintab[] = { /**/ int -boot_sched(Module m) +setup_(Module m) +{ + return 0; +} + +/**/ +int +boot_(Module m) { if(!addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab))) return 1; @@ -193,11 +198,9 @@ boot_sched(Module m) return 0; } -#ifdef MODULE - /**/ int -cleanup_sched(Module m) +cleanup_(Module m) { struct schedcmd *sch, *schn; @@ -211,4 +214,9 @@ cleanup_sched(Module m) return 0; } -#endif +/**/ +int +finish_(Module m) +{ + return 0; +} |