From owner-dev-commits-src-all@freebsd.org Sun Aug 22 23:05:40 2021
Return-Path: <owner-dev-commits-src-all@freebsd.org>
Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 45CA665F747;
Sun, 22 Aug 2021 23:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Gt9vm1WmZz4j68;
Sun, 22 Aug 2021 23:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1DA5B12DA;
Sun, 22 Aug 2021 23:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17MN5evP044309;
Sun, 22 Aug 2021 23:05:40 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17MN5eGU044308;
Sun, 22 Aug 2021 23:05:40 GMT (envelope-from git)
Date: Sun, 22 Aug 2021 23:05:40 GMT
Message-Id: <202108222305.17MN5eGU044308@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alan Somers <asomers@FreeBSD.org>
Subject: git: 457516c6ab75 - stable/12 - ftpd: delete dead code
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: asomers
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 457516c6ab758abf47d22fcf520d82bf1be96a26
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the src repository
<dev-commits-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Aug 2021 23:05:40 -0000
The branch stable/12 has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=457516c6ab758abf47d22fcf520d82bf1be96a26
commit 457516c6ab758abf47d22fcf520d82bf1be96a26
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2021-07-27 18:14:00 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
CommitDate: 2021-08-22 23:05:32 +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@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, ...)
{