JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge MirBSD-old entirely

Browse Source 
Remove krb, yp, afs, GPL'd stuff in kernel
Adjust some other stuff

Not to be compiled yet...
This commit is contained in:
tg
2003-03-23 21:47:53 +00:00
parent 80609f6010
commit ff2a0a12f7
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c_ulimit.c
View File

@ -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 $ */ /* $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 #ifdef RLIMIT_CPU
{ "time(cpu-seconds)", RLIMIT, RLIMIT_CPU, RLIMIT_CPU, 1, 't' }, { "time(cpu-seconds)", RLIMIT, RLIMIT_CPU, RLIMIT_CPU, 1, 't' },
#endif #endif
#ifdef RLIMIT_TIME
{ "humantime(seconds)", RLIMIT, RLIMIT_TIME, RLIMIT_TIME, 1, 'T' },
#endif
#ifdef RLIMIT_FSIZE #ifdef RLIMIT_FSIZE
{ "file(blocks)", RLIMIT, RLIMIT_FSIZE, RLIMIT_FSIZE, 512, 'f' }, { "file(blocks)", RLIMIT, RLIMIT_FSIZE, RLIMIT_FSIZE, 512, 'f' },
#else /* RLIMIT_FSIZE */ #else /* RLIMIT_FSIZE */

4
history.c
View File

@ -1017,8 +1017,8 @@ histload(s, base, bytes)
register int bytes; register int bytes;
{ {
State state; State state;
int lno; int lno = 0;
unsigned char *line; unsigned char *line = NULL;
for (state = shdr; bytes-- > 0; base++) { for (state = shdr; bytes-- > 0; base++) {
switch (state) { switch (state) {

6
ksh.1tbl
View File

@ -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 $ .\" $OpenBSD: ksh.1tbl,v 1.50 2003/03/20 07:30:37 jmc Exp $
.\" .\"
.\" Copyright (c) 1980, 1990, 1993 .\" Copyright (c) 1980, 1990, 1993
@ -4021,6 +4022,11 @@ Impose a time limit of
.Ar n .Ar n
.Tn CPU .Tn CPU
seconds to be used by each process. 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 .El
.Pp .Pp
As far as As far as