===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/cmds.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/ftp/cmds.c	1997/02/03 01:02:32	1.13
--- src/usr.bin/ftp/cmds.c	1997/02/03 01:05:33	1.14
***************
*** 1,3 ****
--- 1,4 ----
+ /*	$OpenBSD: cmds.c,v 1.14 1997/02/03 01:05:33 millert Exp $	*/
  /*	$NetBSD: cmds.c,v 1.18 1997/02/01 10:44:54 lukem Exp $	*/
  
  /*
***************
*** 37,43 ****
  #if 0
  static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
  #else
! static char rcsid[] = "$NetBSD: cmds.c,v 1.18 1997/02/01 10:44:54 lukem Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
  #else
! static char rcsid[] = "$OpenBSD: cmds.c,v 1.14 1997/02/03 01:05:33 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 100,106 ****
  			printf("%s%s", sep, p->t_name);
  			sep = " | ";
  		}
! 		printf(" ]\n");
  		code = -1;
  		return;
  	}
--- 101,107 ----
  			printf("%s%s", sep, p->t_name);
  			sep = " | ";
  		}
! 		puts(" ]");
  		code = -1;
  		return;
  	}
***************
*** 122,128 ****
  	else
  		comret = command("TYPE %s", p->t_mode);
  	if (comret == COMPLETE) {
! 		(void) strcpy(typename, p->t_name);
  		curtype = type = p->t_type;
  	}
  }
--- 123,129 ----
  	else
  		comret = command("TYPE %s", p->t_mode);
  	if (comret == COMPLETE) {
! 		(void)strcpy(typename, p->t_name);
  		curtype = type = p->t_type;
  	}
  }
***************
*** 321,327 ****
  	mname = argv[0];
  	mflag = 1;
  	oldintr = signal(SIGINT, mabort);
! 	(void) setjmp(jabort);
  	if (proxy) {
  		char *cp, *tp2, tmpbuf[MAXPATHLEN];
  
--- 322,328 ----
  	mname = argv[0];
  	mflag = 1;
  	oldintr = signal(SIGINT, mabort);
! 	(void)setjmp(jabort);
  	if (proxy) {
  		char *cp, *tp2, tmpbuf[MAXPATHLEN];
  
***************
*** 367,373 ****
  				}
  			}
  		}
! 		(void) signal(SIGINT, oldintr);
  		mflag = 0;
  		return;
  	}
--- 368,374 ----
  				}
  			}
  		}
! 		(void)signal(SIGINT, oldintr);
  		mflag = 0;
  		return;
  	}
***************
*** 419,425 ****
  		}
  		globfree(&gl);
  	}
! 	(void) signal(SIGINT, oldintr);
  	mflag = 0;
  }
  
--- 420,426 ----
  		}
  		globfree(&gl);
  	}
! 	(void)signal(SIGINT, oldintr);
  	mflag = 0;
  }
  
***************
*** 429,435 ****
  	char *argv[];
  {
  
! 	(void) getit(argc, argv, 1, "r+w");
  }
  
  void
--- 430,436 ----
  	char *argv[];
  {
  
! 	(void)getit(argc, argv, 1, "r+w");
  }
  
  void
***************
*** 438,444 ****
  	char *argv[];
  {
  
! 	(void) getit(argc, argv, 0, restart_point ? "r+w" : "w" );
  }
  
  /*
--- 439,445 ----
  	char *argv[];
  {
  
! 	(void)getit(argc, argv, 0, restart_point ? "r+w" : "w" );
  }
  
  /*
***************
*** 534,541 ****
  	int ointer, oconf;
  
  	alarmtimer(0);
! 	printf("\n");
! 	(void) fflush(stdout);
  	if (mflag && fromatty) {
  		ointer = interactive;
  		oconf = confirmrest;
--- 535,542 ----
  	int ointer, oconf;
  
  	alarmtimer(0);
! 	putchar('\n');
! 	(void)fflush(stdout);
  	if (mflag && fromatty) {
  		ointer = interactive;
  		oconf = confirmrest;
***************
*** 573,579 ****
  	mname = argv[0];
  	mflag = 1;
  	oldintr = signal(SIGINT, mabort);
! 	(void) setjmp(jabort);
  	while ((cp = remglob(argv, proxy)) != NULL) {
  		if (*cp == '\0') {
  			mflag = 0;
--- 574,580 ----
  	mname = argv[0];
  	mflag = 1;
  	oldintr = signal(SIGINT, mabort);
! 	(void)setjmp(jabort);
  	while ((cp = remglob(argv, proxy)) != NULL) {
  		if (*cp == '\0') {
  			mflag = 0;
***************
*** 605,611 ****
  			}
  		}
  	}
! 	(void) signal(SIGINT, oldintr);
  	mflag = 0;
  }
  
--- 606,612 ----
  			}
  		}
  	}
! 	(void)signal(SIGINT, oldintr);
  	mflag = 0;
  }
  
***************
*** 631,637 ****
  	if (connected)
  		printf("Connected to %s.\n", hostname);
  	else
! 		printf("Not connected.\n");
  	if (!proxy) {
  		pswitch(1);
  		if (connected) {
--- 632,638 ----
  	if (connected)
  		printf("Connected to %s.\n", hostname);
  	else
! 		puts("Not connected.");
  	if (!proxy) {
  		pswitch(1);
  		if (connected) {
***************
*** 639,645 ****
  			    hostname);
  		}
  		else {
! 			printf("No proxy connection.\n");
  		}
  		pswitch(0);
  	}
--- 640,646 ----
  			    hostname);
  		}
  		else {
! 			puts("No proxy connection.");
  		}
  		pswitch(0);
  	}
***************
*** 657,669 ****
  		printf("Ntrans: (in) %s (out) %s\n", ntin, ntout);
  	}
  	else {
! 		printf("Ntrans: off\n");
  	}
  	if (mapflag) {
  		printf("Nmap: (in) %s (out) %s\n", mapin, mapout);
  	}
  	else {
! 		printf("Nmap: off\n");
  	}
  	printf("Hash mark printing: %s; Mark count: %d; Progress bar: %s\n",
  	    onoff(hash), mark, onoff(progress));
--- 658,670 ----
  		printf("Ntrans: (in) %s (out) %s\n", ntin, ntout);
  	}
  	else {
! 		puts("Ntrans: off");
  	}
  	if (mapflag) {
  		printf("Nmap: (in) %s (out) %s\n", mapin, mapout);
  	}
  	else {
! 		puts("Nmap: off");
  	}
  	printf("Hash mark printing: %s; Mark count: %d; Progress bar: %s\n",
  	    onoff(hash), mark, onoff(progress));
***************
*** 672,678 ****
  	printf("Command line editing: %s\n", onoff(editing));
  #endif /* !SMALLFTP */
  	if (macnum > 0) {
! 		printf("Macros:\n");
  		for (i=0; i<macnum; i++) {
  			printf("\t%s\n", macros[i].mac_name);
  		}
--- 673,679 ----
  	printf("Command line editing: %s\n", onoff(editing));
  #endif /* !SMALLFTP */
  	if (macnum > 0) {
! 		puts("Macros:");
  		for (i=0; i<macnum; i++) {
  			printf("\t%s\n", macros[i].mac_name);
  		}
***************
*** 701,707 ****
  		return -1;
  	}
  	printf("%s %s.\n", mesg, onoff(*var));
! 	return *var;
  }
  
  /*
--- 702,708 ----
  		return -1;
  	}
  	printf("%s %s.\n", mesg, onoff(*var));
! 	return (*var);
  }
  
  /*
***************
*** 777,783 ****
  	printf("Hash mark printing %s", onoff(hash));
  	if (hash)
  		printf(" (%d bytes/hash mark)", mark);
! 	printf(".\n");
  	code = hash;
  }
  
--- 778,784 ----
  	printf("Hash mark printing %s", onoff(hash));
  	if (hash)
  		printf(" (%d bytes/hash mark)", mark);
! 	puts(".");
  	code = hash;
  }
  
***************
*** 921,927 ****
  	r = command("CWD %s", argv[1]);
  	if (r == ERROR && code == 500) {
  		if (verbose)
! 			printf("CWD command not recognized, trying XCWD\n");
  		r = command("XCWD %s", argv[1]);
  	}
  	if (r == COMPLETE)
--- 922,928 ----
  	r = command("CWD %s", argv[1]);
  	if (r == ERROR && code == 500) {
  		if (verbose)
! 			puts("CWD command not recognized, trying XCWD");
  		r = command("XCWD %s", argv[1]);
  	}
  	if (r == COMPLETE)
***************
*** 976,982 ****
  		code = -1;
  		return;
  	}
! 	(void) command("DELE %s", argv[1]);
  }
  
  /*
--- 977,983 ----
  		code = -1;
  		return;
  	}
! 	(void)command("DELE %s", argv[1]);
  }
  
  /*
***************
*** 999,1012 ****
  	mname = argv[0];
  	mflag = 1;
  	oldintr = signal(SIGINT, mabort);
! 	(void) setjmp(jabort);
  	while ((cp = remglob(argv, 0)) != NULL) {
  		if (*cp == '\0') {
  			mflag = 0;
  			continue;
  		}
  		if (mflag && confirm(argv[0], cp)) {
! 			(void) command("DELE %s", cp);
  			if (!mflag && fromatty) {
  				ointer = interactive;
  				interactive = 1;
--- 1000,1013 ----
  	mname = argv[0];
  	mflag = 1;
  	oldintr = signal(SIGINT, mabort);
! 	(void)setjmp(jabort);
  	while ((cp = remglob(argv, 0)) != NULL) {
  		if (*cp == '\0') {
  			mflag = 0;
  			continue;
  		}
  		if (mflag && confirm(argv[0], cp)) {
! 			(void)command("DELE %s", cp);
  			if (!mflag && fromatty) {
  				ointer = interactive;
  				interactive = 1;
***************
*** 1017,1023 ****
  			}
  		}
  	}
! 	(void) signal(SIGINT, oldintr);
  	mflag = 0;
  }
  
--- 1018,1024 ----
  			}
  		}
  	}
! 	(void)signal(SIGINT, oldintr);
  	mflag = 0;
  }
  
***************
*** 1039,1045 ****
  		return;
  	}
  	if (command("RNFR %s", argv[1]) == CONTINUE)
! 		(void) command("RNTO %s", argv[2]);
  }
  
  /*
--- 1040,1046 ----
  		return;
  	}
  	if (command("RNFR %s", argv[1]) == CONTINUE)
! 		(void)command("RNTO %s", argv[2]);
  }
  
  /*
***************
*** 1113,1119 ****
  	mname = argv[0];
  	mflag = 1;
  	oldintr = signal(SIGINT, mabort);
! 	(void) setjmp(jabort);
  	for (i = 1; mflag && i < argc-1; ++i) {
  		*mode = (i == 1) ? 'w' : 'a';
  		recvrequest(cmd, dest, argv[i], mode, 0);
--- 1114,1120 ----
  	mname = argv[0];
  	mflag = 1;
  	oldintr = signal(SIGINT, mabort);
! 	(void)setjmp(jabort);
  	for (i = 1; mflag && i < argc-1; ++i) {
  		*mode = (i == 1) ? 'w' : 'a';
  		recvrequest(cmd, dest, argv[i], mode, 0);
***************
*** 1126,1132 ****
  			interactive = ointer;
  		}
  	}
! 	(void) signal(SIGINT, oldintr);
  	mflag = 0;
  }
  
--- 1127,1133 ----
  			interactive = ointer;
  		}
  	}
! 	(void)signal(SIGINT, oldintr);
  	mflag = 0;
  }
  
***************
*** 1148,1156 ****
  	old2 = signal (SIGQUIT, SIG_IGN);
  	if ((pid = fork()) == 0) {
  		for (pid = 3; pid < 20; pid++)
! 			(void) close(pid);
! 		(void) signal(SIGINT, SIG_DFL);
! 		(void) signal(SIGQUIT, SIG_DFL);
  		shell = getenv("SHELL");
  		if (shell == NULL)
  			shell = _PATH_BSHELL;
--- 1149,1157 ----
  	old2 = signal (SIGQUIT, SIG_IGN);
  	if ((pid = fork()) == 0) {
  		for (pid = 3; pid < 20; pid++)
! 			(void)close(pid);
! 		(void)signal(SIGINT, SIG_DFL);
! 		(void)signal(SIGQUIT, SIG_DFL);
  		shell = getenv("SHELL");
  		if (shell == NULL)
  			shell = _PATH_BSHELL;
***************
*** 1158,1169 ****
  		if (namep == NULL)
  			namep = shell;
  		shellnam[0] = '-';
! 		(void) strncpy(shellnam + 1, ++namep, sizeof(shellnam) - 1);
  		if (strcmp(namep, "sh") != 0)
  			shellnam[0] = '+';
  		if (debug) {
! 			printf ("%s\n", shell);
! 			(void) fflush (stdout);
  		}
  		if (argc > 1) {
  			execl(shell, shellnam, "-c", altarg, (char *)0);
--- 1159,1171 ----
  		if (namep == NULL)
  			namep = shell;
  		shellnam[0] = '-';
! 		(void)strncpy(shellnam + 1, ++namep, sizeof(shellnam) - 2);
! 		shellnam[sizeof(shellnam) - 1] = '\0';
  		if (strcmp(namep, "sh") != 0)
  			shellnam[0] = '+';
  		if (debug) {
! 			puts(shell);
! 			(void)fflush(stdout);
  		}
  		if (argc > 1) {
  			execl(shell, shellnam, "-c", altarg, (char *)0);
***************
*** 1178,1185 ****
  	if (pid > 0)
  		while (wait((int *)&status) != pid)
  			;
! 	(void) signal(SIGINT, old1);
! 	(void) signal(SIGQUIT, old2);
  	if (pid == -1) {
  		warn("%s", "Try again later");
  		code = -1;
--- 1180,1187 ----
  	if (pid > 0)
  		while (wait((int *)&status) != pid)
  			;
! 	(void)signal(SIGINT, old1);
! 	(void)signal(SIGQUIT, old2);
  	if (pid == -1) {
  		warn("%s", "Try again later");
  		code = -1;
***************
*** 1201,1207 ****
  	int n, aflag = 0;
  
  	if (argc < 2)
! 		(void) another(&argc, &argv, "username");
  	if (argc < 2 || argc > 4) {
  		printf("usage: %s username [password] [account]\n", argv[0]);
  		code = -1;
--- 1203,1209 ----
  	int n, aflag = 0;
  
  	if (argc < 2)
! 		(void)another(&argc, &argv, "username");
  	if (argc < 2 || argc > 4) {
  		printf("usage: %s username [password] [account]\n", argv[0]);
  		code = -1;
***************
*** 1215,1222 ****
  	}
  	if (n == CONTINUE) {
  		if (argc < 4) {
! 			printf("Account: "); (void) fflush(stdout);
! 			(void) fgets(acct, sizeof(acct) - 1, stdin);
  			acct[strlen(acct) - 1] = '\0';
  			argv[3] = acct; argc++;
  		}
--- 1217,1225 ----
  	}
  	if (n == CONTINUE) {
  		if (argc < 4) {
! 			(void)fputs("Account: ", stdout);
! 			(void)fflush(stdout);
! 			(void)fgets(acct, sizeof(acct) - 1, stdin);
  			acct[strlen(acct) - 1] = '\0';
  			argv[3] = acct; argc++;
  		}
***************
*** 1224,1234 ****
  		aflag++;
  	}
  	if (n != COMPLETE) {
! 		fprintf(stdout, "Login failed.\n");
  		return;
  	}
  	if (!aflag && argc == 4) {
! 		(void) command("ACCT %s", argv[3]);
  	}
  }
  
--- 1227,1237 ----
  		aflag++;
  	}
  	if (n != COMPLETE) {
! 		puts("Login failed.");
  		return;
  	}
  	if (!aflag && argc == 4) {
! 		(void)command("ACCT %s", argv[3]);
  	}
  }
  
***************
*** 1248,1255 ****
  	 */
  	verbose = 1;
  	if (command("PWD") == ERROR && code == 500) {
! 		printf("PWD command not recognized, trying XPWD\n");
! 		(void) command("XPWD");
  	}
  	verbose = oldverbose;
  }
