===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/cmd1.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/mail/cmd1.c	2001/11/20 20:50:00	1.20
--- src/usr.bin/mail/cmd1.c	2001/11/21 15:26:39	1.21
***************
*** 1,4 ****
! /*	$OpenBSD: cmd1.c,v 1.20 2001/11/20 20:50:00 millert Exp $	*/
  /*	$NetBSD: cmd1.c,v 1.9 1997/07/09 05:29:48 mikel Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: cmd1.c,v 1.21 2001/11/21 15:26:39 millert Exp $	*/
  /*	$NetBSD: cmd1.c,v 1.9 1997/07/09 05:29:48 mikel Exp $	*/
  
  /*-
***************
*** 36,44 ****
  
  #ifndef lint
  #if 0
! static char sccsid[] = "@(#)cmd1.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: cmd1.c,v 1.20 2001/11/20 20:50:00 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 36,44 ----
  
  #ifndef lint
  #if 0
! static const char sccsid[] = "@(#)cmd1.c	8.2 (Berkeley) 4/20/95";
  #else
! static const char rcsid[] = "$OpenBSD: cmd1.c,v 1.21 2001/11/21 15:26:39 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 60,67 ****
  static volatile sig_atomic_t gothdrint;
  
  int
! headers(v)
! 	void *v;
  {
  	int *msgvec = v;
  	int n, mesg, flag, size;
--- 60,66 ----
  static volatile sig_atomic_t gothdrint;
  
  int
! headers(void *v)
  {
  	int *msgvec = v;
  	int n, mesg, flag, size;
***************
*** 119,126 ****
   * Scroll to the next/previous screen
   */
  int
