diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2016-12-04 04:32:03 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2016-12-04 04:32:03 +0100 |
| commit | 3e439c3863f14c82f70666804c8570a13b3732e6 (patch) | |
| tree | 07036c43e0f3f9242bb6dd42cd2a849ec8ea8aca /Src/Builtins | |
| parent | 2aedc4b88fd0e87b89583983951b04b96f48efd3 (diff) | |
| parent | 7b7e84f0815ed22a0ee348a217776529035dccf3 (diff) | |
| download | zsh-3e439c3863f14c82f70666804c8570a13b3732e6.tar.gz zsh-3e439c3863f14c82f70666804c8570a13b3732e6.zip | |
Merge tag 'zsh-5.2-test-1' into debian
Diffstat (limited to 'Src/Builtins')
| -rw-r--r-- | Src/Builtins/rlimits.c | 8 | ||||
| -rw-r--r-- | Src/Builtins/sched.c | 18 |
2 files changed, 16 insertions, 10 deletions
diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c index 85ec1811c..29f97b41d 100644 --- a/Src/Builtins/rlimits.c +++ b/Src/Builtins/rlimits.c @@ -610,14 +610,16 @@ bin_limit(char *nam, char **argv, Options ops, UNUSED(int func)) return 1; } } else { - /* memory-type resource -- `k' and `M' modifiers are permitted, - meaning (respectively) 2^10 and 2^20. */ + /* memory-type resource -- `k', `M' and `G' modifiers are * + * permitted, meaning (respectively) 2^10, 2^20 and 2^30. */ val = zstrtorlimt(s, &s, 10); if (!*s || ((*s == 'k' || *s == 'K') && !s[1])) { if (val != RLIM_INFINITY) val *= 1024L; } else if ((*s == 'M' || *s == 'm') && !s[1]) val *= 1024L * 1024; + else if ((*s == 'G' || *s == 'g') && !s[1]) + val *= 1024L * 1024 * 1024; else { zwarnnam(nam, "unknown scaling factor: %s", s); return 1; @@ -1037,7 +1039,7 @@ enables_(Module m, int **enables) /**/ int -boot_(Module m) +boot_(UNUSED(Module m)) { return 0; } diff --git a/Src/Builtins/sched.c b/Src/Builtins/sched.c index 5d5dac6b7..835e72cb7 100644 --- a/Src/Builtins/sched.c +++ b/Src/Builtins/sched.c @@ -58,7 +58,7 @@ static int schedcmdtimed; /**/ static void -schedaddtimed(time_t t) +schedaddtimed(void) { /* * The following code shouldn't be necessary and indicates @@ -140,7 +140,7 @@ checksched(void) */ DPUTS(timedfns && firstnode(timedfns), "BUG: already timed fn (1)"); - schedaddtimed(schedcmds->time); + schedaddtimed(); } } } @@ -180,7 +180,7 @@ bin_sched(char *nam, char **argv, UNUSED(Options ops), UNUSED(int func)) schedcmds = sch->next; if (schedcmds) { DPUTS(timedfns && firstnode(timedfns), "BUG: already timed fn (2)"); - schedaddtimed(schedcmds->time); + schedaddtimed(); } } zsfree(sch->cmd); @@ -317,7 +317,7 @@ bin_sched(char *nam, char **argv, UNUSED(Options ops), UNUSED(int func)) sch->next = schedcmds; schedcmds = sch; DPUTS(timedfns && firstnode(timedfns), "BUG: already timed fn (3)"); - schedaddtimed(t); + schedaddtimed(); } else { for (sch2 = schedcmds; sch2->next && sch2->next->time < sch->time; @@ -330,7 +330,7 @@ bin_sched(char *nam, char **argv, UNUSED(Options ops), UNUSED(int func)) sch->next = NULL; schedcmds = sch; DPUTS(timedfns && firstnode(timedfns), "BUG: already timed fn (4)"); - schedaddtimed(t); + schedaddtimed(); } return 0; } @@ -353,7 +353,11 @@ schedgetfn(UNUSED(Param pm)) time_t t; t = sch->time; - sprintf(tbuf, "%ld", t); +#if defined(PRINTF_HAS_LLD) + sprintf(tbuf, "%lld", (long long)t); +#else + sprintf(tbuf, "%ld", (long)t); +#endif if (sch->flags & SCHEDFLAG_TRASH_ZLE) flagstr = "-o"; else @@ -411,7 +415,7 @@ enables_(Module m, int **enables) /**/ int -boot_(Module m) +boot_(UNUSED(Module m)) { addprepromptfn(&checksched); return 0; |