diff --git a/c_ulimit.c b/c_ulimit.c index a43a7f0..b3169a2 100644 --- a/c_ulimit.c +++ b/c_ulimit.c @@ -1,3 +1,4 @@ +/* $MirBSD: c_ulimit.c,v 1.2 2003/03/23 21:47:52 tg Exp $ */ /* $OpenBSD: c_ulimit.c,v 1.9 2002/06/09 05:47:27 todd Exp $ */ /* @@ -56,6 +57,9 @@ c_ulimit(wp) #ifdef RLIMIT_CPU { "time(cpu-seconds)", RLIMIT, RLIMIT_CPU, RLIMIT_CPU, 1, 't' }, #endif +#ifdef RLIMIT_TIME + { "humantime(seconds)", RLIMIT, RLIMIT_TIME, RLIMIT_TIME, 1, 'T' }, +#endif #ifdef RLIMIT_FSIZE { "file(blocks)", RLIMIT, RLIMIT_FSIZE, RLIMIT_FSIZE, 512, 'f' }, #else /* RLIMIT_FSIZE */ diff --git a/history.c b/history.c index 4ec7d6b..0b2a5a0 100644 --- a/history.c +++ b/history.c @@ -1017,8 +1017,8 @@ histload(s, base, bytes) register int bytes; { State state; - int lno; - unsigned char *line; + int lno = 0; + unsigned char *line = NULL; for (state = shdr; bytes-- > 0; base++) { switch (state) { diff --git a/ksh.1tbl b/ksh.1tbl index 4ad1206..dc5412f 100644 --- a/ksh.1tbl +++ b/ksh.1tbl @@ -1,3 +1,4 @@ +.\" $MirBSD: ksh.1tbl,v 1.2 2003/03/23 21:47:53 tg Exp $ .\" $OpenBSD: ksh.1tbl,v 1.50 2003/03/20 07:30:37 jmc Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -4021,6 +4022,11 @@ Impose a time limit of .Ar n .Tn CPU seconds to be used by each process. +.It Fl T Ar n +Impose a real time limit of +.Ar n +.Tn human +seconds to be used by each process. .El .Pp As far as