===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/names.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/mail/names.c	1997/07/13 21:21:15	1.4
--- src/usr.bin/mail/names.c	1997/07/13 23:54:01	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: names.c,v 1.4 1997/07/13 21:21:15 millert Exp $	*/
  /*	$NetBSD: names.c,v 1.5 1996/06/08 19:48:32 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: names.c,v 1.5 1997/07/13 23:54:01 millert Exp $	*/
  /*	$NetBSD: names.c,v 1.5 1996/06/08 19:48:32 christos Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)names.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: names.c,v 1.4 1997/07/13 21:21:15 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)names.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: names.c,v 1.5 1997/07/13 23:54:01 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 64,70 ****
  {
  	register struct name *np;
  
! 	np = (struct name *) salloc(sizeof(*np));
  	np->n_flink = NIL;
  	np->n_blink = NIL;
  	np->n_type = ntype;
--- 64,70 ----
  {
  	register struct name *np;
  
! 	np = (struct name *)salloc(sizeof(*np));
  	np->n_flink = NIL;
  	np->n_blink = NIL;
  	np->n_type = ntype;
***************
*** 234,240 ****
  
  	top = names;
  	np = names;
! 	(void) time(&now);
  	date = ctime(&now);
  	while (np != NIL) {
  		if (!isfileaddr(np->n_name) && np->n_name[0] != '|') {
--- 234,240 ----
  
  	top = names;
  	np = names;
! 	(void)time(&now);
  	date = ctime(&now);
  	while (np != NIL) {
  		if (!isfileaddr(np->n_name) && np->n_name[0] != '|') {
***************
*** 259,279 ****
  				goto cant;
  			}
  			image = open(tempEdit, 2);
! 			(void) unlink(tempEdit);
  			if (image < 0) {
  				warn(tempEdit);
  				senderr++;
  				(void)Fclose(fout);
  				goto cant;
  			}
! 			(void) fcntl(image, F_SETFD, 1);
  			fprintf(fout, "From %s %s", myname, date);
  			puthead(hp, fout, GTO|GSUBJECT|GCC|GNL);
  			while ((c = getc(fo)) != EOF)
! 				(void) putc(c, fout);
  			rewind(fo);
! 			(void) putc('\n', fout);
! 			(void) fflush(fout);
  			if (ferror(fout))
  				warn(tempEdit);
  			(void)Fclose(fout);
--- 259,279 ----
  				goto cant;
  			}
  			image = open(tempEdit, 2);
! 			(void)unlink(tempEdit);
  			if (image < 0) {
  				warn(tempEdit);
  				senderr++;
  				(void)Fclose(fout);
  				goto cant;
  			}
! 			(void)fcntl(image, F_SETFD, 1);
  			fprintf(fout, "From %s %s", myname, date);
  			puthead(hp, fout, GTO|GSUBJECT|GCC|GNL);
  			while ((c = getc(fo)) != EOF)
! 				(void)putc(c, fout);
  			rewind(fo);
! 			(void)putc('\n', fout);
! 			(void)fflush(fout);
  			if (ferror(fout))
  				warn(tempEdit);
  			(void)Fclose(fout);
***************
*** 330,336 ****
  			}
  			rewind(fin);
  			while ((c = getc(fin)) != EOF)
! 				(void) putc(c, fout);
  			if (ferror(fout)) {
  				senderr++;
  				warn(fname);
--- 330,336 ----
  			}
  			rewind(fin);
  			while ((c = getc(fin)) != EOF)
! 				(void)putc(c, fout);
  			if (ferror(fout)) {
  				senderr++;
  				warn(fname);
***************
*** 510,516 ****
  	verbose = value("verbose") != NOSTR;
  	if (verbose)
  		extra++;
! 	top = (char **) salloc((t + extra) * sizeof(*top));
  	ap = top;
  	*ap++ = "send-mail";
  	*ap++ = "-i";
--- 510,516 ----
  	verbose = value("verbose") != NOSTR;
  	if (verbose)
  		extra++;
! 	top = (char **)salloc((t + extra) * sizeof(*top));
  	ap = top;
  	*ap++ = "send-mail";
  	*ap++ = "-i";