===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/extern.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- src/usr.bin/mail/extern.h	2001/11/20 20:50:00	1.18
+++ src/usr.bin/mail/extern.h	2001/11/21 15:26:39	1.19
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.18 2001/11/20 20:50:00 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.19 2001/11/21 15:26:39 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.7 1997/07/09 05:22:00 mikel Exp $	*/
 
 /*-
@@ -34,240 +34,239 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/20/95
- *	$OpenBSD: extern.h,v 1.18 2001/11/20 20:50:00 millert Exp $
+ *	$OpenBSD: extern.h,v 1.19 2001/11/21 15:26:39 millert 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 name *cat(struct name *, struct name *);
+struct name *delname(struct name *, char *);
+struct name *elide(struct name *);
+struct name *extract(char *, int);
 struct grouphead;
-struct name *gexpand __P((struct name *, struct grouphead *, int, int));
-struct name *nalloc __P((char [], int));
+struct name *gexpand(struct name *, struct grouphead *, int, int);
+struct name *nalloc(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 *));
-struct name *usermap __P((struct name *));
-FILE	*Fdopen __P((int, char *));
-FILE	*Fopen __P((char *, char *));
-FILE	*Popen __P((char *, char *));
-FILE	*collect __P((struct header *, int));
-char	*copy __P((char *, char *));
-char	*copyin __P((char *, char **));
-char	*detract __P((struct name *, int));
-char	*expand __P((char *));
-char	*getdeadletter __P((void));
-char	*getname __P((int));
+struct name *outof(struct name *, FILE *, struct header *);
+struct name *put(struct name *, struct name *);
+struct name *tailof(struct name *);
+struct name *usermap(struct name *);
+FILE	*Fdopen(int, char *);
+FILE	*Fopen(char *, char *);
+FILE	*Popen(char *, char *);
+FILE	*collect(struct header *, int);
+char	*copy(char *, char *);
+char	*copyin(char *, char **);
+char	*detract(struct name *, int);
+char	*expand(char *);
+char	*getdeadletter(void);
+char	*getname(uid_t);
 struct message;
-char	*hfield __P((char [], struct message *));
-FILE	*infix __P((struct header *, FILE *));
-char	*ishfield __P((char [], char[], char *));
-char	*name1 __P((struct message *, int));
-char	*nameof __P((struct message *, int));
-char	*nextword __P((char *, char *));
-char	*readtty __P((char [], char []));
-char 	*reedit __P((char *));
-FILE	*run_editor __P((FILE *, off_t, int, int));
-char	*salloc __P((int));
-char	*savestr __P((char *));
-FILE	*setinput __P((struct message *));
-char	*skin __P((char *));
-char	*skip_comment __P((char *));
-char	*snarf __P((char [], int *));
-char	*username __P((void));
-char	*value __P((char []));
-char	*vcopy __P((char []));
-char	*yankword __P((char *, char []));
-int	 Fclose __P((FILE *));
-int	 More __P((void *));
-int	 Pclose __P((FILE *));
-int	 Respond __P((void *));
-int	 Type __P((void *));
-int	 _Respond __P((int []));
-int	 _respond __P((int *));
-void	 alter __P((char *));
-int	 alternates __P((void *));
-void	 announce __P((void));
-int	 anyof __P((char *, char *));
-int	 append __P((struct message *, FILE *));
-int	 argcount __P((char **));
-void	 assign __P((char [], char []));
-int	 bangexp __P((char *, size_t));
-int	 blankline __P((char []));
-int	 charcount __P((char *, int));
-int	 check __P((int, int));
-void	 clearnew __P((void));
-void	 clob1 __P((int));
-int	 clobber __P((void *));
-void	 close_all_files __P((void));
-int	 cmatch __P((char *, char *));
-int	 collabort __P((void));
-void	 commands __P((void));
-int	 copycmd __P((void *));
-int	 core __P((void *));
-int	 count __P((struct name *));
-int	 delete __P((void *));
-int	 delm __P((int []));
-int	 deltype __P((void *));
-void	 demail __P((void));
-void	 dointr __P((void));
-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((void *));
-int	 edstop __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((void *));
+char	*hfield(char *, struct message *);
+FILE	*infix(struct header *, FILE *);
+char	*ishfield(char *, char *, char *);
+char	*name1(struct message *, int);
+char	*nameof(struct message *, int);
+char	*nextword(char *, char *);
+char	*readtty(char *, char *);
+char 	*reedit(char *);
+FILE	*run_editor(FILE *, off_t, int, int);
+char	*salloc(int);
+char	*savestr(char *);
+FILE	*setinput(struct message *);
+char	*skin(char *);
+char	*skip_comment(char *);
+char	*snarf(char *, int *);
+char	*username(void);
+char	*value(char *);
+char	*vcopy(char *);
+char	*yankword(char *, char *);
+int	 Fclose(FILE *);
+int	 More(void *);
+int	 Pclose(FILE *);
+int	 Respond(void *);
+int	 Type(void *);
+int	 _Respond(int *);
+int	 _respond(int *);
+void	 alter(char *);
+int	 alternates(void *);
+void	 announce(void);
+int	 append(struct message *, FILE *);
+int	 argcount(char **);
+void	 assign(char *, char *);
+int	 bangexp(char *, size_t);
+int	 blankline(char *);
+int	 charcount(char *, int);
+int	 check(int, int);
+void	 clearnew(void);
+void	 clob1(int);
+int	 clobber(void *);
+void	 close_all_files(void);
+int	 cmatch(char *, char *);
+int	 collabort(void);
+void	 commands(void);
+int	 copycmd(void *);
+int	 core(void *);
+int	 count(struct name *);
+int	 delete(void *);
+int	 delm(int *);
+int	 deltype(void *);
+void	 demail(void);
+void	 dointr(void);
+int	 dosh(void *);
+int	 dot_lock(const char *, int, FILE *, const char *);
+void	 dot_unlock(const char *);
+int	 echo(void *);
+int	 edit1(int *, int);
+int	 editor(void *);
+int	 edstop(void);
+int	 elsecmd(void *);
+int	 endifcmd(void *);
+int	 evalcol(int);
+int	 execute(char *, int);
+int	 exwrite(char *, FILE *, int);
+void	 fail(char *, char *);
+int	 file(void *);
 struct grouphead *
-	 findgroup __P((char []));
-void	 findmail __P((char *, char *, int));
-void	 fioint __P((int));
-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	 forward __P((char [], FILE *, char *, int));
-void	 free_child __P((int));
-int	 from __P((void *));
-off_t	 fsize __P((FILE *));
-int	 getfold __P((char *, int));
-int	 gethfield __P((FILE *, char [], int, char **));
-int	 gethfromtty __P((struct header *, int));
-int	 getmsglist __P((char *, int *, int));
-int	 getrawlist __P((char [], char **, int));
-int	 getuserid __P((char []));
-int	 grabh __P((struct header *, int));
-int	 group __P((void *));
-int	 hash __P((char *));
-void	 hdrint __P((int));
-int	 headers __P((void *));
-int	 help __P((void *));
-void	 holdsigs __P((void));
-int	 ifcmd __P((void *));
-int	 igfield __P((void *));
+	 findgroup(char *);
+void	 findmail(char *, char *, int);
+void	 fioint(int);
+int	 first(int, int);
+void	 fixhead(struct header *, struct name *);
+void	 fmt(char *, struct name *, FILE *, int);
+int	 folders(void *);
+int	 forward(char *, FILE *, char *, int);
+void	 free_child(pid_t);
+int	 from(void *);
+off_t	 fsize(FILE *);
+int	 getfold(char *, int);
+int	 gethfield(FILE *, char *, int, char **);
+int	 gethfromtty(struct header *, int);
+int	 getmsglist(char *, int *, int);
+int	 getrawlist(char *, char **, int);
+uid_t	 getuserid(char *);
+int	 grabh(struct header *, int);
+int	 group(void *);
+int	 hash(char *);
+void	 hdrint(int);
+int	 headers(void *);
+int	 help(void *);
+void	 holdsigs(void);
+int	 ifcmd(void *);
+int	 igfield(void *);
 struct ignoretab;
-int	 ignore1 __P((char *[], struct ignoretab *, char *));
-int	 ignoresig __P((int, struct sigaction *, sigset_t *));
-int	 igshow __P((struct ignoretab *, char *));
-void	 intr __P((int));
-int	 inc __P((void *));
-int	 incfile __P((void));
-int	 isdate __P((char []));
-int	 isdir __P((char []));
-int	 isfileaddr __P((char *));
-int	 ishead __P((char []));
-int	 isign __P((char *, struct ignoretab []));
-int	 isprefix __P((char *, char *));
-void	 istrncpy __P((char *, char *, size_t));
+int	 ignore1(char **, struct ignoretab *, char *);
+int	 ignoresig(int, struct sigaction *, sigset_t *);
+int	 igshow(struct ignoretab *, char *);
+void	 intr(int);
+int	 inc(void *);
+int	 incfile(void);
+int	 isdate(char *);
+int	 isdir(char *);
+int	 isfileaddr(char *);
+int	 ishead(char *);
+int	 isign(char *, struct ignoretab *);
+int	 isprefix(char *, char *);
+size_t	 istrlcpy(char *, const char *, size_t);
 const struct cmd *
-	 lex __P((char []));
-void	 load __P((char *));
+	 lex(char *);
+void	 load(char *);
 struct var *
-	 lookup __P((char []));
-int	 mail __P((struct name *,
-	    struct name *, struct name *, struct name *, char *));
-void	 mail1 __P((struct header *, int));
-void	 makemessage __P((FILE *, int));
-void	 mark __P((int));
-int	 markall __P((char [], int));
-int	 marknew __P((void *));
-int	 matchsender __P((char *, int));
-int	 matchsubj __P((char *, int));
-int	 mboxit __P((void *));
-int	 member __P((char *, struct ignoretab *));
-void	 mesedit __P((FILE *, int));
-void	 mespipe __P((FILE *, char []));
-int	 messize __P((void *));
-int	 metamess __P((int, int));
-int	 more __P((void *));
-int	 newfileinfo __P((int));
-int	 next __P((void *));
-int	 null __P((void *));
+	 lookup(char *);
+int	 mail (struct name *, struct name *, struct name *, struct name *,
+	       char *);
+void	 mail1(struct header *, int);
+void	 makemessage(FILE *, int);
+void	 mark(int);
+int	 markall(char *, int);
+int	 marknew(void *);
+int	 matchsender(char *, int);
+int	 matchsubj(char *, int);
+int	 mboxit(void *);
+int	 member(char *, struct ignoretab *);
+void	 mesedit(FILE *, int);
+void	 mespipe(FILE *, char *);
+int	 messize(void *);
+int	 metamess(int, int);
+int	 more(void *);
+int	 newfileinfo(int);
+int	 next(void *);
+int	 null(void *);
 struct headline;
-void	 parse __P((char [], struct headline *, char []));
-int	 pcmdlist __P((void *));
-int	 pdot __P((void *));
-int	 pipeit __P((void *, 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));
-int	 pversion __P((void *));
-int	 quit __P((void));
-int	 quitcmd __P((void *));
-int	 raise __P((int));
-int	 readline __P((FILE *, char *, int, int *));
-void	 register_file __P((FILE *, int, int));
-void	 regret __P((int));
-void	 relsesigs __P((void));
-int	 respond __P((void *));
-int	 retfield __P((void *));
-int	 rexit __P((void *));
-int	 rm __P((char *));
-int	 run_command __P((char *cmd, sigset_t *nset, int infd, int outfd, ...));
-int	 save __P((void *));
-int	 save1 __P((char [], int, char *, struct ignoretab *));
-void	 savedeadletter __P((FILE *));
-int	 saveigfield __P((void *));
-int	 savemail __P((char [], FILE *));
-int	 saveretfield __P((void *));
-int	 scan __P((char **));
-void	 scaninit __P((void));
-int	 schdir __P((void *));
-int	 screensize __P((void));
-int	 scroll __P((void *));
-int	 sendmessage __P((struct message *, FILE *, struct ignoretab *, char *));
-int	 sendmail __P((void *));
-int	 set __P((void *));
-int	 setfile __P((char *));
-void	 setmsize __P((int));
-void	 setptr __P((FILE *, off_t));
-void	 setscreensize __P((void));
-int	 shell __P((void *));
-void	 sigchild __P((int));
-void	 sort __P((char **));
-int	 source __P((void *));
-int	 spool_lock __P((void));
-int	 spool_unlock __P((void));
-void	 spreserve __P((void));
-void	 sreset __P((void));
-int	 start_command __P((char *cmd, sigset_t *nset, int infd, int outfd, ...));
-int	 start_commandv __P((char *, sigset_t *, int, int, _BSD_VA_LIST_));
-void	 statusput __P((struct message *, FILE *, char *));
-void	 stop __P((int));
-int	 stouch __P((void *));
-int	 swrite __P((void *));
-void	 tinit __P((void));
-int	 top __P((void *));
-void	 touch __P((struct message *));
-void	 ttyint __P((int));
-void	 ttystop __P((int));
-int	 type __P((void *));
-int	 type1 __P((int *, char *, int, int));
-int	 undeletecmd __P((void *));
-void	 unmark __P((int));
-char	**unpack __P((struct name *, struct name *));
-int	 unread __P((void *));
-void	 unregister_file __P((FILE *));
-int	 unset __P((void *));
-int	 unstack __P((void));
-void	 vfree __P((char *));
-int	 visual __P((void *));
-int	 wait_child __P((int));
-int	 wait_command __P((int));
-int	 writeback __P((FILE *));
+void	 parse(char *, struct headline *, char *);
+int	 pcmdlist(void *);
+int	 pdot(void *);
+int	 pipeit(void *, void *);
+void	 prepare_child(sigset_t *, int, int);
+int	 preserve(void *);
+void	 prettyprint(struct name *);
+void	 printgroup(char *);
+void	 printhead(int);
+int	 puthead(struct header *, FILE *, int);
+int	 putline(FILE *, char *, int);
+int	 pversion(void *);
+int	 quit(void);
+int	 quitcmd(void *);
+int	 raise(int);
+int	 readline(FILE *, char *, int, int *);
+void	 register_file(FILE *, int, pid_t);
+void	 regret(int);
+void	 relsesigs(void);
+int	 respond(void *);
+int	 retfield(void *);
+int	 rexit(void *);
+int	 rm(char *);
+int	 run_command(char *cmd, sigset_t *nset, int infd, int outfd, ...);
+int	 save(void *);
+int	 save1(char *, int, char *, struct ignoretab *);
+void	 savedeadletter(FILE *);
+int	 saveigfield(void *);
+int	 savemail(char *, FILE *);
+int	 saveretfield(void *);
+int	 scan(char **);
+void	 scaninit(void);
+int	 schdir(void *);
+int	 screensize(void);
+int	 scroll(void *);
+int	 sendmessage(struct message *, FILE *, struct ignoretab *, char *);
+int	 sendmail(void *);
+int	 set(void *);
+int	 setfile(char *);
+void	 setmsize(int);
+void	 setptr(FILE *, off_t);
+void	 setscreensize(void);
+int	 shell(void *);
+void	 sigchild(int);
+void	 sort(char **);
+int	 source(void *);
+int	 spool_lock(void);
+int	 spool_unlock(void);
+void	 spreserve(void);
+void	 sreset(void);
+pid_t	 start_command(char *cmd, sigset_t *nset, int infd, int outfd, ...);
+pid_t	 start_commandv(char *, sigset_t *, int, int, _BSD_VA_LIST_);
+void	 statusput(struct message *, FILE *, char *);
+void	 stop(int);
+int	 stouch(void *);
+int	 swrite(void *);
+void	 tinit(void);
+int	 top(void *);
+void	 touch(struct message *);
+void	 ttyint(int);
+void	 ttystop(int);
+int	 type(void *);
+int	 type1(int *, char *, int, int);
+int	 undeletecmd(void *);
+void	 unmark(int);
+char	**unpack(struct name *, struct name *);
+int	 unread(void *);
+void	 unregister_file(FILE *);
+int	 unset(void *);
+int	 unstack(void);
+void	 vfree(char *);
+int	 visual(void *);
+int	 wait_child(pid_t);
+int	 wait_command(int);
+int	 writeback(FILE *);
 
 extern char *__progname;
 extern char *tmpdir;