===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/extern.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/mail/extern.h	1996/03/27 19:32:32	1.2
+++ src/usr.bin/mail/extern.h	1996/06/11 12:53:39	1.3
@@ -1,4 +1,5 @@
-/*	$OpenBSD: extern.h,v 1.2 1996/03/27 19:32:32 niklas Exp $	*/
+/*	$OpenBSD: extern.h,v 1.3 1996/06/11 12:53:39 deraadt Exp $	*/
+/*	$NetBSD: extern.h,v 1.4 1996/06/08 19:48:21 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -33,14 +34,18 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
+ *	$NetBSD: extern.h,v 1.4 1996/06/08 19:48:21 christos Exp $
  */
 
+struct name;
 struct name *cat __P((struct name *, struct name *));
 struct name *delname __P((struct name *, char []));
 struct name *elide __P((struct name *));
 struct name *extract __P((char [], int));
+struct grouphead;
 struct name *gexpand __P((struct name *, struct grouphead *, int, int));
 struct name *nalloc __P((char [], int));
+struct header;
 struct name *outof __P((struct name *, FILE *, struct header *));
 struct name *put __P((struct name *, struct name *));
 struct name *tailof __P((struct name *));
@@ -55,6 +60,7 @@
 char	*expand __P((char *));
 char	*getdeadletter __P((void));
 char	*getname __P((int));
+struct message;
 char	*hfield __P((char [], struct message *));
 FILE	*infix __P((struct header *, FILE *));
 char	*ishfield __P((char [], char[], char *));
@@ -75,14 +81,14 @@
 char	*vcopy __P((char []));
 char	*yankword __P((char *, char []));
 int	 Fclose __P((FILE *));
-int	 More __P((int *));
+int	 More __P((void *));
 int	 Pclose __P((FILE *));
-int	 Respond __P((int *));
-int	 Type __P((int *));
+int	 Respond __P((void *));
+int	 Type __P((void *));
 int	 _Respond __P((int []));
 int	 _respond __P((int *));
 void	 alter __P((char *));
-int	 alternates __P((char **));
+int	 alternates __P((void *));
 void	 announce __P((void));
 int	 anyof __P((char *, char *));
 int	 append __P((struct message *, FILE *));
@@ -94,43 +100,44 @@
 int	 charcount __P((char *, int));
 int	 check __P((int, int));
 void	 clob1 __P((int));
-int	 clobber __P((char **));
+int	 clobber __P((void *));
 void	 close_all_files __P((void));
 int	 cmatch __P((char *, char *));
 void	 collhup __P((int));
 void	 collint __P((int));
 void	 collstop __P((int));
 void	 commands __P((void));
-int	 copycmd __P((char []));
-int	 core __P((void));
+int	 copycmd __P((void *));
+int	 core __P((void *));
 int	 count __P((struct name *));
-int	 delete __P((int []));
+int	 delete __P((void *));
 int	 delm __P((int []));
-int	 deltype __P((int []));
+int	 deltype __P((void *));
 void	 demail __P((void));
-int	 diction __P((const void *, const void *));
-int	 dosh __P((char *));
-int	 echo __P((char **));
+int	 dosh __P((void *));
+int	 dot_lock __P((const char *, int, FILE *, const char *));
+void	 dot_unlock __P((const char *));
+int	 echo __P((void *));
 int	 edit1 __P((int *, int));
-int	 editor __P((int *));
+int	 editor __P((void *));
 void	 edstop __P((void));
-int	 elsecmd __P((void));
-int	 endifcmd __P((void));
+int	 elsecmd __P((void *));
+int	 endifcmd __P((void *));
 int	 evalcol __P((int));
 int	 execute __P((char [], int));
 int	 exwrite __P((char [], FILE *, int));
 void	 fail __P((char [], char []));
-int	 file __P((char **));
+int	 file __P((void *));
 struct grouphead *
 	 findgroup __P((char []));
 void	 findmail __P((char *, char *));
 int	 first __P((int, int));
 void	 fixhead __P((struct header *, struct name *));
 void	 fmt __P((char *, struct name *, FILE *, int));
-int	 folders __P((void));
+int	 folders __P((void *));
 int	 forward __P((char [], FILE *, int));
 void	 free_child __P((int));
-int	 from __P((int *));
+int	 from __P((void *));
 off_t	 fsize __P((FILE *));
 int	 getfold __P((char *));
 int	 gethfield __P((FILE *, char [], int, char **));
@@ -138,16 +145,16 @@
 int	 getrawlist __P((char [], char **, int));
 int	 getuserid __P((char []));
 int	 grabh __P((struct header *, int));
-int	 group __P((char **));
+int	 group __P((void *));
 void	 hangup __P((int));
 int	 hash __P((char *));
 void	 hdrstop __P((int));
-int	 headers __P((int *));
-int	 help __P((void));
+int	 headers __P((void *));
+int	 help __P((void *));
 void	 holdsigs __P((void));
