===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/domacro.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- src/usr.bin/ftp/domacro.c	1997/02/03 01:02:35	1.3
+++ src/usr.bin/ftp/domacro.c	1997/02/03 01:05:36	1.4
@@ -1,3 +1,4 @@
+/*	$OpenBSD: domacro.c,v 1.4 1997/02/03 01:05:36 millert Exp $	*/
 /*	$NetBSD: domacro.c,v 1.8 1997/01/19 14:19:08 lukem Exp $	*/
 
 /*
@@ -37,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)domacro.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$NetBSD: domacro.c,v 1.8 1997/01/19 14:19:08 lukem Exp $";
+static char rcsid[] = "$OpenBSD: domacro.c,v 1.4 1997/02/03 01:05:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,7 +73,7 @@
 		code = -1;
 		return;
 	}
-	(void) strcpy(line2, line);
+	(void)strcpy(line2, line);
 TOP:
 	cp1 = macros[i].mac_start;
 	while (cp1 != macros[i].mac_end) {
@@ -93,7 +94,7 @@
 				    }
 				    cp1--;
 				    if (argc - 2 >= j) {
-					(void) strcpy(cp2, argv[j+1]);
+					(void)strcpy(cp2, argv[j+1]);
 					cp2 += strlen(argv[j+1]);
 				    }
 				    break;
@@ -102,7 +103,7 @@
 					loopflg = 1;
 					cp1++;
 					if (count < argc) {
-					   (void) strcpy(cp2, argv[count]);
+					   (void)strcpy(cp2, argv[count]);
 					   cp2 += strlen(argv[count]);
 					}
 					break;
@@ -120,26 +121,26 @@
 		makeargv();
 		c = getcmd(margv[0]);
 		if (c == (struct cmd *)-1) {
-			printf("?Ambiguous command\n");
+			puts("?Ambiguous command");
 			code = -1;
 		}
 		else if (c == 0) {
-			printf("?Invalid command\n");
+			puts("?Invalid command");
 			code = -1;
 		}
 		else if (c->c_conn && !connected) {
-			printf("Not connected.\n");
+			puts("Not connected.");
 			code = -1;
 		}
 		else {
 			if (verbose) {
-				printf("%s\n", line);
+				puts(line);
 			}
 			(*c->c_handler)(margc, margv);
 			if (bell && c->c_bell) {
-				(void) putchar('\007');
+				(void)putchar('\007');
 			}
-			(void) strcpy(line, line2);
+			(void)strcpy(line, line2);
 			makeargv();
 			argc = margc;
 			argv = margv;