--- 1251,1258 ----
  	 */
  	verbose = 1;
  	if (command("PWD") == ERROR && code == 500) {
! 		puts("PWD command not recognized, trying XPWD");
! 		(void)command("XPWD");
  	}
  	verbose = oldverbose;
  }
***************
*** 1288,1295 ****
  	}
  	if (command("MKD %s", argv[1]) == ERROR && code == 500) {
  		if (verbose)
! 			printf("MKD command not recognized, trying XMKD\n");
! 		(void) command("XMKD %s", argv[1]);
  	}
  }
  
--- 1291,1298 ----
  	}
  	if (command("MKD %s", argv[1]) == ERROR && code == 500) {
  		if (verbose)
! 			puts("MKD command not recognized, trying XMKD");
! 		(void)command("XMKD %s", argv[1]);
  	}
  }
  
***************
*** 1310,1317 ****
  	}
  	if (command("RMD %s", argv[1]) == ERROR && code == 500) {
  		if (verbose)
! 			printf("RMD command not recognized, trying XRMD\n");
! 		(void) command("XRMD %s", argv[1]);
  	}
  }
  
--- 1313,1320 ----
  	}
  	if (command("RMD %s", argv[1]) == ERROR && code == 500) {
  		if (verbose)
! 			puts("RMD command not recognized, trying XRMD");
! 		(void)command("XRMD %s", argv[1]);
  	}
  }
  
