 @@ -1,14 +1,14 @@
-/*	$NetBSD: cmds.c,v 1.8 2008/04/29 05:46:09 martin Exp $	*/
+/*	$NetBSD: cmds.c,v 1.9 2009/09/22 20:39:18 tnn Exp $	*/
 /*	from	NetBSD: cmds.c,v 1.123 2007/05/24 05:05:18 lukem Exp	*/
 /*-
  * Copyright (c) 1996-2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
 @@ -169,27 +169,27 @@ confirm(const char *cmd, const char *fil
 	if (!interactive || confirmrest)
 		return (1);
 	if (file == NULL) {
 		promptleft = "Continue with";
 		promptright = cmd;
 	} else {
 		promptleft = cmd;
 		promptright = file;
+	}
 	while (1) {
 		fprintf(ttyout, "%s %s [anpqy?]? ", promptleft, promptright);
 		(void)fflush(ttyout);
-		if (getline(stdin, line, sizeof(line), &errormsg) < 0) {
+		if (get_line(stdin, line, sizeof(line), &errormsg) < 0) {
 			mflag = 0;
 			fprintf(ttyout, "%s; %s aborted\n", errormsg, cmd);
 			return (0);
+		}
 		switch (tolower((unsigned char)*line)) {
 			case 'a':
 				confirmrest = 1;
 				fprintf(ttyout,
 				    "Prompting off for duration of %s.\n", cmd);
 				break;
 			case 'p':
 				interactive = 0;
 				fputs("Interactive mode: off.\n", ttyout);
 @@ -764,27 +764,27 @@ fget(int argc, char *argv[])
 		return;
+	}
 	fp = fopen(argv[1], "r");
 	if (fp == NULL) {
 		fprintf(ttyout, "Can't open source file %s\n", argv[1]);
 		code = -1;
 		return;
+	}
 	argv[0] = "get";
 	mode = restart_point ? "r+" : "w";
-	while (getline(fp, buf, sizeof(buf), NULL) >= 0) {
+	while (get_line(fp, buf, sizeof(buf), NULL) >= 0) {
 		if (buf[0] == '\0')
 			continue;
 		argv[1] = buf;
 		(void)getit(argc, argv, 0, mode);
+	}
 	fclose(fp);
+}
 const char *
 onoff(int truth)
+{
 	return (truth ? "on" : "off");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.8 2008/04/29 05:46:09 martin Exp $	*/
+/*	$NetBSD: main.c,v 1.9 2009/09/22 20:39:18 tnn Exp $	*/
 /*	from	NetBSD: main.c,v 1.105 2007/05/22 05:16:48 lukem Exp	*/
 /*-
  * Copyright (c) 1996-2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -658,27 +658,27 @@ cmdscanner(void)
 	size_t		 num;
 	for (;;) {
 #ifndef NO_EDITCOMPLETE
 		if (!editing) {
 #endif /* !NO_EDITCOMPLETE */
 			if (fromatty) {
 				fputs(prompt(), ttyout);
 				p = rprompt();
 				if (*p)
 					fprintf(ttyout, "%s ", p);
+			}
 			(void)fflush(ttyout);
