===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/cmd2.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/mail/cmd2.c	2003/06/03 02:56:11	1.12
--- src/usr.bin/mail/cmd2.c	2003/10/24 20:32:06	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: cmd2.c,v 1.12 2003/06/03 02:56:11 millert Exp $	*/
  /*	$NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: cmd2.c,v 1.13 2003/10/24 20:32:06 avsm Exp $	*/
  /*	$NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $	*/
  
  /*
***************
*** 34,40 ****
  #if 0
  static const char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
  #else
! static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.12 2003/06/03 02:56:11 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 34,40 ----
  #if 0
  static const char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
  #else
! static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.13 2003/10/24 20:32:06 avsm Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 76,82 ****
  		for (ip = msgvec; *ip != NULL; ip++)
  			if (*ip > mdot)
  				break;
! 		if (*ip == NULL)
  			ip = msgvec;
  		ip2 = ip;
  		do {
--- 76,82 ----
  		for (ip = msgvec; *ip != NULL; ip++)
  			if (*ip > mdot)
  				break;
! 		if (*ip == 0)
  			ip = msgvec;
  		ip2 = ip;
  		do {
***************
*** 87,93 ****
  			}
  			if (*ip2 != NULL)
  				ip2++;
! 			if (*ip2 == NULL)
  				ip2 = msgvec;
  		} while (ip2 != ip);
  		puts("No messages applicable");
--- 87,93 ----
  			}
  			if (*ip2 != NULL)
  				ip2++;
! 			if (*ip2 == 0)
  				ip2 = msgvec;
  		} while (ip2 != ip);
  		puts("No messages applicable");
***************
*** 162,168 ****
  		return(1);
  	if (!f) {
  		*msgvec = first(0, MMNORM);
! 		if (*msgvec == NULL) {
  			printf("No messages to %s.\n", cmd);
  			return(1);
  		}
--- 162,168 ----
  		return(1);
  	if (!f) {
  		*msgvec = first(0, MMNORM);
! 		if (*msgvec == 0) {
  			printf("No messages to %s.\n", cmd);
  			return(1);
  		}