[PATCH 12/16] scp: Remove unused functions

[Michael Witten]

Date: Sat, 7 Nov 2015 03:30:02 -0000
These functions were part of the machinery for parsing `[user@]host' arguments,
which `scp' no longer handles.
---
 scp.c     | 45 ---------------------------------------------
 scpmisc.c | 10 ----------
 scpmisc.h |  1 -
 3 files changed, 56 deletions(-)

diff --git a/scp.c b/scp.c
index fc992b6..9bf22e1 100644
--- a/scp.c
+++ b/scp.c
@@ -273,7 +273,6 @@ typedef struct {
 BUF *allocbuf(BUF *, int, int);
 void lostconn(int);
 void nospace(void);
-static int okname(const char *);
 void run_err(const char *,...);
 void verifydir(char *);
 
@@ -290,7 +289,6 @@ void source(int, char *[]);
 void tolocal(int, char *[]);
 void toremote(char *, int, char *[]);
 void usage(void);
-static const char *get_user_name();
 
 #if defined(DBMULTI_scp) || !defined(DROPBEAR_MULTI)
 #if defined(DBMULTI_scp) && defined(DROPBEAR_MULTI)
@@ -1101,19 +1099,6 @@ usage(void)
 	exit(1);
 }
 
-static const char*
-get_user_name()
-{
-	static const char *user_name = NULL;
-
-	if (user_name == NULL) {
-		struct passwd *pwd = getpwuid(getuid());
-		user_name = pwd ? xstrdup(pwd->pw_name) : "unknown";
-	}
-
-	return user_name;
-}
-
 void
 run_err(const char *fmt,...)
 {
@@ -1153,36 +1138,6 @@ verifydir(char *cp)
 	killchild(0);
 }
 
-static int
-okname(const char *cp0)
-{
-	int c;
-	const char *cp;
-
-	cp = cp0;
-	do {
-		c = (int)*cp;
-		if (c & 0200)
-			goto bad;
-		if (!isalpha(c) && !isdigit(c)) {
-			switch (c) {
-			case '\'':
-			case '"':
-			case '`':
-			case ' ':
-			case '#':
-				goto bad;
-			default:
-				break;
-			}
-		}
-	} while (*++cp);
-	return (1);
-
-bad:	fprintf(stderr, "%s: invalid user name\n", cp0);
-	return (0);
-}
-
 BUF *
 allocbuf(BUF *bp, int fd, int blksize)
 {
diff --git a/scpmisc.c b/scpmisc.c
index ea5b735..88a00ca 100644
--- a/scpmisc.c
+++ b/scpmisc.c
@@ -104,16 +104,6 @@ xstrdup(const char *str)
 }
 
-char *
-cleanhostname(char *host)
-{
-	if (*host == '[' && host[strlen(host) - 1] == ']') {
-		host[strlen(host) - 1] = '\0';
-		return (host + 1);
-	} else
-		return host;
-}
-
 char *
 colon(char *cp)
 {
 	int flag = 0;
diff --git a/scpmisc.h b/scpmisc.h
index 7d0b326..6978c66 100644
--- a/scpmisc.h
+++ b/scpmisc.h
@@ -21,7 +21,6 @@ void	 set_nonblock(int);
 void	 unset_nonblock(int);
 void	 set_nodelay(int);
 int	 a2port(const char *);
-char	*cleanhostname(char *);
 char	*colon(char *);
 long	 convtime(const char *);
 
-- 
2.4.3