From nobody Wed May 27 09:03:28 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 4gQNvP027Dz6fhSF for ; Wed, 27 May 2026 09:03:29 +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 4gQNvN4p6Xz3WpK for ; Wed, 27 May 2026 09:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779872608; 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=WpztRVec2zZ+L8Ua8uqmbl9dO5FC6HAfUbgkPohgcm8=; b=ii05LHK8No7HoeHxrMgDB8SAu4zlIc3RNw2LylwSKZGu2TuCGWow2zHHbfxOwd+vQWvIy5 LZg7ySaUecbtSCnKGLClvAPSE5E81YAaOgDLSuP+SHZN1Wklg8myC2MCmc2vkzpW6Zbu2I jg/zgSAjQt22YhFG9qWBhm9DjbtPi6zMXEQAh9hFaeS0QwHFySwIvXDJRGITWXX5SnU/Hq 2b2fCIXuySiSP5CA/kbIOvGF/cE48LJhK++rZLHUoJMamHcyICXTUnOzNUdMNlyN5nd/vy 66CEMc3CKXUhTfqYn+oQAfgIOpa12vS3rkpELtj5GWqsW+OfJLKvPhMbaUu7fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779872608; a=rsa-sha256; cv=none; b=Ahpr1jFfxYWIA42Z5OIPX8iRzhN++X/HcCY/xSPWBbu3KruwMbJyYVYA6w9APjJ5xRCvTK 3p61W7Pk72GUmFeUUEzVezZadUWEbd+1fLa++KVBjf2G1ZzBCUetyTPknmkvnRBO5egROO 1R1/hM4sX+kmoa90ZC476hvSznH9QayHL/nKSlbHg4kK2HXc3NiKuJQB5LyZtuHdFDVXiF TX8G3WPFvp05TzRzIVtWF7Er2b+waFSeuCo7WdJYi64ynbmNcJT1URb5o26PBfFPzriNby XL49km0ldcHrsCZwUkYLEkzqkArqKYsij/mJdzqs+qGmRKLpgVKJ/SbakUtl3w== 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=1779872608; 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=WpztRVec2zZ+L8Ua8uqmbl9dO5FC6HAfUbgkPohgcm8=; b=TUmx7EKJoriEZHXkaGI51eEEf71syaz1NPg9d1b6mFsbQ3z7Oxx1OyCge9m9dhDRqM+tLi vY01gxlEAYEZeiufl5i1A4WYBu0pkj930yxzgHjLMOTRr0An++miC+NHU86xxIrAgw/xXA AFV+fe3ELyGIHYhGfIq/e1Ypu9kCMleqWnffFE7qp+rZeS/FfPvMl7op7WucVCpaG2soB4 v+odv4UC+GbrVx4/nQJc4wymtmFIStjK/5s5TX1QcaFg6fu+FvpIbt9lxV43DBpcT3sUzq pzJcBzt4fqEOOCSW5FVYw8Q3TRvQF/u+HQrFGQhiF/zkQACpqjVotQCx4rncjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQNvN4PZpzs3J for ; Wed, 27 May 2026 09:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25b4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 09:03:28 +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: 66a6b7e7e92f - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 66a6b7e7e92f6526a1fd98277bc45ec48f24d4fe Auto-Submitted: auto-generated Date: Wed, 27 May 2026 09:03:28 +0000 Message-Id: <6a16b360.25b4b.6e99f38b@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=66a6b7e7e92f6526a1fd98277bc45ec48f24d4fe commit 66a6b7e7e92f6526a1fd98277bc45ec48f24d4fe Author: Dag-Erling Smørgrav AuthorDate: 2026-05-22 17:57:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-27 09:03:20 +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 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); } }