From nobody Wed May 27 09:03:42 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 4gQNvf6528z6fhQF for ; Wed, 27 May 2026 09:03:42 +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 4gQNvf4Yk2z3XFN for ; Wed, 27 May 2026 09:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779872622; 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=RRDA8bfxSHiXTWtrQl/DWWu1tnCStmW9JwzUjV7Z2Qs=; b=BpaU4d1lo9c9AytiXoindAmYOF98CeQxatyBegekzv99/ymSXD2rF7rAd1KapUZeBNgmu+ +3YXLdaMMhQ2vdG70MvaVoUaxe1fX4rvKTowVyMB9cwgZXe7vSaRR1Mvypd0+0DSsUlU7o 2Fiho1nPtX57ZAWkCsmGhKUpibZLMId2nx0B6WOGU74uiRL/VmahLq9jPVgklTVkaujunR lU5LRPUXs8t8hgbg0VA9i/bCQX90DGjZqVRgifzCJ7gLtkuYFwd02399ghnM4YPOp7cQgi vDLvWkf0vOecS2CKlorVs1qnYDsCE9rxJULEU8gRTEEeNLdvl6ihGThtuSgHzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779872622; a=rsa-sha256; cv=none; b=g80d7XSxFBQ5VxT5jc7gnQ0xuLj8IFrMoaZHqxYR9dRGj4JPW/EKsYlF3FT/KST+ueGxv1 Vd0WwdKIWdtXajGAZCjLeCjl+rGHkqKWs1o1sDZy8UIuFn7v7JksM1zPJwxwVmKr6hUip5 GE+4n+LtTyAEBpx2X4qHWTOtQ7y4MBYDstEvrN8c92U1zAMIReVr07fYjyv7w34fZzbDIu cenDqQiAuw2ztd/9IFBUUN/lQPBZ75ze9zly+fOi77Eur+SUFjBByi8BCHjYT3zgz4dktu 806KZ+YgG27ST5wuCy6+cHzlmrLMdKdVs6E2rCeLUy9x5GXLDjlHr2ToSemacA== 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=1779872622; 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=RRDA8bfxSHiXTWtrQl/DWWu1tnCStmW9JwzUjV7Z2Qs=; b=xbo82T/dlHaKpu9923KbeOpwSG5x/epsWhIDDn+HnVLFoSGRH89kTbF/Muvs2ll8T1h85w 3LAL8hdCgbmsNd3IPlRIR9pSpIyd3n1l1SuVFnU7NzUloQdeW2OS8+NbsD2J9z9/yw0b/q kyU1KFVs5PG0iPyE1k7LDHbfS+9cNTKawD0lg0MooA3U1610952Kyd2t52OkbShowBPEXE Tq/8jcgWF8oKdcxkGGiOcnXJYE2K8gRM2fgmsydUrOkdOveTT1lm1QsFEFQS2ej1/EOcIf P7U3HGngpuNXmZ1j5ezywtwuN1fJM1zgkyu1HbAtY9AjNKhpZChYDraqW3s6WQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQNvf40WTzt14 for ; Wed, 27 May 2026 09:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25574 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 09:03:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: ddd16aef6b03 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: ddd16aef6b03f83a42f8b547563e0deb2d6cc1a4 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 09:03:42 +0000 Message-Id: <6a16b36e.25574.33420411@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ddd16aef6b03f83a42f8b547563e0deb2d6cc1a4 commit ddd16aef6b03f83a42f8b547563e0deb2d6cc1a4 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-22 17:57:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-27 09:03:29 +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 (cherry picked from commit 29351335704e39ce3ca09c528d534c7898bbdc2c) --- 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 32eee2fb9afd..3db01f53dd78 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -597,8 +597,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 */ @@ -610,8 +613,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); } }