***************
*** 1364,1377 ****
  	int i, len;
  	char buf[BUFSIZ];		/* must be >= sizeof(line) */
  
! 	(void) strncpy(buf, initial, sizeof(buf));
  	if (argc > 1) {
  		len = strlen(buf);
! 		len += strlen(strncpy(&buf[len], argv[1], sizeof(buf) - len));
! 		for (i = 2; i < argc; i++) {
  			buf[len++] = ' ';
  			len += strlen(strncpy(&buf[len], argv[i],
! 			    sizeof(buf) - len));
  		}
  	}
  	if (command(buf) == PRELIM) {
--- 1367,1381 ----
  	int i, len;
  	char buf[BUFSIZ];		/* must be >= sizeof(line) */
  
! 	(void)strncpy(buf, initial, sizeof(buf) - 1);
! 	buf[sizeof(buf) - 1] = '\0';
  	if (argc > 1) {
  		len = strlen(buf);
! 		len += strlen(strncpy(&buf[len], argv[1], sizeof(buf) - len - 1));
! 		for (i = 2; i < argc && len < sizeof(buf); i++) {
  			buf[len++] = ' ';
  			len += strlen(strncpy(&buf[len], argv[i],
! 			    sizeof(buf) - len) - 1);
  		}
  	}
  	if (command(buf) == PRELIM) {
***************
*** 1394,1400 ****
  		code = -1;
  		return;
  	}
! 	(void) command("SITE CHMOD %s %s", argv[1], argv[2]);
  }
  
  void
