git: 2e6862b12b20 - stable/13 - ftpd: delete dead code

[Alan Somers]

The branch stable/13 has been updated by asomers:

URL: https://cgit.FreeBSD.org/src/commit/?id=2e6862b12b20ca62b53faf3899e39744c89a9a43

commit 2e6862b12b20ca62b53faf3899e39744c89a9a43
Author:     Alan Somers <asomers at FreeBSD.org>
AuthorDate: 2021-07-27 18:14:00 +0000
Commit:     Alan Somers <asomers at FreeBSD.org>
CommitDate: 2021-08-22 21:25:29 +0000

    ftpd: delete dead code
    
    Delete code killed by SVN r13139 in 1996.  Little chance that it would
    still compile today.
    
    PR:             257317
    Reported by:    Alan Shearer <sakison at gmail.com>
    Sponsored by:   Axcient
    
    (cherry picked from commit 674400eb20b65369a88b1cb778d729bc297832c9)
---
 libexec/ftpd/extern.h |  3 ---
 libexec/ftpd/ftpd.c   | 49 -------------------------------------------------
 2 files changed, 52 deletions(-)

diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 80d24b46d2e4..aa48ea67e320 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -59,9 +59,6 @@ char   *renamefrom(char *);
 void	reply(int, const char *, ...) __printflike(2, 3);
 void	retrieve(char *, char *);
 void	send_file_list(char *);
-#ifdef OLD_SETPROCTITLE
-void	setproctitle(const char *, ...);
-#endif
 void	statcmd(void);
 void	statfilecmd(char *);
 void	store(char *, char *, int);
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 25ae3fba956b..e23c06aaf143 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -205,10 +205,6 @@ int	swaitmax = SWAITMAX;
 int	swaitint = SWAITINT;
 
 #ifdef SETPROCTITLE
-#ifdef OLD_SETPROCTITLE
-char	**Argv = NULL;		/* pointer to argument vector */
-char	*LastArgv = NULL;	/* end of argv */
-#endif /* OLD_SETPROCTITLE */
 char	proctitle[LINE_MAX];	/* initial part of title */
 #endif /* SETPROCTITLE */
 
@@ -280,16 +276,6 @@ main(int argc, char *argv[], char **envp)
 	sigemptyset(&sa.sa_mask);
 	sa.sa_flags = SA_RESTART;
 
-#ifdef OLD_SETPROCTITLE
-	/*
-	 *  Save start and extent of argv for setproctitle.
-	 */
-	Argv = argv;
-	while (*envp)
-		envp++;
-	LastArgv = envp[-1] + strlen(envp[-1]);
-#endif /* OLD_SETPROCTITLE */
-
 	/*
 	 * Prevent diagnostic messages from appearing on stderr.
 	 * We run as a daemon or from inetd; in both cases, there's
@@ -3329,41 +3315,6 @@ reapchild(int signo)
 	while (waitpid(-1, NULL, WNOHANG) > 0);
 }
 
-#ifdef OLD_SETPROCTITLE
-/*
- * Clobber argv so ps will show what we're doing.  (Stolen from sendmail.)
- * Warning, since this is usually started from inetd.conf, it often doesn't
- * have much of an environment or arglist to overwrite.
- */
-void
-setproctitle(const char *fmt, ...)
-{
-	int i;
-	va_list ap;
-	char *p, *bp, ch;
-	char buf[LINE_MAX];
-
-	va_start(ap, fmt);
-	(void)vsnprintf(buf, sizeof(buf), fmt, ap);
-
-	/* make ps print our process name */
-	p = Argv[0];
-	*p++ = '-';
-
-	i = strlen(buf);
-	if (i > LastArgv - p - 2) {
-		i = LastArgv - p - 2;
-		buf[i] = '\0';
-	}
-	bp = buf;
-	while (ch = *bp++)
-		if (ch != '\n' && ch != '\r')
-			*p++ = ch;
-	while (p < LastArgv)
-		*p++ = ' ';
-}
-#endif /* OLD_SETPROCTITLE */
-
 static void
 appendf(char **strp, char *fmt, ...)
 {