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

Merge import of OpenBSD source, ports and XF4 tree.

Browse Source 
While here,
o clean up differences where possible
o whitespace cleanup
o ifdef ./. if defined()
o '...' ./. "..."
o echo foo > bar ./. echo foo >bar
o `...` ./. $(...) ./. $$(...)
o `...' ./. '...'
o modernize "our" tree, e.g. WWW in ports
o fix some typos and brainos introduced when renaming OpenBSD to MirBSD
o use hardware 80387 by default
o migrate Apache 1.3.28 OpenBSD ./. MirBSD ./. KAME
o work around as many CVS bugs as possible (add back/delete files, ...)

Synchronize stuff, ready for ongoing changes.
This commit is contained in:
tg 2003-08-31 20:54:03 +00:00
parent a1f61cab50
commit 4ea65e6edc
4 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IAFA-PACKAGE
View File

@ -1,18 +0,0 @@
$OpenBSD: IAFA-PACKAGE,v 1.7 1999/07/14 13:37:23 millert Exp $
Title: pdksh
Version: 5.2.14
Description: A public domain implementation of the Korn shell (ksh88),
a UNIX command line interpreter / scripting language; the few
missing ksh features are being added and the shell is being
POSIXized.
Author: (Eric Gisin), (Charles Forsyth), (John R MacMillan),
sjg@zen.void.oz.au (Simon J. Gerraty),
michael@cs.mun.ca (Michael Rendell), (plus many others)
Maintained-by: michael@cs.mun.ca (Michael Rendell)
Maintained-at: ftp://ftp.cs.mun.ca:/pub/pdksh/
Platforms: Written in C, runs on most UNIX boxes (uses GNU autoconf;
works best in a POSIX or BSD environment). Also runs on OS/2
and (using cygwin32 package) on win95/NT
Copying-Policy: Freely Redistributable (mostly public domain, some copyrighted)
Keywords: pdksh, ksh, Korn, shell, command line interpreter

8
LEGAL
View File

@ -1,4 +1,4 @@
$MirBSD: LEGAL,v 1.3 2003/07/18 15:44:08 tg Exp $
$MirBSD: LEGAL,v 1.4 2003/08/31 20:54:02 tg Exp $
$OpenBSD: LEGAL,v 1.2 2003/07/17 20:59:43 deraadt Exp $
pdksh is provided AS IS, with NO WARRANTY, either expressed or implied.
@ -6,10 +6,4 @@ pdksh is provided AS IS, with NO WARRANTY, either expressed or implied.
The vast majority of the code that makes pdksh is in the public domain.
The exceptions are not included in the MirBSD source tree.
The exceptions are:
sigact.c and sigact.h
[REMOVED]
aclocal.m4
[REMOVED]
That's it. Short and simple.

6
edit.c
View File

@ -1,5 +1,5 @@
/* $MirBSD: edit.c,v 1.3 2003/06/29 19:45:40 tg Exp $ */
/* $OpenBSD: edit.c,v 1.17 2003/06/26 00:09:45 deraadt Exp $ */
/* $MirBSD: edit.c,v 1.4 2003/08/31 20:54:02 tg Exp $ */
/* $OpenBSD: edit.c,v 1.18 2003/08/22 18:17:10 fgsch Exp $ */
/*
* Command line editing - common code
@ -773,7 +773,7 @@ x_locate_word(buf, buflen, pos, startp, is_commandp)
;
/* Go forwards to end of word */
for (end = start; end < buflen && IS_WORDC(buf[end]); end++) {
if (buf[end] == '\\' && (end+1) < buflen && buf[end+1] == ' ')
if (buf[end] == '\\' && (end+1) < buflen)
end++;
}

25
emacs.c
View File

@ -1,5 +1,5 @@
/* $MirBSD: emacs.c,v 1.4 2003/08/16 15:19:48 tg Exp $ */
/* $OpenBSD: emacs.c,v 1.22 2003/08/02 19:44:12 fgsch Exp $ */
/* $MirBSD: emacs.c,v 1.5 2003/08/31 20:54:03 tg Exp $ */
/* $OpenBSD: emacs.c,v 1.26 2003/08/27 14:56:11 fgsch Exp $ */
/*
* Emacs-like command line editing and history
@ -122,7 +122,7 @@ static char *macroptr;
static int prompt_skip;
static int x_ins ARGS((char *cp));
static void x_delete ARGS((int nc, int force_push));
static void x_delete ARGS((int nc, int push));
static int x_bword ARGS((void));
static int x_fword ARGS((void));
static void x_goto ARGS((char *cp));
@ -535,9 +535,9 @@ x_del_char(c)
/* Delete nc chars to the right of the cursor (including cursor position) */
static void
x_delete(nc, force_push)
x_delete(nc, push)
int nc;
int force_push;
int push;
{
int i,j;
char *cp;
@ -554,7 +554,7 @@ x_delete(nc, force_push)
/*
* This lets us yank a word we have deleted.
*/
if (force_push)
if (push)
x_push(nc);
xep -= nc;
@ -595,7 +595,7 @@ static int
x_del_bword(c)
int c;
{
x_delete(x_bword(), FALSE);
x_delete(x_bword(), TRUE);
return KSTD;
}
@ -619,7 +619,7 @@ static int
x_del_fword(c)
int c;
{
x_delete(x_fword(), FALSE);
x_delete(x_fword(), TRUE);
return KSTD;
}
@ -1783,12 +1783,15 @@ x_expand(c)
x_goto(xbuf + start);
x_delete(end - start, FALSE);
for (i = 0; i < nwords; i++)
if (x_ins(words[i]) < 0 || (i < nwords - 1 && x_ins(space) < 0))
for (i = 0; i < nwords;) {
if (x_escape(words[i], strlen(words[i]), x_emacs_putbuf) < 0 ||
(++i < nwords && x_ins(space) < 0))
{
x_e_putc(BEL);
return KSTD;
}
}
x_adjust();
return KSTD;
}
@ -1823,7 +1826,7 @@ do_complete(flags, type)
olen = end - start;
nlen = x_longest_prefix(nwords, words);
/* complete */
if (nlen > olen) {
if (nwords == 1 || nlen > olen) {
x_goto(xbuf + start);
x_delete(olen, FALSE);
x_escape(words[0], nlen, x_emacs_putbuf);