-int	 ifcmd __P((char **));
-int	 igcomp __P((const void *, const void *));
-int	 igfield __P((char *[]));
+int	 ifcmd __P((void *));
+int	 igfield __P((void *));
+struct ignoretab;
 int	 ignore1 __P((char *[], struct ignoretab *, char *));
 int	 igshow __P((struct ignoretab *, char *));
 void	 intr __P((int));
@@ -171,85 +178,87 @@
 int	 markall __P((char [], int));
 int	 matchsender __P((char *, int));
 int	 matchsubj __P((char *, int));
-int	 mboxit __P((int []));
+int	 mboxit __P((void *));
 int	 member __P((char *, struct ignoretab *));
 void	 mesedit __P((FILE *, int));
 void	 mespipe __P((FILE *, char []));
-int	 messize __P((int *));
+int	 messize __P((void *));
 int	 metamess __P((int, int));
-int	 more __P((int *));
+int	 more __P((void *));
 int	 newfileinfo __P((void));
-int	 next __P((int *));
-int	 null __P((int));
-void	 panic __P((const char *, ...));
+int	 next __P((void *));
+int	 null __P((void *));
+void	 panic __P((const char *, ...))
+    __attribute__((__format__(__printf__,1,2),__noreturn__));
+struct headline;
 void	 parse __P((char [], struct headline *, char []));
-int	 pcmdlist __P((void));
-int	 pdot __P((void));
-void	 prepare_child __P((int, int, int));
-int	 preserve __P((int *));
+int	 pcmdlist __P((void *));
+int	 pdot __P((void *));
+void	 prepare_child __P((sigset_t *, int, int));
+int	 preserve __P((void *));
 void	 prettyprint __P((struct name *));
 void	 printgroup __P((char []));
 void	 printhead __P((int));
 int	 puthead __P((struct header *, FILE *, int));
 int	 putline __P((FILE *, char *));
-int	 pversion __P((int));
+int	 pversion __P((void *));
 void	 quit __P((void));
-int	 quitcmd __P((void));
+int	 quitcmd __P((void *));
 int	 raise __P((int));
 int	 readline __P((FILE *, char *, int));
 void	 register_file __P((FILE *, int, int));
 void	 regret __P((int));
 void	 relsesigs __P((void));
-int	 respond __P((int *));
-int	 retfield __P((char *[]));
-int	 rexit __P((int));
+int	 respond __P((void *));
+int	 retfield __P((void *));
+int	 rexit __P((void *));
 int	 rm __P((char *));
-int	 run_command __P((char *, int, int, int, char *, char *, char *));
-int	 save __P((char []));
+int	 run_command __P((char *, sigset_t *, int, int, char *, char *, char *));
+int	 save __P((void *));
 int	 save1 __P((char [], int, char *, struct ignoretab *));
 void	 savedeadletter __P((FILE *));
-int	 saveigfield __P((char *[]));
+int	 saveigfield __P((void *));
 int	 savemail __P((char [], FILE *));
-int	 saveretfield __P((char *[]));
+int	 saveretfield __P((void *));
 int	 scan __P((char **));
 void	 scaninit __P((void));
-int	 schdir __P((char **));
+int	 schdir __P((void *));
 int	 screensize __P((void));
-int	 scroll __P((char []));
+int	 scroll __P((void *));
 int	 send __P((struct message *, FILE *, struct ignoretab *, char *));
-int	 sendmail __P((char *));
-int	 set __P((char **));
+int	 sendmail __P((void *));
+int	 set __P((void *));
 int	 setfile __P((char *));
 void	 setmsize __P((int));
 void	 setptr __P((FILE *));
 void	 setscreensize __P((void));
-int	 shell __P((char *));
+int	 shell __P((void *));
 void	 sigchild __P((int));
 void	 sort __P((char **));
-int	 source __P((char **));
+int	 source __P((void *));
 void	 spreserve __P((void));
 void	 sreset __P((void));
-int	 start_command __P((char *, int, int, int, char *, char *, char *));
+int	 start_command __P((char *, sigset_t *, int, int, char *, char *, char *));
 void	 statusput __P((struct message *, FILE *, char *));
 void	 stop __P((int));
-int	 stouch __P((int []));
-int	 swrite __P((char []));
+int	 stouch __P((void *));
+int	 swrite __P((void *));
 void	 tinit __P((void));
-int	 top __P((int *));
+int	 top __P((void *));
 void	 touch __P((struct message *));
 void	 ttyint __P((int));
 void	 ttystop __P((int));
-int	 type __P((int *));
+int	 type __P((void *));
 int	 type1 __P((int *, int, int));
-int	 undeletecmd __P((int *));
+int	 undeletecmd __P((void *));
 void	 unmark __P((int));
 char	**unpack __P((struct name *));
-int	 unread __P((int []));
+int	 unread __P((void *));
 void	 unregister_file __P((FILE *));
-int	 unset __P((char **));
+int	 unset __P((void *));
 int	 unstack __P((void));
 void	 vfree __P((char *));
-int	 visual __P((int *));
+int	 visual __P((void *));
 int	 wait_child __P((int));
 int	 wait_command __P((int));
 int	 writeback __P((FILE *));