--- 1398,1404 ----
  		code = -1;
  		return;
  	}
! 	(void)command("SITE CHMOD %s %s", argv[1], argv[2]);
  }
  
  void
***************
*** 1405,1411 ****
  	int oldverbose = verbose;
  
  	verbose = 1;
! 	(void) command(argc == 1 ? "SITE UMASK" : "SITE UMASK %s", argv[1]);
  	verbose = oldverbose;
  }
  
--- 1409,1415 ----
  	int oldverbose = verbose;
  
  	verbose = 1;
! 	(void)command(argc == 1 ? "SITE UMASK" : "SITE UMASK %s", argv[1]);
  	verbose = oldverbose;
  }
  
***************
*** 1417,1423 ****
  	int oldverbose = verbose;
  
  	verbose = 1;
! 	(void) command(argc == 1 ? "SITE IDLE" : "SITE IDLE %s", argv[1]);
  	verbose = oldverbose;
  }
  
--- 1421,1427 ----
  	int oldverbose = verbose;
  
  	verbose = 1;
! 	(void)command(argc == 1 ? "SITE IDLE" : "SITE IDLE %s", argv[1]);
  	verbose = oldverbose;
  }
  
***************
*** 1432,1438 ****
  	int oldverbose = verbose;
  
  	verbose = 1;
