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

oksh merge

Browse Source
This commit is contained in:
tg 2010-04-09 18:59:30 +00:00
parent 3461fcdf20
commit 3fa79f3ea4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
funcs.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: c_ksh.c,v 1.33 2009/02/07 14:03:24 kili Exp $ */ /* $OpenBSD: c_ksh.c,v 1.33 2009/02/07 14:03:24 kili Exp $ */
/* $OpenBSD: c_sh.c,v 1.40 2009/05/05 17:59:55 millert Exp $ */ /* $OpenBSD: c_sh.c,v 1.41 2010/03/27 09:10:01 jmc Exp $ */
/* $OpenBSD: c_test.c,v 1.18 2009/03/01 20:11:06 otto Exp $ */ /* $OpenBSD: c_test.c,v 1.18 2009/03/01 20:11:06 otto Exp $ */
/* $OpenBSD: c_ulimit.c,v 1.17 2008/03/21 12:51:19 millert Exp $ */ /* $OpenBSD: c_ulimit.c,v 1.17 2008/03/21 12:51:19 millert Exp $ */
@ -25,7 +25,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.153 2010/03/27 16:51:37 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.154 2010/04/09 18:59:29 tg Exp $");
#if HAVE_KILLPG #if HAVE_KILLPG
/* /*
@ -2660,7 +2660,7 @@ c_mknod(const char **wp)
umask(oldmode); umask(oldmode);
return (rv); return (rv);
c_mknod_usage: c_mknod_usage:
bi_errorf("usage: mknod [-m mode] name [b | c] major minor"); bi_errorf("usage: mknod [-m mode] name b|c major minor");
bi_errorf("usage: mknod [-m mode] name p"); bi_errorf("usage: mknod [-m mode] name p");
return (1); return (1);
} }

8
mksh.1
View File

@ -1,5 +1,5 @@
.\" $MirOS: src/bin/mksh/mksh.1,v 1.223 2010/04/08 13:21:06 tg Exp $ .\" $MirOS: src/bin/mksh/mksh.1,v 1.224 2010/04/09 18:59:30 tg Exp $
.\" $OpenBSD: ksh.1,v 1.131 2010/02/26 03:32:39 william Exp $ .\" $OpenBSD: ksh.1,v 1.132 2010/03/27 09:10:01 jmc Exp $
.\"- .\"-
.\" Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 .\" Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
.\" Thorsten Glaser <tg@mirbsd.org> .\" Thorsten Glaser <tg@mirbsd.org>
@ -71,7 +71,7 @@
.\" with -mandoc, it might implement .Mx itself, but we want to .\" with -mandoc, it might implement .Mx itself, but we want to
.\" use our own definition. And .Dd must come *first*, always. .\" use our own definition. And .Dd must come *first*, always.
.\" .\"
.Dd $Mdocdate: April 8 2010 $ .Dd $Mdocdate: April 9 2010 $
.\" .\"
.\" Check which macro package we use .\" Check which macro package we use
.\" .\"
@ -3422,7 +3422,7 @@ is syntactic sugar for
.Ic mknod .Ic mknod
.Op Fl m Ar mode .Op Fl m Ar mode
.Ar name .Ar name
.Op Cm b \*(Ba Cm c .Cm b\*(Bac
.Ar major minor .Ar major minor
.Xc .Xc
.It Xo .It Xo