-			num = getline(stdin, line, sizeof(line), NULL);
+			num = get_line(stdin, line, sizeof(line), NULL);
 			switch (num) {
 			case -1:	/* EOF */
 			case -2:	/* error */
 				if (fromatty)
 					putc('\n', ttyout);
 				quit(0, NULL);
 				/* NOTREACHED */
 			case -3:	/* too long; try again */
 				fputs("Sorry, input line is too long.\n",
 				    ttyout);
 				continue;
 			case 0:		/* empty; try again */
 				continue;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: util.c,v 1.8 2008/04/29 05:46:09 martin Exp $	*/
+/*	$NetBSD: util.c,v 1.9 2009/09/22 20:39:18 tnn Exp $	*/
 /*	from	NetBSD: util.c,v 1.143 2007/05/24 05:05:19 lukem Exp	*/
 /*-
  * Copyright (c) 1997-2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
 @@ -405,27 +405,27 @@ ftp_login(const char *host, const char *
+	}
 	if (ruserpass(host, &user, &pass, &acct) < 0) {
 		code = -1;
 		goto cleanup_ftp_login;
+	}
 	while (user == NULL) {
 		if (localname)
 			fprintf(ttyout, "Name (%s:%s): ", host, localname);
 		else
 			fprintf(ttyout, "Name (%s): ", host);
 		errormsg = NULL;
-		nlen = getline(stdin, tmp, sizeof(tmp), &errormsg);
+		nlen = get_line(stdin, tmp, sizeof(tmp), &errormsg);
 		if (nlen < 0) {
 			fprintf(ttyout, "%s; %s aborted.\n", errormsg, "login");
 			code = -1;
 			goto cleanup_ftp_login;
 		} else if (nlen == 0) {
 			user = ftp_strdup(localname);
 		} else {
 			user = ftp_strdup(tmp);
+		}
+	}
 	if (gatemode) {
 		char *nuser;
 @@ -513,27 +513,27 @@ another(int *pargc, char ***pargv, const
+{
 	const char	*errormsg;
 	int		ret, nlen;
 	size_t		len;
 	len = strlen(line);
 	if (len >= sizeof(line) - 3) {
 		fputs("Sorry, arguments too long.\n", ttyout);
 		intr(0);
+	}
 	fprintf(ttyout, "(%s) ", prompt);
 	line[len++] = ' ';
 	errormsg = NULL;
-	nlen = getline(stdin, line + len, sizeof(line)-len, &errormsg);
+	nlen = get_line(stdin, line + len, sizeof(line)-len, &errormsg);
 	if (nlen < 0) {
 		fprintf(ttyout, "%s; %s aborted.\n", errormsg, "operation");
 		intr(0);
+	}
 	len += nlen;
 	makeargv();
 	ret = margc > *pargc;
 	*pargc = margc;
 	*pargv = margv;
 	return (ret);
+}
 /*
 @@ -1278,27 +1278,27 @@ isipv6addr(const char *addr)
  * If the line has a trailing newline it will be removed.
  * If the line is too long, excess characters will be read until
  * newline/EOF/error.
  * If EOF/error occurs or a too-long line is encountered and errormsg
  * isn't NULL, it will be changed to a description of the problem.
  * (The EOF message has a leading \n for cosmetic purposes).
  * Returns:
  *	>=0	length of line (excluding trailing newline) if all ok
  *	-1	error occurred
  *	-2	EOF encountered
  *	-3	line was too long
  */
 int
-getline(FILE *stream, char *buf, size_t buflen, const char **errormsg)
+get_line(FILE *stream, char *buf, size_t buflen, const char **errormsg)
+{
 	int	rv, ch;
 	size_t	len;
 	if (fgets(buf, buflen, stream) == NULL) {
 		if (feof(stream)) {	/* EOF */
 			rv = -2;
 			if (errormsg)
 				*errormsg = "\nEOF received";
 		} else  {		/* error */
 			rv = -1;
 			if (errormsg)
 				*errormsg = "Error encountered";

 @@ -1,14 +1,14 @@
-/*	$NetBSD: extern.h,v 1.6 2008/04/29 05:46:09 martin Exp $	*/
+/*	$NetBSD: extern.h,v 1.7 2009/09/22 20:39:18 tnn Exp $	*/
 /*	from	NetBSD: extern.h,v 1.72 2007/05/24 05:05:18 lukem Exp	*/
 /*-
  * Copyright (c) 1996-2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -125,27 +125,27 @@ void	do_chmod(int, char **);
 void	do_umask(int, char **);
 void	domacro(int, char **);
 void	doproxy(int, char **);
 void	feat(int, char **);
 void	fget(int, char **);
 int	fileindir(const char *, const char *);
 int	foregroundproc(void);
 void	formatbuf(char *, size_t, const char *);
 void	ftpvis(char *, size_t, const char *, size_t);
 int	ftp_login(const char *, const char *, const char *);
 void	get(int, char **);
 struct cmd *getcmd(const char *);
 int	getit(int, char **, int, const char *);
-int	getline(FILE *, char *, size_t, const char **);
+int	get_line(FILE *, char *, size_t, const char **);
 struct option *getoption(const char *);
 char   *getoptionvalue(const char *);
 void	getremoteinfo(void);
 int	getreply(int);
 char   *globulize(const char *);
 char   *gunique(const char *);
 void	help(int, char **);
 char   *hookup(char *, char *);
 void	idlecmd(int, char **);
 int	initconn(void);
 void	intr(int);
 int	isipv6addr(const char *);
 void	list_vertical(StringList *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fetch.c,v 1.7 2008/04/29 05:46:09 martin Exp $	*/
+/*	$NetBSD: fetch.c,v 1.8 2009/09/22 20:39:18 tnn Exp $	*/
 /*	from	NetBSD: fetch.c,v 1.180 2007/06/05 00:31:20 lukem Exp	*/
 /*-
  * Copyright (c) 1997-2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Scott Aaron Bamford.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -182,27 +182,27 @@ auth_url(const char *challenge, char **r
 		(void)strlcpy(realm, cp, len + 1);
 	} else {
 		warnx("Unsupported authentication challenge `%s'",
 		    challenge);
 		goto cleanup_auth_url;
+	}
 	fprintf(ttyout, "Username for `%s': ", realm);
 	if (guser != NULL) {
 		(void)strlcpy(user, guser, sizeof(user));
 		fprintf(ttyout, "%s\n", user);
 	} else {
 		(void)fflush(ttyout);
-		if (getline(stdin, user, sizeof(user), &errormsg) < 0) {
+		if (get_line(stdin, user, sizeof(user), &errormsg) < 0) {
 			warnx("%s; can't authenticate", errormsg);
 			goto cleanup_auth_url;
+		}
+	}
 	if (gpass != NULL)
 		pass = (char *)gpass;
 	else {
 		pass = getpass("Password: ");
 		if (pass == NULL) {
 			warnx("Can't read password");
 			goto cleanup_auth_url;
+		}
+	}
 @@ -822,51 +822,51 @@ fetch_url(const char *url, const char *p
 				hasleading++;
+			}
 			fprintf(fin, "Proxy-Authorization: %s\r\n", proxyauth);
+		}
 		if (verbose && hasleading)
 			fputs(")\n", ttyout);
 		fprintf(fin, "\r\n");
 		if (fflush(fin) == EOF) {
 			warn("Writing HTTP request");
 			goto cleanup_fetch_url;
+		}
 				/* Read the response */
-		len = getline(fin, buf, sizeof(buf), &errormsg);
+		len = get_line(fin, buf, sizeof(buf), &errormsg);
 		if (len < 0) {
 			if (*errormsg == '\n')
 				errormsg++;
 			warnx("Receiving HTTP reply: %s", errormsg);
 			goto cleanup_fetch_url;
+		}
 		while (len > 0 && (ISLWS(buf[len-1])))
 			buf[--len] = '\0';
 		DPRINTF("received `%s'\n", buf);
 				/* Determine HTTP response code */
 		cp = strchr(buf, ' ');
 		if (cp == NULL)
 			goto improper;
 		else
 			cp++;
 		hcode = strtol(cp, &ep, 10);
 		if (*ep != '\0' && !isspace((unsigned char)*ep))
 			goto improper;
 		message = ftp_strdup(cp);
 				/* Read the rest of the header. */
 		while (1) {
-			len = getline(fin, buf, sizeof(buf), &errormsg);
+			len = get_line(fin, buf, sizeof(buf), &errormsg);
 			if (len < 0) {
 				if (*errormsg == '\n')
 					errormsg++;
 				warnx("Receiving HTTP reply: %s", errormsg);
 				goto cleanup_fetch_url;
+			}
 			while (len > 0 && (ISLWS(buf[len-1])))
 				buf[--len] = '\0';
 			if (len == 0)
 				break;
 			DPRINTF("received `%s'\n", buf);
 		/*
 @@ -1050,27 +1050,27 @@ fetch_url(const char *url, const char *p
 			if (verbose || *authp == NULL ||
 			    auser == NULL || apass == NULL)
 				fprintf(ttyout, "%s\n", message);
 			if (EMPTYSTRING(auth)) {
 				warnx(
 			    "No authentication challenge provided by server");
 				goto cleanup_fetch_url;
+			}
 			if (*authp != NULL) {
 				char reply[10];
 				fprintf(ttyout,
 				    "Authorization failed. Retry (y/n)? ");
-				if (getline(stdin, reply, sizeof(reply), NULL)
+				if (get_line(stdin, reply, sizeof(reply), NULL)
 				    < 0) {
 					goto cleanup_fetch_url;
+				}
 				if (tolower((unsigned char)reply[0]) != 'y')
 					goto cleanup_fetch_url;
 				auser = NULL;
 				apass = NULL;
+			}
 			if (auth_url(auth, authp, auser, apass) == 0) {
 				rval = fetch_url(url, proxyenv,
 				    proxyauth, wwwauth);
 				memset(*authp, 0, strlen(*authp));
 				FREEPTR(*authp);