! 	(void) command(argc == 1 ? "HELP" : "HELP %s", argv[1]);
  	verbose = oldverbose;
  }
  
--- 1436,1442 ----
  	int oldverbose = verbose;
  
  	verbose = 1;
! 	(void)command(argc == 1 ? "HELP" : "HELP %s", argv[1]);
  	verbose = oldverbose;
  }
  
***************
*** 1466,1474 ****
  
  	if (!connected)
  		return;
! 	(void) command("QUIT");
  	if (cout) {
! 		(void) fclose(cout);
  	}
  	cout = NULL;
  	connected = 0;
--- 1470,1478 ----
  
  	if (!connected)
  		return;
! 	(void)command("QUIT");
  	if (cout) {
! 		(void)fclose(cout);
  	}
  	cout = NULL;
  	connected = 0;
***************
*** 1494,1500 ****
  		ap = argv[1];
  	else
  		ap = getpass("Account:");
! 	(void) command("ACCT %s", ap);
  }
  
  jmp_buf abortprox;
--- 1498,1504 ----
  		ap = argv[1];
  	else
  		ap = getpass("Account:");
! 	(void)command("ACCT %s", ap);
  }
  
  jmp_buf abortprox;
***************
*** 1533,1552 ****
  	}
  	c = getcmd(argv[1]);
  	if (c == (struct cmd *) -1) {
! 		printf("?Ambiguous command\n");
! 		(void) fflush(stdout);
  		code = -1;
  		return;
  	}
  	if (c == 0) {
! 		printf("?Invalid command\n");
! 		(void) fflush(stdout);
  		code = -1;
  		return;
  	}
  	if (!c->c_proxy) {
! 		printf("?Invalid proxy command\n");
! 		(void) fflush(stdout);
  		code = -1;
  		return;
  	}
