===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/collect.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/mail/collect.c	1997/07/30 07:19:30	1.14
--- src/usr.bin/mail/collect.c	1997/11/14 00:23:45	1.15
***************
*** 1,4 ****
! /*	$OpenBSD: collect.c,v 1.14 1997/07/30 07:19:30 millert Exp $	*/
  /*	$NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: collect.c,v 1.15 1997/11/14 00:23:45 millert Exp $	*/
  /*	$NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)collect.c	8.2 (Berkeley) 4/19/94";
  #else
! static char rcsid[] = "$OpenBSD: collect.c,v 1.14 1997/07/30 07:19:30 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)collect.c	8.2 (Berkeley) 4/19/94";
  #else
! static char rcsid[] = "$OpenBSD: collect.c,v 1.15 1997/11/14 00:23:45 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 81,90 ****
  	int printheaders;
  {
  	FILE *fbuf;
! 	int lc, cc, escape, eofcount, fd;
! 	register int c, t;
! 	char linebuf[LINESIZE], tempname[PATHSIZE], *cp;
! 	char getsub;
  	sigset_t oset, nset;
  	int longline, lastlong, rc;	/* Can deal with lines > LINESIZE */
  
--- 81,88 ----
  	int printheaders;
  {
  	FILE *fbuf;
! 	int lc, cc, escape, eofcount, fd, c, t;
! 	char linebuf[LINESIZE], tempname[PATHSIZE], *cp, getsub;
  	sigset_t oset, nset;
  	int longline, lastlong, rc;	/* Can deal with lines > LINESIZE */
  
***************
*** 440,447 ****
  	FILE *fp;
  	int f;
  {
! 	register FILE *of;
! 	register int c;
  	ssize_t cc, lc;
  	struct stat junk;
  
--- 438,445 ----
  	FILE *fp;
  	int f;
  {
! 	FILE *of;
! 	int c;
  	ssize_t cc, lc;
  	struct stat junk;
  
***************
*** 449,455 ****
  		printf("\"%s\" ", name);
  		fflush(stdout);
  	}
! 	if (stat(name, &junk) >= 0 && (junk.st_mode & S_IFMT) == S_IFREG) {
  		if (!f)
  			fprintf(stderr, "%s: ", name);
  		fputs("File exists\n", stderr);
--- 447,453 ----
  		printf("\"%s\" ", name);
  		fflush(stdout);
  	}
! 	if (stat(name, &junk) >= 0 && S_ISREG(junk.st_mode)) {
  		if (!f)
  			fprintf(stderr, "%s: ", name);
  		fputs("File exists\n", stderr);
***************
*** 563,569 ****
  	char *fn;
  	int f;
  {
! 	register int *msgvec;
  	struct ignoretab *ig;
  	char *tabst;
  
--- 561,567 ----
  	char *fn;
  	int f;
  {
! 	int *msgvec;
  	struct ignoretab *ig;
  	char *tabst;
  
***************
*** 668,677 ****
  
  void
  savedeadletter(fp)
! 	register FILE *fp;
  {
! 	register FILE *dbuf;
! 	register int c;
  	char *cp;
  
  	if (fsize(fp) == 0)
--- 666,675 ----
  
  void
  savedeadletter(fp)
! 	FILE *fp;
  {
! 	FILE *dbuf;
! 	int c;
  	char *cp;
  
  	if (fsize(fp) == 0)