! scroll(v)
! 	void *v;
  {
  	char *arg = v;
  	int size, maxscreen;
--- 118,124 ----
   * Scroll to the next/previous screen
   */
  int
! scroll(void *v)
  {
  	char *arg = v;
  	int size, maxscreen;
***************
*** 158,164 ****
   * Compute screen size.
   */
  int
! screensize()
  {
  	int s;
  	char *cp;
--- 156,162 ----
   * Compute screen size.
   */
  int
! screensize(void)
  {
  	int s;
  	char *cp;
***************
*** 173,180 ****
   * in the passed message list.
   */
  int
! from(v)
! 	void *v;
  {
  	int *msgvec = v;
  	int *ip;
--- 171,177 ----
   * in the passed message list.
   */
  int
! from(void *v)
  {
  	int *msgvec = v;
  	int *ip;
***************
*** 191,198 ****
   * This is a slight improvement to the standard one.
   */
  void
! printhead(mesg)
! 	int mesg;
  {
  	struct message *mp;
  	char headline[LINESIZE], wcount[LINESIZE], *subjline, dispc, curind;
--- 188,194 ----
   * This is a slight improvement to the standard one.
   */
  void
! printhead(int mesg)
  {
  	struct message *mp;
  	char headline[LINESIZE], wcount[LINESIZE], *subjline, dispc, curind;
***************
*** 258,265 ****
   * Print out the value of dot.
   */
  int
! pdot(v)
! 	void *v;
  {
  	printf("%d\n", (int)(dot - &message[0] + 1));
  	return(0);
--- 254,260 ----
   * Print out the value of dot.
   */
  int
! pdot(void *v)
  {
  	printf("%d\n", (int)(dot - &message[0] + 1));
  	return(0);
***************
*** 269,276 ****
   * Print out all the possible commands.
   */
  int
! pcmdlist(v)
! 	void *v;
  {
  	extern const struct cmd cmdtab[];
  	const struct cmd *cp;
--- 264,270 ----
   * Print out all the possible commands.
   */
  int
! pcmdlist(void *v)
  {
  	extern const struct cmd cmdtab[];
  	const struct cmd *cp;
***************
*** 295,302 ****
   * Pipe message to command
   */
  int
! pipeit(ml, sl)
! 	void *ml, *sl;
  {
  	int  *msgvec = ml;
  	char *cmd    = sl;
--- 289,295 ----
   * Pipe message to command
   */
  int
! pipeit(void *ml, void *sl)
  {
  	int  *msgvec = ml;
  	char *cmd    = sl;
***************
*** 308,315 ****
   * Paginate messages, honor ignored fields.
   */
  int
! more(v)
! 	void *v;
  {
  	int *msgvec = v;
  	return(type1(msgvec, NULL, 1, 1));
--- 301,307 ----
   * Paginate messages, honor ignored fields.
   */
  int
! more(void *v)
  {
  	int *msgvec = v;
  	return(type1(msgvec, NULL, 1, 1));
***************
*** 319,326 ****
   * Paginate messages, even printing ignored fields.
   */
  int
! More(v)
! 	void *v;
  {
  	int *msgvec = v;
  
--- 311,317 ----
   * Paginate messages, even printing ignored fields.
   */
  int
! More(void *v)
  {
  	int *msgvec = v;
  
***************
*** 331,338 ****
   * Type out messages, honor ignored fields.
   */
  int
! type(v)
! 	void *v;
  {
  	int *msgvec = v;
  
--- 322,328 ----
   * Type out messages, honor ignored fields.
   */
  int
! type(void *v)
  {
  	int *msgvec = v;
  
***************
*** 343,350 ****
   * Type out messages, even printing ignored fields.
   */
  int
! Type(v)
! 	void *v;
  {
  	int *msgvec = v;
  
--- 333,339 ----
   * Type out messages, even printing ignored fields.
   */
  int
! Type(void *v)
  {
  	int *msgvec = v;
  
***************
*** 355,364 ****
   * Type out the messages requested.
   */
  int
! type1(msgvec, cmd, doign, page)
! 	int *msgvec;
! 	char *cmd;
! 	int doign, page;
  {
  	int nlines, *ip, restoreterm;
  	struct message *mp;
--- 344,350 ----
   * Type out the messages requested.
   */
  int
! type1(int *msgvec, char *cmd, int doign, int page)
  {
  	int nlines, *ip, restoreterm;
  	struct message *mp;
***************
*** 397,403 ****
  	}
  
  	/*
! 	 * send messages to the output.
  	 */
  	for (ip = msgvec; *ip && ip - msgvec < msgCount; ip++) {
  		mp = &message[*ip - 1];
--- 383,389 ----
  	}
  
  	/*
! 	 * Send messages to the output.
  	 */
  	for (ip = msgvec; *ip && ip - msgvec < msgCount; ip++) {
  		mp = &message[*ip - 1];
***************
*** 423,430 ****
   * and defaults to 5.
   */
  int
! top(v)
! 	void *v;
  {
  	int *msgvec = v;
  	int *ip;
--- 409,415 ----
   * and defaults to 5.
   */
  int
! top(void * v)
  {
  	int *msgvec = v;
  	int *ip;
***************
*** 466,473 ****
   * get mboxed.
   */
  int
! stouch(v)
! 	void *v;
  {
  	int *msgvec = v;
  	int *ip;
--- 451,457 ----
   * get mboxed.
   */
  int
! stouch(void *v)
  {
  	int *msgvec = v;
  	int *ip;
***************
*** 484,491 ****
   * Make sure all passed messages get mboxed.
   */
  int
! mboxit(v)
! 	void *v;
  {
  	int *msgvec = v;
  	int *ip;
--- 468,474 ----
   * Make sure all passed messages get mboxed.
   */
  int
! mboxit(void *v)
  {
  	int *msgvec = v;
  	int *ip;
***************
*** 502,509 ****
   * List the folders the user currently has.
   */
  int
! folders(v)
! 	void *v;
  {
  	char *files = (char *)v;
  	char dirname[PATHSIZE];
--- 485,491 ----
   * List the folders the user currently has.
   */
  int
! folders(void *v)
  {
  	char *files = (char *)v;
  	char dirname[PATHSIZE];
***************
*** 525,532 ****
   * come in since we started reading mail.
   */
  int
! inc(v)
! 	void *v;
  {
  	int nmsg, mdot;
  
--- 507,513 ----
   * come in since we started reading mail.
   */
  int
! inc(void *v)
  {
  	int nmsg, mdot;
  
***************
*** 548,555 ****
   * User hit ^C while printing the headers.
   */
  void
! hdrint(s)
! 	int s;
  {
  
  	gothdrint = 1;
--- 529,535 ----
   * User hit ^C while printing the headers.
   */
  void
! hdrint(int s)
  {
  
  	gothdrint = 1;