--- 1537,1556 ----
  	}
  	c = getcmd(argv[1]);
  	if (c == (struct cmd *) -1) {
! 		puts("?Ambiguous command");
! 		(void)fflush(stdout);
  		code = -1;
  		return;
  	}
  	if (c == 0) {
! 		puts("?Invalid command");
! 		(void)fflush(stdout);
  		code = -1;
  		return;
  	}
  	if (!c->c_proxy) {
! 		puts("?Invalid proxy command");
! 		(void)fflush(stdout);
  		code = -1;
  		return;
  	}
***************
*** 1557,1566 ****
  	oldintr = signal(SIGINT, proxabort);
  	pswitch(1);
  	if (c->c_conn && !connected) {
! 		printf("Not connected\n");
! 		(void) fflush(stdout);
  		pswitch(0);
! 		(void) signal(SIGINT, oldintr);
  		code = -1;
  		return;
  	}
--- 1561,1570 ----
  	oldintr = signal(SIGINT, proxabort);
  	pswitch(1);
  	if (c->c_conn && !connected) {
! 		puts("Not connected");
! 		(void)fflush(stdout);
  		pswitch(0);
! 		(void)signal(SIGINT, oldintr);
  		code = -1;
  		return;
  	}
***************
*** 1575,1581 ****
  		proxflag = 0;
  	}
  	pswitch(0);
