aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Somers <asomers@FreeBSD.org>2021-07-27 18:14:00 +0000
committerAlan Somers <asomers@FreeBSD.org>2021-07-27 18:18:08 +0000
commit674400eb20b65369a88b1cb778d729bc297832c9 (patch)
tree5cb21afdf27d7377cf7146449656f260a6856253
parentd6717f877872e62d9df1e0ce2d8856620c993924 (diff)
downloadsrc-674400eb20b65369a88b1cb778d729bc297832c9.tar.gz
src-674400eb20b65369a88b1cb778d729bc297832c9.zip
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@gmail.com> MFC after: 2 weeks Sponsored by: Axcient
-rw-r--r--libexec/ftpd/extern.h3
-rw-r--r--libexec/ftpd/ftpd.c49
2 files changed, 0 insertions, 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, ...)
{