===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vacation/vacation.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/vacation/vacation.c	1999/06/03 20:20:26	1.12
--- src/usr.bin/vacation/vacation.c	2000/08/05 21:53:30	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: vacation.c,v 1.12 1999/06/03 20:20:26 marc Exp $	*/
  /*	$NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: vacation.c,v 1.13 2000/08/05 21:53:30 pjanzen Exp $	*/
  /*	$NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $	*/
  
  /*
***************
*** 44,50 ****
  #if 0
  static char sccsid[] = "@(#)vacation.c	8.2 (Berkeley) 1/26/94";
  #endif
! static char rcsid[] = "$OpenBSD: vacation.c,v 1.12 1999/06/03 20:20:26 marc Exp $";
  #endif /* not lint */
  
  /*
--- 44,50 ----
  #if 0
  static char sccsid[] = "@(#)vacation.c	8.2 (Berkeley) 1/26/94";
  #endif
! static char rcsid[] = "$OpenBSD: vacation.c,v 1.13 2000/08/05 21:53:30 pjanzen Exp $";
  #endif /* not lint */
  
  /*
***************
*** 224,230 ****
  					;
  				*p = '\0';
  				(void)strcpy(from, buf + 5);
! 				if (p = strchr(from, '\n'))
  					*p = '\0';
  				if (junkmail())
  					exit(0);
--- 224,230 ----
  					;
  				*p = '\0';
  				(void)strcpy(from, buf + 5);
! 				if ((p = strchr(from, '\n')))
  					*p = '\0';
  				if (junkmail())
  					exit(0);
***************
*** 234,240 ****
  			cont = 0;
  			if (strncasecmp(buf, "Return-Path:",
  					sizeof("Return-Path:")-1) ||
! 			    buf[12] != ' ' && buf[12] != '\t')
  				break;
  			for (p = buf + 12; *p && isspace(*p); ++p)
  				;
--- 234,240 ----
  			cont = 0;
  			if (strncasecmp(buf, "Return-Path:",
  					sizeof("Return-Path:")-1) ||
! 			    (buf[12] != ' ' && buf[12] != '\t'))
  				break;
  			for (p = buf + 12; *p && isspace(*p); ++p)
  				;
***************
*** 243,249 ****
  				       "Return-Path %s exceeds limits", p);
  				exit(1);
  			}
! 			if (p = strchr(from, '\n'))
  				*p = '\0';
  			if (junkmail())
  				exit(0);
--- 243,249 ----
  				       "Return-Path %s exceeds limits", p);
  				exit(1);
  			}
! 			if ((p = strchr(from, '\n')))
  				*p = '\0';
  			if (junkmail())
  				exit(0);
***************
*** 251,257 ****
  		case 'P':		/* "Precedence:" */
  			cont = 0;
  			if (strncasecmp(buf, "Precedence", 10) ||
! 			    buf[10] != ':' && buf[10] != ' ' && buf[10] != '\t')
  				break;
  			if (!(p = strchr(buf, ':')))
  				break;
--- 251,258 ----
  		case 'P':		/* "Precedence:" */
  			cont = 0;
  			if (strncasecmp(buf, "Precedence", 10) ||
! 			    (buf[10] != ':' && buf[10] != ' ' &&
! 			    buf[10] != '\t'))
  				break;
  			if (!(p = strchr(buf, ':')))
  				break;
***************
*** 267,273 ****
  			cont = 0;
  			if (strncasecmp(buf, "Subject:",
  					sizeof("Subject:")-1) ||
! 			    buf[8] != ' ' && buf[8] != '\t')
  				break;
  			for (p = buf + 8; *p && isspace(*p); ++p)
  				;
--- 268,274 ----
  			cont = 0;
  			if (strncasecmp(buf, "Subject:",
  					sizeof("Subject:")-1) ||
! 			    (buf[8] != ' ' && buf[8] != '\t'))
  				break;
  			for (p = buf + 8; *p && isspace(*p); ++p)
  				;
***************
*** 276,282 ****
  				       "Subject %s exceeds limits", p);
  				exit(1);
  			}
! 			if (p = strchr(subj, '\n'))
  				*p = '\0';
  			break;
  		case 'C':		/* "Cc:" */
--- 277,283 ----
  				       "Subject %s exceeds limits", p);
  				exit(1);
  			}
! 			if ((p = strchr(subj, '\n')))
  				*p = '\0';
  			break;
  		case 'C':		/* "Cc:" */
***************
*** 316,322 ****
  	register int len;
  
  	for (len = strlen(name); *str; ++str)
! 		if (*str == *name && !strncasecmp(name, str, len))
  			return(1);
  	return(0);
  }
--- 317,323 ----
  	register int len;
  
  	for (len = strlen(name); *str; ++str)
! 		if (!strncasecmp(name, str, len))
  			return(1);
  	return(0);
  }
***************
*** 332,340 ****
  		char	*name;
  		int	len;
  	} ignore[] = {
! 		"-request", 8,		"postmaster", 10,	"uucp", 4,
! 		"mailer-daemon", 13,	"mailer", 6,		"-relay", 6,
! 		NULL, NULL,
  	};
  	register struct ignore *cur;
  	register int len;
--- 333,345 ----
  		char	*name;
  		int	len;
  	} ignore[] = {
! 		{ "-request", 8 },
! 		{ "postmaster", 10 },
! 		{ "uucp", 4 },
! 		{ "mailer-daemon", 13 },
! 		{ "mailer", 6 },
! 		{ "-relay", 6 },
! 		{ NULL, 0 }
  	};
  	register struct ignore *cur;
  	register int len;
***************
*** 349,355 ****
  	 */
  	if (!(p = strchr(from, '%')))
  		if (!(p = strchr(from, '@'))) {
! 			if (p = strrchr(from, '!'))
  				++p;
  			else
  				p = from;
--- 354,360 ----
  	 */
  	if (!(p = strchr(from, '%')))
  		if (!(p = strchr(from, '@'))) {
! 			if ((p = strrchr(from, '!')))
  				++p;
  			else
  				p = from;