diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:36:48 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:36:48 +1000 |
| commit | 6e55663080e33d1856d949d60e45b135f2613087 (patch) | |
| tree | 7318387028176038ca96344831febb30a582d661 /runit | |
| parent | c6933c626b97c3f6bc446586ee2e6c7d9930c938 (diff) | |
| parent | dcaed97e0f44d0cd285fb590ec6ec80d0d73e738 (diff) | |
| download | busybox-w32-6e55663080e33d1856d949d60e45b135f2613087.tar.gz busybox-w32-6e55663080e33d1856d949d60e45b135f2613087.tar.bz2 busybox-w32-6e55663080e33d1856d949d60e45b135f2613087.zip | |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/svlogd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runit/svlogd.c b/runit/svlogd.c index 9fe81b900..1f0a77cc2 100644 --- a/runit/svlogd.c +++ b/runit/svlogd.c | |||
| @@ -688,10 +688,10 @@ static NOINLINE unsigned logdir_open(struct logdir *ld, const char *fn) | |||
| 688 | break; | 688 | break; |
| 689 | } | 689 | } |
| 690 | case 'n': | 690 | case 'n': |
| 691 | ld->nmax = xatoi_u(&s[1]); | 691 | ld->nmax = xatoi_positive(&s[1]); |
| 692 | break; | 692 | break; |
| 693 | case 'N': | 693 | case 'N': |
| 694 | ld->nmin = xatoi_u(&s[1]); | 694 | ld->nmin = xatoi_positive(&s[1]); |
| 695 | break; | 695 | break; |
| 696 | case 't': { | 696 | case 't': { |
| 697 | static const struct suffix_mult mh_suffixes[] = { | 697 | static const struct suffix_mult mh_suffixes[] = { |
| @@ -981,7 +981,7 @@ int svlogd_main(int argc, char **argv) | |||
| 981 | linemax = 256; | 981 | linemax = 256; |
| 982 | } | 982 | } |
| 983 | ////if (opt & 8) { // -b | 983 | ////if (opt & 8) { // -b |
| 984 | //// buflen = xatoi_u(b); | 984 | //// buflen = xatoi_positive(b); |
| 985 | //// if (buflen == 0) buflen = 1024; | 985 | //// if (buflen == 0) buflen = 1024; |
| 986 | ////} | 986 | ////} |
| 987 | //if (opt & 0x10) timestamp++; // -t | 987 | //if (opt & 0x10) timestamp++; // -t |