! 	(void) signal(SIGINT, oldintr);
  }
  
  void
--- 1579,1585 ----
  		proxflag = 0;
  	}
  	pswitch(0);
! 	(void)signal(SIGINT, oldintr);
  }
  
  void
***************
*** 1603,1622 ****
  {
  	if (argc == 1) {
  		ntflag = 0;
! 		printf("Ntrans off.\n");
  		code = ntflag;
  		return;
  	}
  	ntflag++;
  	code = ntflag;
! 	(void) strncpy(ntin, argv[1], 16);
! 	ntin[16] = '\0';
  	if (argc == 2) {
  		ntout[0] = '\0';
  		return;
  	}
! 	(void) strncpy(ntout, argv[2], 16);
! 	ntout[16] = '\0';
  }
  
  char *
--- 1607,1626 ----
  {
  	if (argc == 1) {
  		ntflag = 0;
! 		puts("Ntrans off.");
  		code = ntflag;
  		return;
  	}
  	ntflag++;
  	code = ntflag;
! 	(void)strncpy(ntin, argv[1], sizeof(ntin) - 1);
! 	ntin[sizeof(ntin) - 1] = '\0';
  	if (argc == 2) {
  		ntout[0] = '\0';
  		return;
  	}
! 	(void)strncpy(ntout, argv[2], sizeof(ntout) - 1);
! 	ntout[sizeof(ntout) - 1] = '\0';
  }
  
  char *
***************
*** 1657,1663 ****
  
  	if (argc == 1) {
  		mapflag = 0;
! 		printf("Nmap off.\n");
  		code = mapflag;
  		return;
  	}
--- 1661,1667 ----
  
  	if (argc == 1) {
  		mapflag = 0;
! 		puts("Nmap off.");
  		code = mapflag;
  		return;
  	}
***************
*** 1676,1685 ****
  		cp = strchr(altarg, ' ');
  	}
  	*cp = '\0';
! 	(void) strncpy(mapin, altarg, MAXPATHLEN - 1);
  	while (*++cp == ' ')
  		continue;
! 	(void) strncpy(mapout, cp, MAXPATHLEN - 1);
  }
  
  char *
--- 1680,1689 ----
  		cp = strchr(altarg, ' ');
  	}
  	*cp = '\0';
! 	(void)strncpy(mapin, altarg, MAXPATHLEN - 1);
  	while (*++cp == ' ')
  		continue;
! 	(void)strncpy(mapout, cp, MAXPATHLEN - 1);
  }
  
  char *
***************
*** 1792,1799 ****
  						}
  					}
  					if (!*cp2) {
! 						printf("nmap: unbalanced "
! 							"brackets\n");
  						return (name);
  					}
  					match = 1;
--- 1796,1802 ----
  						}
  					}
  					if (!*cp2) {
! 						puts("nmap: unbalanced brackets");
  						return (name);
  					}
  					match = 1;
***************
*** 1806,1813 ****
  					      }
  					}
  					if (!*cp2) {
! 						printf("nmap: unbalanced "
! 							"brackets\n");
  						return (name);
  					}
  					break;
--- 1809,1815 ----
  					      }
  					}
  					if (!*cp2) {
! 						puts("nmap: unbalanced brackets");
  						return (name);
  					}
  					break;
