===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/ruserpass.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/ftp/ruserpass.c	1997/04/10 00:17:10	1.7
--- src/usr.bin/ftp/ruserpass.c	1997/04/23 20:33:21	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: ruserpass.c,v 1.7 1997/04/10 00:17:10 millert Exp $	*/
  /*	$NetBSD: ruserpass.c,v 1.13 1997/04/01 14:20:34 mrg Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ruserpass.c,v 1.8 1997/04/23 20:33:21 deraadt Exp $	*/
  /*	$NetBSD: ruserpass.c,v 1.13 1997/04/01 14:20:34 mrg Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)ruserpass.c	8.4 (Berkeley) 4/27/95";
  #else
! static char rcsid[] = "$OpenBSD: ruserpass.c,v 1.7 1997/04/10 00:17:10 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)ruserpass.c	8.4 (Berkeley) 4/27/95";
  #else
! static char rcsid[] = "$OpenBSD: ruserpass.c,v 1.8 1997/04/23 20:33:21 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 191,202 ****
  				if (c != ' ' && c != '\t')
  					break;
  			if (c == EOF || c == '\n') {
! 				puts("Missing macdef name argument.");
  				goto bad;
  			}
  			if (macnum == 16) {
! 				puts(
! "Limit of 16 macros have already been defined.");
  				goto bad;
  			}
  			tmp = macros[macnum].mac_name;
--- 191,202 ----
  				if (c != ' ' && c != '\t')
  					break;
  			if (c == EOF || c == '\n') {
! 				fputs("Missing macdef name argument.\n", ttyout);
  				goto bad;
  			}
  			if (macnum == 16) {
! 				fputs(
! "Limit of 16 macros have already been defined.\n", ttyout);
  				goto bad;
  			}
  			tmp = macros[macnum].mac_name;
***************
*** 206,213 ****
  				*tmp++ = c;
  			}
  			if (c == EOF) {
! 				puts(
! "Macro definition missing null line terminator.");
  				goto bad;
  			}
  			*tmp = '\0';
--- 206,213 ----
  				*tmp++ = c;
  			}
  			if (c == EOF) {
! 				fputs(
! "Macro definition missing null line terminator.\n", ttyout);
  				goto bad;
  			}
  			*tmp = '\0';
***************
*** 215,222 ****
  				while ((c=getc(cfile)) != EOF && c != '\n');
  			}
  			if (c == EOF) {
! 				puts(
! "Macro definition missing null line terminator.");
  				goto bad;
  			}
  			if (macnum == 0) {
--- 215,222 ----
  				while ((c=getc(cfile)) != EOF && c != '\n');
  			}
  			if (c == EOF) {
! 				fputs(
! "Macro definition missing null line terminator.\n", ttyout);
  				goto bad;
  			}
  			if (macnum == 0) {
***************
*** 229,236 ****
  			tmp = macros[macnum].mac_start;
  			while (tmp != macbuf + 4096) {
  				if ((c=getc(cfile)) == EOF) {
! 				puts(
! "Macro definition missing null line terminator.");
  					goto bad;
  				}
  				*tmp = c;
--- 229,236 ----
  			tmp = macros[macnum].mac_start;
  			while (tmp != macbuf + 4096) {
  				if ((c=getc(cfile)) == EOF) {
! 				fputs(
! "Macro definition missing null line terminator.\n", ttyout);
  					goto bad;
  				}
  				*tmp = c;
***************
*** 244,250 ****
  				tmp++;
  			}
  			if (tmp == macbuf + 4096) {
! 				puts("4K macro buffer exceeded.");
  				goto bad;
  			}
  			break;
--- 244,250 ----
  				tmp++;
  			}
  			if (tmp == macbuf + 4096) {
! 				fputs("4K macro buffer exceeded.\n", ttyout);
  				goto bad;
  			}
  			break;