From nobody Mon Jul 13 06:45:47 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gzCcr4Wmnz6kSVH for ; Mon, 13 Jul 2026 06:45:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gzCcr1bfVz3kfK for ; Mon, 13 Jul 2026 06:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783925148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7drIShQ7DvVyJmt2UdypEqrPw+8eCY8GTiGmx7e+ItQ=; b=Znibe6yup3gLmhcIg9zKHoGQx8mRnVIOPqEMaYQvrShVScvubnmh7LTqyf8gAXpSq9a0Zw Rdt06Fgon71dZLAI9ylfDmu0M7Zj+H95p36El4yrZIQsM8RfFpDue4JHh1gom1XXh8Wv2t a/AA9GCB+u5SCw7mSZuxWxzCxZM++MlsC1sl5GrcRb8PFtSKseQ2dj4W+1E2vm7RoWqiM9 E8nbujvWmeCmhJaUfthCvRkBo2gPcPHjCnziX/B5n6ov4njEY38QgyqP4GdH7S1us0fxlu Ayydm2IkSCfvwp1+UFc61HB0m9Dmk9p2SrZYLhPwtipMjDltnflu7tNsoXBJJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783925148; a=rsa-sha256; cv=none; b=E5X4vHkBIOX8vv3uOpgomKjo6Cx1LiJQhuLFttPp83pVbDpaMlIrcs60fL1aqkqAZgmPGt kNrIYdX5lVpaS036OHk+okjCxhWalSWoVSPUm4c4GolQG/CREyqzZscOHKqg9cStN8aHRt TnN1BDRWu2wkJqXBVWLAkphGmnRbTjaNeQX11nO74xiuOCtRoqz8n7dbVtmE3qFrAStVPn cDv41Sg20h3Qxmi3b420iKx97U1xAhzJBZPyBW50MWSfFBHkNWvFBFCa5gMTMgi1/YeueC CtG0W4iq6JrKsidEqiAZTK06iFCq07eEkMQcnAttrq8VkJLRryknkBystgVEZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783925148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7drIShQ7DvVyJmt2UdypEqrPw+8eCY8GTiGmx7e+ItQ=; b=vO1KXutfu54PKMUAmA5Y3i/uRtcaJLVARS5qjsd2F4pr+416xLL7ojwGs7mQtMLAduAEbx E1yqtWUfpGghwLj4qBJrtYA34AW5c5/lgaoFl18NwkmlzpmQBpLICP5ac+Hb8Xf0kH8q5j SyTr36u3QC5wuBabowmCv+5ci4uBqHffG67W3UOCQQV7tpJvtFksgO5SMF4n3qI2t/o51R C3nFhyJn1J5uGn5mFILZCaRIF/vKbvdgJfo8szXByaya+bcsPvRsl7NSfGgdP5xSuk/f10 WHVSvTj6oiGMf0+TOdRxJxKsvxXT33Y7IcqVUajtjGmhk+3yqezyjdWBYanDAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzCcq74LsznvN for ; Mon, 13 Jul 2026 06:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20689 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 06:45:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3dddfe29248c - main - fetch: Stop setting an alarm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dddfe29248c47d1a80dc96a76a308ae910b2a24 Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 06:45:47 +0000 Message-Id: <6a54899b.20689.76b93df4@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3dddfe29248c47d1a80dc96a76a308ae910b2a24 commit 3dddfe29248c47d1a80dc96a76a308ae910b2a24 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-13 06:43:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-13 06:43:46 +0000 fetch: Stop setting an alarm Now that fetchTimeout works reliably, setting an alarm is not only no longer necessary but counterproductive, as it will trigger even if the connection is not actually stalled but merely slow. While here, improve the wording of the manual page's description of the various options for setting a timeout. MFC after: 1 week Reviewed by: op Differential Revision: https://reviews.freebsd.org/D57911 --- usr.bin/fetch/fetch.1 | 10 ++++++---- usr.bin/fetch/fetch.c | 33 +++++++++------------------------ 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1 index 7238226998fc..17b96d8d459b 100644 --- a/usr.bin/fetch/fetch.1 +++ b/usr.bin/fetch/fetch.1 @@ -28,7 +28,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 7, 2023 +.Dd June 27, 2026 .Dt FETCH 1 .Os .Sh NAME @@ -283,7 +283,7 @@ ignored and the file is fetched unconditionally. .It Fl s , -print-size Print the size in bytes of each requested file, without fetching it. .It Fl T Ar seconds , Fl -timeout= Ns Ar seconds -Set timeout value to +Set the network timeout to .Ar seconds . Overrides the environment variables .Ev FTP_TIMEOUT @@ -322,9 +322,11 @@ message. .Sh ENVIRONMENT .Bl -tag -width HTTP_TIMEOUT .It Ev FTP_TIMEOUT -Maximum time, in seconds, to wait before aborting an FTP connection. +Maximum time, in seconds, to wait before giving up on a stalled FTP +transfer. .It Ev HTTP_TIMEOUT -Maximum time, in seconds, to wait before aborting an HTTP connection. +Maximum time, in seconds, to wait before giving up on a stalled HTTP +transfer. .El .Pp See diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c index 5e4b14289ca7..4e2a7596e796 100644 --- a/usr.bin/fetch/fetch.c +++ b/usr.bin/fetch/fetch.c @@ -87,7 +87,6 @@ static pid_t pgrp; /* our process group */ static long w_secs; /* -w: retry delay */ static int family = PF_UNSPEC; /* -[46]: address family to use */ -static int sigalrm; /* SIGALRM received */ static int siginfo; /* SIGINFO received */ static int sigint; /* SIGINT received */ @@ -173,9 +172,6 @@ static void sig_handler(int sig) { switch (sig) { - case SIGALRM: - sigalrm = 1; - break; case SIGINFO: siginfo = 1; break; @@ -436,6 +432,7 @@ fetch(char *URL, const char *path, int *is_http) char *tmppath; int r, tries; unsigned timeout; + int timedout = 0; char *ptr; f = of = NULL; @@ -519,13 +516,7 @@ fetch(char *URL, const char *path, int *is_http) /* just print size */ if (s_flag) { - if (timeout) - alarm(timeout); r = fetchStat(url, &us, flags); - if (timeout) - alarm(0); - if (sigalrm || sigint) - goto signal; if (r == -1) { warnx("%s", fetchLastErrString); goto failure; @@ -574,13 +565,7 @@ again: size_prev = sb.st_size; /* start the transfer */ - if (timeout) - alarm(timeout); f = fetchXGet(url, &us, flags); - if (timeout) - alarm(0); - if (sigalrm || sigint) - goto signal; if (f == NULL) { if (i_flag && *is_http && fetchLastErrCode == FETCH_OK && strcmp(fetchLastErrString, "Not Modified") == 0) { @@ -748,7 +733,7 @@ again: /* start the counter */ stat_start(&xs, path, us.size, count); - sigalrm = siginfo = sigint = 0; + siginfo = sigint = 0; /* suck in the data */ setvbuf(f, NULL, _IOFBF, B_size); @@ -785,8 +770,7 @@ again: if (readcnt != 0) break; } - if (!sigalrm) - sigalrm = ferror(f) && errno == ETIMEDOUT; + timedout = ferror(f) && errno == ETIMEDOUT; signal(SIGINFO, SIG_DFL); stat_end(&xs); @@ -811,18 +795,20 @@ again: } /* timed out or interrupted? */ - if (sigalrm) + if (timedout) { warnx("transfer timed out"); + goto failure; + } if (sigint) { warnx("transfer interrupted"); goto failure; } - /* timeout / interrupt before connection completley established? */ + /* timeout / interrupt before connection completely established? */ if (f == NULL) goto failure; - if (!sigalrm) { + if (!timedout) { /* check the status of our files */ if (ferror(f)) warn("%s", URL); @@ -850,7 +836,7 @@ again: * If the transfer timed out and we didn't know how much to * expect, assume the worst (i.e. we didn't get all of it) */ - if (sigalrm && us.size == -1) { + if (timedout && us.size == -1) { warnx("%s may be truncated", path); goto failure_keep; } @@ -1126,7 +1112,6 @@ main(int argc, char *argv[]) sa.sa_flags = 0; sa.sa_handler = sig_handler; sigemptyset(&sa.sa_mask); - sigaction(SIGALRM, &sa, NULL); sa.sa_flags = SA_RESETHAND; sigaction(SIGINT, &sa, NULL); fetchRestartCalls = 0;