***************
*** 1892,1898 ****
  	r = command("CDUP");
  	if (r == ERROR && code == 500) {
  		if (verbose)
! 			printf("CDUP command not recognized, trying XCUP\n");
  		r = command("XCUP");
  	}
  	if (r == COMPLETE)
--- 1894,1900 ----
  	r = command("CDUP");
  	if (r == ERROR && code == 500) {
  		if (verbose)
! 			puts("CDUP command not recognized, trying XCUP");
  		r = command("XCUP");
  	}
  	if (r == COMPLETE)
***************
*** 1907,1913 ****
  {
  
  	if (argc != 2)
! 		printf("restart: offset not specified\n");
  	else {
  		restart_point = atol(argv[1]);
  		printf("Restarting at %qd. Execute get, put or append to"
--- 1909,1915 ----
  {
  
  	if (argc != 2)
! 		puts("restart: offset not specified");
  	else {
  		restart_point = atol(argv[1]);
  		printf("Restarting at %qd. Execute get, put or append to"
***************
*** 1922,1928 ****
  	char *argv[];
  {
  
! 	(void) command("SYST");
  }
  
  void
--- 1924,1930 ----
  	char *argv[];
  {
  
! 	(void)command("SYST");
  }
  
  void
***************
*** 1934,1940 ****
  	int c;
  
  	if (macnum == 16) {
! 		printf("Limit of 16 macros have already been defined\n");
  		code = -1;
  		return;
  	}
--- 1936,1942 ----
  	int c;
  
  	if (macnum == 16) {
! 		puts("Limit of 16 macros have already been defined");
  		code = -1;
  		return;
  	}
***************
*** 1944,1963 ****
  		return;
  	}
  	if (interactive) {
! 		printf("Enter macro line by line, terminating it with a "
! 			"null line\n");
  	}
! 	(void) strncpy(macros[macnum].mac_name, argv[1], 8);
! 	if (macnum == 0) {
  		macros[macnum].mac_start = macbuf;
! 	}
! 	else {
  		macros[macnum].mac_start = macros[macnum - 1].mac_end + 1;
- 	}
  	tmp = macros[macnum].mac_start;
  	while (tmp != macbuf+4096) {
  		if ((c = getchar()) == EOF) {
! 			printf("macdef:end of file encountered\n");
  			code = -1;
  			return;
  		}
--- 1946,1964 ----
  		return;
  	}
  	if (interactive) {
! 		puts("Enter macro line by line, terminating it with a null line");
  	}
! 	(void)strncpy(macros[macnum].mac_name, argv[1],
! 	    sizeof(macros[macnum].mac_name) - 1);
! 	macros[macnum].mac_name[sizeof(macros[macnum].mac_name) - 1] = '\0';
! 	if (macnum == 0)
  		macros[macnum].mac_start = macbuf;
! 	else
  		macros[macnum].mac_start = macros[macnum - 1].mac_end + 1;
  	tmp = macros[macnum].mac_start;
  	while (tmp != macbuf+4096) {
  		if ((c = getchar()) == EOF) {
! 			puts("macdef: end of file encountered");
  			code = -1;
  			return;
  		}
***************
*** 1980,1986 ****
  		while ((c = getchar()) != '\n' && c != EOF)
  			/* LOOP */;
  		if (c == EOF || getchar() == '\n') {
! 			printf("Macro not defined - 4k buffer exceeded\n");
  			code = -1;
  			return;
  		}
--- 1981,1987 ----
  		while ((c = getchar()) != '\n' && c != EOF)
  			/* LOOP */;
  		if (c == EOF || getchar() == '\n') {
! 			puts("Macro not defined - 4k buffer exceeded");
  			code = -1;
  			return;
  		}
***************
*** 2038,2044 ****
  	char *argv[];
  {
  
! 	(void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
  }
  
  /*
--- 2039,2045 ----
  	char *argv[];
  {
  
! 	(void)command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
  }
  
  /*