===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/msgs/Attic/msgs.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/msgs/Attic/msgs.c	1997/04/02 08:28:01	1.7
--- src/usr.bin/msgs/Attic/msgs.c	1997/04/02 17:21:24	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: msgs.c,v 1.7 1997/04/02 08:28:01 deraadt Exp $	*/
  /*	$NetBSD: msgs.c,v 1.7 1995/09/28 06:57:40 tls Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: msgs.c,v 1.8 1997/04/02 17:21:24 deraadt Exp $	*/
  /*	$NetBSD: msgs.c,v 1.7 1995/09/28 06:57:40 tls Exp $	*/
  
  /*-
***************
*** 44,50 ****
  #if 0
  static char sccsid[] = "@(#)msgs.c	8.2 (Berkeley) 4/28/95";
  #else
! static char rcsid[] = "$OpenBSD: msgs.c,v 1.7 1997/04/02 08:28:01 deraadt Exp $";
  #endif
  #endif /* not lint */
  
--- 44,50 ----
  #if 0
  static char sccsid[] = "@(#)msgs.c	8.2 (Berkeley) 4/28/95";
  #else
! static char rcsid[] = "$OpenBSD: msgs.c,v 1.8 1997/04/02 17:21:24 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 113,120 ****
  FILE	*newmsg;
  char	*sep = "-";
  char	inbuf[BUFSIZ];
! char	fname[128];
! char	cmdbuf[128];
  char	subj[128];
  char	from[128];
  char	date[128];
--- 113,120 ----
  FILE	*newmsg;
  char	*sep = "-";
  char	inbuf[BUFSIZ];
! char	fname[MAXPATHLEN];
! char	cmdbuf[MAXPATHLEN + MAXPATHLEN];
  char	subj[128];
  char	from[128];
  char	date[128];
***************
*** 822,832 ****
  			frompos = ftell(infile);
  			ptr = from;
  			in = nxtfld(inbuf);
! 			if (*in) while (*in && *in > ' ') {
! 				if (*in == ':' || *in == '@' || *in == '!')
! 					local = NO;
! 				*ptr++ = *in++;
! 				/* what about sizeof from ? */
  			}
  			*ptr = NULL;
  			if (*(in = nxtfld(in)))
--- 822,834 ----
  			frompos = ftell(infile);
  			ptr = from;
  			in = nxtfld(inbuf);
! 			if (*in) {
! 				while (*in && *in > ' ' &&
! 				    ptr - from < sizeof from -1) {
! 					if (*in == ':' || *in == '@' || *in == '!')
! 						local = NO;
! 					*ptr++ = *in++;
! 				}
  			}
  			*ptr = NULL;
  			if (*(in = nxtfld(in)))