from christos;

- Fix PR/105: Implement dot locking protocol and check return value of flock.
- Fix PR/2247: Don't call unknown users "ubluit". Issue an error message.
- Fix/add prototypes.
- Fix warnings.
- Use POSIX signal mask calls.

1 files changed, 76 insertions, 72 deletions

diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index c7b1cdd0fa5..f35947e5a75 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: cmdtab.c,v 1.2 1996/03/27 19:32:31 niklas Exp $	*/
+/*	$OpenBSD: cmdtab.c,v 1.3 1996/06/11 12:53:35 deraadt Exp $	*/
+/*	$NetBSD: cmdtab.c,v 1.6 1996/06/08 19:48:15 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,8 +35,11 @@
  */
 
 #ifndef lint
-static char sccsid[] = "from: @(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
-static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.2 1996/03/27 19:32:31 niklas Exp $";
+#if 0
+static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.3 1996/06/11 12:53:35 deraadt Exp $";
+#endif
 #endif /* not lint */
 
 #include "def.h"
@@ -48,73 +52,73 @@ static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.2 1996/03/27 19:32:31 niklas Exp $
  */
 
 const struct cmd cmdtab[] = {
-	"next",		next,		NDMLIST,	0,	MMNDEL,
-	"alias",	group,		M|RAWLIST,	0,	1000,
-	"print",	type,		MSGLIST,	0,	MMNDEL,
-	"type",		type,		MSGLIST,	0,	MMNDEL,
-	"Type",		Type,		MSGLIST,	0,	MMNDEL,
-	"Print",	Type,		MSGLIST,	0,	MMNDEL,
-	"visual",	visual,		I|MSGLIST,	0,	MMNORM,
-	"top",		top,		MSGLIST,	0,	MMNDEL,
-	"touch",	stouch,		W|MSGLIST,	0,	MMNDEL,
-	"preserve",	preserve,	W|MSGLIST,	0,	MMNDEL,
-	"delete",	delete,		W|P|MSGLIST,	0,	MMNDEL,
-	"dp",		deltype,	W|MSGLIST,	0,	MMNDEL,
-	"dt",		deltype,	W|MSGLIST,	0,	MMNDEL,
-	"undelete",	undeletecmd,	P|MSGLIST,	MDELETED,MMNDEL,
-	"unset",	unset,		M|RAWLIST,	1,	1000,
-	"mail",		sendmail,	R|M|I|STRLIST,	0,	0,
-	"mbox",		mboxit,		W|MSGLIST,	0,	0,
-	"more",		more,		MSGLIST,	0,	MMNDEL,
-	"page",		more,		MSGLIST,	0,	MMNDEL,
-	"More",		More,		MSGLIST,	0,	MMNDEL,
-	"Page",		More,		MSGLIST,	0,	MMNDEL,
-	"unread",	unread,		MSGLIST,	0,	MMNDEL,
-	"!",		shell,		I|STRLIST,	0,	0,
-	"copy",		copycmd,	M|STRLIST,	0,	0,
-	"chdir",	schdir,		M|RAWLIST,	0,	1,
-	"cd",		schdir,		M|RAWLIST,	0,	1,
-	"save",		save,		STRLIST,	0,	0,
-	"source",	source,		M|RAWLIST,	1,	1,
-	"set",		set,		M|RAWLIST,	0,	1000,
-	"shell",	dosh,		I|NOLIST,	0,	0,
-	"version",	pversion,	M|NOLIST,	0,	0,
-	"group",	group,		M|RAWLIST,	0,	1000,
-	"write",	swrite,		STRLIST,	0,	0,
-	"from",		from,		MSGLIST,	0,	MMNORM,
-	"file",		file,		T|M|RAWLIST,	0,	1,
-	"folder",	file,		T|M|RAWLIST,	0,	1,
-	"folders",	folders,	T|M|NOLIST,	0,	0,
-	"?",		help,		M|NOLIST,	0,	0,
-	"z",		scroll,		M|STRLIST,	0,	0,
-	"headers",	headers,	MSGLIST,	0,	MMNDEL,
-	"help",		help,		M|NOLIST,	0,	0,
-	"=",		pdot,		NOLIST,		0,	0,
-	"Reply",	Respond,	R|I|MSGLIST,	0,	MMNDEL,
-	"Respond",	Respond,	R|I|MSGLIST,	0,	MMNDEL,
-	"reply",	respond,	R|I|MSGLIST,	0,	MMNDEL,
-	"respond",	respond,	R|I|MSGLIST,	0,	MMNDEL,
-	"edit",		editor,		I|MSGLIST,	0,	MMNORM,
-	"echo",		echo,		M|RAWLIST,	0,	1000,
-	"quit",		quitcmd,	NOLIST,		0,	0,
-	"list",		pcmdlist,	M|NOLIST,	0,	0,
-	"xit",		rexit,		M|NOLIST,	0,	0,
-	"exit",		rexit,		M|NOLIST,	0,	0,
-	"size",		messize,	MSGLIST,	0,	MMNDEL,
-	"hold",		preserve,	W|MSGLIST,	0,	MMNDEL,
-	"if",		ifcmd,		F|M|RAWLIST,	1,	1,
-	"else",		elsecmd,	F|M|RAWLIST,	0,	0,
-	"endif",	endifcmd,	F|M|RAWLIST,	0,	0,
-	"alternates",	alternates,	M|RAWLIST,	0,	1000,
-	"ignore",	igfield,	M|RAWLIST,	0,	1000,
-	"discard",	igfield,	M|RAWLIST,	0,	1000,
-	"retain",	retfield,	M|RAWLIST,	0,	1000,
-	"saveignore",	saveigfield,	M|RAWLIST,	0,	1000,
-	"savediscard",	saveigfield,	M|RAWLIST,	0,	1000,
-	"saveretain",	saveretfield,	M|RAWLIST,	0,	1000,
-/*	"Header",	Header,		STRLIST,	0,	1000,	*/
-	"core",		core,		M|NOLIST,	0,	0,
-	"#",		null,		M|NOLIST,	0,	0,
-	"clobber",	clobber,	M|RAWLIST,	0,	1,
-	0,		0,		0,		0,	0
+	{ "next",	next,		NDMLIST,	0,	MMNDEL },
+	{ "alias",	group,		M|RAWLIST,	0,	1000 },
+	{ "print",	type,		MSGLIST,	0,	MMNDEL },
+	{ "type",	type,		MSGLIST,	0,	MMNDEL },
+	{ "Type",	Type,		MSGLIST,	0,	MMNDEL },
+	{ "Print",	Type,		MSGLIST,	0,	MMNDEL },
+	{ "visual",	visual,		I|MSGLIST,	0,	MMNORM },
+	{ "top",	top,		MSGLIST,	0,	MMNDEL },
+	{ "touch",	stouch,		W|MSGLIST,	0,	MMNDEL },
+	{ "preserve",	preserve,	W|MSGLIST,	0,	MMNDEL },
+	{ "delete",	delete,		W|P|MSGLIST,	0,	MMNDEL },
+	{ "dp",		deltype,	W|MSGLIST,	0,	MMNDEL },
+	{ "dt",		deltype,	W|MSGLIST,	0,	MMNDEL },
+	{ "undelete",	undeletecmd,	P|MSGLIST,	MDELETED,MMNDEL },
+	{ "unset",	unset,		M|RAWLIST,	1,	1000 },
+	{ "mail",	sendmail,	R|M|I|STRLIST,	0,	0 },
+	{ "mbox",	mboxit,		W|MSGLIST,	0,	0 },
+	{ "more",	more,		MSGLIST,	0,	MMNDEL },
+	{ "page",	more,		MSGLIST,	0,	MMNDEL },
+	{ "More",	More,		MSGLIST,	0,	MMNDEL },
+	{ "Page",	More,		MSGLIST,	0,	MMNDEL },
+	{ "unread",	unread,		MSGLIST,	0,	MMNDEL },
+	{ "!",		shell,		I|STRLIST,	0,	0 },
+	{ "copy",	copycmd,	M|STRLIST,	0,	0 },
+	{ "chdir",	schdir,		M|RAWLIST,	0,	1 },
+	{ "cd",		schdir,		M|RAWLIST,	0,	1 },
+	{ "save",	save,		STRLIST,	0,	0 },
+	{ "source",	source,		M|RAWLIST,	1,	1 },
+	{ "set",	set,		M|RAWLIST,	0,	1000 },
+	{ "shell",	dosh,		I|NOLIST,	0,	0 },
+	{ "version",	pversion,	M|NOLIST,	0,	0 },
+	{ "group",	group,		M|RAWLIST,	0,	1000 },
+	{ "write",	swrite,		STRLIST,	0,	0 },
+	{ "from",	from,		MSGLIST,	0,	MMNORM },
+	{ "file",	file,		T|M|RAWLIST,	0,	1 },
+	{ "folder",	file,		T|M|RAWLIST,	0,	1 },
+	{ "folders",	folders,	T|M|NOLIST,	0,	0 },
+	{ "?",		help,		M|NOLIST,	0,	0 },
+	{ "z",		scroll,		M|STRLIST,	0,	0 },
+	{ "headers",	headers,	MSGLIST,	0,	MMNDEL },
+	{ "help",	help,		M|NOLIST,	0,	0 },
+	{ "=",		pdot,		NOLIST,		0,	0 },
+	{ "Reply",	Respond,	R|I|MSGLIST,	0,	MMNDEL },
+	{ "Respond",	Respond,	R|I|MSGLIST,	0,	MMNDEL },
+	{ "reply",	respond,	R|I|MSGLIST,	0,	MMNDEL },
+	{ "respond",	respond,	R|I|MSGLIST,	0,	MMNDEL },
+	{ "edit",	editor,		I|MSGLIST,	0,	MMNORM },
+	{ "echo",	echo,		M|RAWLIST,	0,	1000 },
+	{ "quit",	quitcmd,	NOLIST,		0,	0 },
+	{ "list",	pcmdlist,	M|NOLIST,	0,	0 },
+	{ "xit",	rexit,		M|NOLIST,	0,	0 },
+	{ "exit",	rexit,		M|NOLIST,	0,	0 },
+	{ "size",	messize,	MSGLIST,	0,	MMNDEL },
+	{ "hold",	preserve,	W|MSGLIST,	0,	MMNDEL },
+	{ "if",		ifcmd,		F|M|RAWLIST,	1,	1 },
+	{ "else",	elsecmd,	F|M|RAWLIST,	0,	0 },
+	{ "endif",	endifcmd,	F|M|RAWLIST,	0,	0 },
+	{ "alternates",	alternates,	M|RAWLIST,	0,	1000 },
+	{ "ignore",	igfield,	M|RAWLIST,	0,	1000 },
+	{ "discard",	igfield,	M|RAWLIST,	0,	1000 },
+	{ "retain",	retfield,	M|RAWLIST,	0,	1000 },
+	{ "saveignore",	saveigfield,	M|RAWLIST,	0,	1000 },
+	{ "savediscard",saveigfield,	M|RAWLIST,	0,	1000 },
+	{ "saveretain",	saveretfield,	M|RAWLIST,	0,	1000 },
+/*	{ "Header",	Header,		STRLIST,	0,	1000 },	*/
+	{ "core",	core,		M|NOLIST,	0,	0 },
+	{ "#",		null,		M|NOLIST,	0,	0 },
+	{ "clobber",	clobber,	M|RAWLIST,	0,	1 },
+	{ 0,		0,		0,		0,	0 }
 };