===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vacation/vacation.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/vacation/vacation.c	1997/01/15 23:43:31	1.4
--- src/usr.bin/vacation/vacation.c	1997/01/17 07:13:48	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: vacation.c,v 1.4 1997/01/15 23:43:31 millert Exp $	*/
  /*	$NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: vacation.c,v 1.5 1997/01/17 07:13:48 millert 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.4 1997/01/15 23:43:31 millert 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.5 1997/01/17 07:13:48 millert Exp $";
  #endif /* not lint */
  
  /*
***************
*** 216,222 ****
  				for (p = buf + 5; *p && *p != ' '; ++p);
  				*p = '\0';
  				(void)strcpy(from, buf + 5);
! 				if (p = index(from, '\n'))
  					*p = '\0';
  				if (junkmail())
  					exit(0);
--- 216,222 ----
  				for (p = buf + 5; *p && *p != ' '; ++p);
  				*p = '\0';
  				(void)strcpy(from, buf + 5);
! 				if (p = strchr(from, '\n'))
  					*p = '\0';
  				if (junkmail())
  					exit(0);
***************
*** 227,233 ****
  			if (strncasecmp(buf, "Precedence", 10) ||
  			    buf[10] != ':' && buf[10] != ' ' && buf[10] != '\t')
  				break;
! 			if (!(p = index(buf, ':')))
  				break;
  			while (*++p && isspace(*p));
  			if (!*p)
--- 227,233 ----
  			if (strncasecmp(buf, "Precedence", 10) ||
  			    buf[10] != ':' && buf[10] != ' ' && buf[10] != '\t')
  				break;
! 			if (!(p = strchr(buf, ':')))
  				break;
  			while (*++p && isspace(*p));
  			if (!*p)
***************
*** 305,313 ****
  	 *
  	 * From site!site!SENDER%site.domain%site.domain@site.domain
  	 */
! 	if (!(p = index(from, '%')))
! 		if (!(p = index(from, '@'))) {
! 			if (p = rindex(from, '!'))
  				++p;
  			else
  				p = from;
--- 305,313 ----
  	 *
  	 * From site!site!SENDER%site.domain%site.domain@site.domain
  	 */
! 	if (!(p = strchr(from, '%')))
! 		if (!(p = strchr(from, '@'))) {
! 			if (p = strrchr(from, '!'))
  				++p;
  			else
  				p = from;