From nobody Fri May 22 17:58:06 2026 X-Original-To: dev-commits-src-all@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 4gMY0Z6pMCz6fLpn for ; Fri, 22 May 2026 17:58:06 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gMY0Z4jwbz4N1b for ; Fri, 22 May 2026 17:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779472686; 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=1wxPkWA1t/JflsU3O2JSlrLDDzA+xyrmZTScXHPdE0w=; b=S99cLc2MlS/9GWZazgDe1AJ83WYmKi/D4r+6C6WzwPx74RshrduM3KlGcTixvIS82N8FGi o5y2cKTmuRH2Q9rlRhC9Gs23blXrf1DFcBKfuihLmK9rANZUIeyDFmoZevQ7UAy3gus4nT J0Tn+F+V63W+VhdC67YztsqqGnuEudGA2G3jgyI9T54gLX8VbovJiSk1ZiWD6E5SqYnItM UEmZt7vr0n5wX8DmkANyRkoetfXhzea5WnFqm5T/jecALcwtP5pAkJHkqg8llrcruo5IPM sT/NwqwvcpvBU+pH+VGQqbtsc7I8FEMc3VQxYuy4GdQgG/aIjmyHHL0nArHvew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779472686; a=rsa-sha256; cv=none; b=QOugfBLr/2J6G1va+ln3ZaJr50/VnB3kB4+KMlXI2Mvz4QrT3h9jMHNR2KV60qLXyodcE3 k2DaCpAXFfwul1/uI9q3efY8VhuxlJ766GZFQOYSP9FWadaxLJvI12tbcIY9zG24eXaqTH gcu9jXqqeTVyW5S9Q1sKsHvQZbrrcNTMpNcl/MT9UtUtVYBK/w0y0tyTCBxWICMuG7wjES x7ze0hRNjEP84Jq0/uBrI0Ou7z48pZOCT1r0Fz565MiKxrJXXsCaSfz0nhLJLDdBBu53cJ zV6qrOjGRSnfHW050Dyit6iSq02BtBBN4vybZE+DDjzBM5av8b0tTHUkKcraYQ== 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=1779472686; 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=1wxPkWA1t/JflsU3O2JSlrLDDzA+xyrmZTScXHPdE0w=; b=GJwMZtFO+CF6tQeIgemcCDUWFDWnB1Uzb4DR/eniuYPYSi7CqAQ6PVC2mZ7PUe+5fO6jKM FqM2uppBtRgIjRBSNNe0C//adh+qWaoctGThR3VLPWJRHQROLS8mBpdc/0A5XsaI9FqSr6 KZODyNzX147kfQJl5GGkceE/f+jxT+/6kt1nQAbkAc8ELjVuux+H23aepkXmeVHIBLslW9 0SEYA1+Ew2l5mlP4Hr/HaC6C2WiORak12PTXS5zioouSwTajuHH3mCLmv+JEMt+T2y3gzU 7Nb8rukPdZHzonuR66M/FPLLzYWF/gsNqxRI9NcsE79oK6YwNzN37tAYV9jrIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gMY0Z3p0YzX27 for ; Fri, 22 May 2026 17:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a302 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 22 May 2026 17:58:06 +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: 29351335704e - main - tftp: Close files when we're done with them List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 29351335704e39ce3ca09c528d534c7898bbdc2c Auto-Submitted: auto-generated Date: Fri, 22 May 2026 17:58:06 +0000 Message-Id: <6a10992e.3a302.1469c66d@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=29351335704e39ce3ca09c528d534c7898bbdc2c commit 29351335704e39ce3ca09c528d534c7898bbdc2c Author: Dag-Erling Smørgrav AuthorDate: 2026-05-22 17:57:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-22 17:57:12 +0000 tftp: Close files when we're done with them Also, delete the file we created if receiving it failed. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D57071 --- usr.bin/tftp/main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index 9b7ea7155d82..a26561eaa982 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -584,8 +584,11 @@ get(int argc, char *argv[]) if (verbose) printf("getting from %s:%s to %s [%s]\n", hostname, src, cp, mode); - if (recvfile(peer, port, fd, src, mode) != 0) + if (recvfile(peer, port, fd, src, mode) != 0) { + (void) unlink(cp); txrx_error = 1; + } + close(fd); break; } cp = tail(src); /* new .. jdg */ @@ -597,8 +600,11 @@ get(int argc, char *argv[]) if (verbose) printf("getting from %s:%s to %s [%s]\n", hostname, src, cp, mode); - if (recvfile(peer, port, fd, src, mode) != 0) + if (recvfile(peer, port, fd, src, mode) != 0) { + (void) unlink(cp); txrx_error = 1; + } + close(fd); } }