From nobody Wed Oct 19 08:01:27 2022 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 4MsjqD1Xynz4gDcX; Wed, 19 Oct 2022 08:01:28 +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 4MsjqD11F0z3xd3; Wed, 19 Oct 2022 08:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166488; 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=ajSdtHyTNC9v8d10fq63iCCF5Eo4a6uMy2Bhega948g=; b=OCA7vh17/MKw2WRzTfRgAG1pQLycItGUAgz+dLNKqK6GZcaJR8rNGr9Q8vkR6ADGgPvg70 +xLC5KUdO//LO71hy5gkwBskAlS/bksx1xye2iES1QDeHiT4a8kclQVfo2DNFpHWjIOWbj w3KXXZZDbQPwupd4bnPK9aoMG6LluNZ9lzSRnZroZf8bDfvWLH5Dc1d5ipXtNzMegEthAW yOUMax1Vd4lLSomdJYOl2SxEf7aYD7o436ZVM+XjDZozKkC7cTFUQL9l9YKjmFoanE4L7q VaHsCj/heTeDDMuNbN4TI7A9iKxMxJ8CjNWY3tkYEipHdoOXrds2odb4hj0uIA== 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 4MsjqC73m5zSHp; Wed, 19 Oct 2022 08:01:27 +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 29J81Req060665; Wed, 19 Oct 2022 08:01:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J81Riq060664; Wed, 19 Oct 2022 08:01:27 GMT (envelope-from git) Date: Wed, 19 Oct 2022 08:01:27 GMT Message-Id: <202210190801.29J81Riq060664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 1286974328af - stable/13 - sort: use mkstemp(3) instead of reinventing it 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1286974328afdef7f3419ec830e12804a3a28e80 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166488; 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=ajSdtHyTNC9v8d10fq63iCCF5Eo4a6uMy2Bhega948g=; b=BYtWYl3UCJtUP7v3lOI214W0TsIJoLFdOwcHCaUAs+wqWOktl9/iaM4aTc6GMFoh4Ef32g k+lJPUpVMhQTo7ihtnmXKVJhu23MjLfC4RweNw4YdnXAx5XCQOMmQmiHCCoWOgCstTejPm uW+LICSbAGl17nyqxfkMPAa/iLT3olDjybg+w9FvzeO4enEzKucLK4WBBwRnipb0/tuPFl kPHvWNeS5Gpd8IVHtG1N7wRVQW6q5FbbswHSEEPh6u0a8oZKqKAIb2h3KLi43vGn81haHe B7rZY9nG68RabEDDnIQstEgA4qvd6tj0QzSPgms1vIU2ACAi1BzhAy0uKWGBAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666166488; a=rsa-sha256; cv=none; b=q9wrsd1OTywIcpF79omNDbSo7sc0SvpDCokvyJZoHmcgKBvOn/L03Lj9v8GkHsVp4BJSRH I9kHZSY4E5mJq48iBT15/IzRTDjIsrZsCwyfAjzYvdBHsw48P7jBD5gJRrKWyD2WwF0Yzy gmBAnF8DFRGqJnNr4gTBmRHaV8zgXy4bmphJ251b2vNBtTH3QnYekw6eL1IqM3hh+tQhXF kUhjeAKn8Y99Q2pcgzVP/piJ5sSFizghGHdMIulvLb5DhkannHR1EtK/V9ATvRcZ9xgA+w T0jVfSj50M662UA3Y0L8Cq6QuQMYwbGhPRpKCZWcrZbMKYFbnLn6CcnlcyPjgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1286974328afdef7f3419ec830e12804a3a28e80 commit 1286974328afdef7f3419ec830e12804a3a28e80 Author: Baptiste Daroussin AuthorDate: 2022-10-12 15:57:37 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-19 07:59:28 +0000 sort: use mkstemp(3) instead of reinventing it MFC After: 1 week (cherry picked from commit 3f9e5e59bda05acea409fa3121c835a74672de1c) --- usr.bin/sort/file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index ffcd71e9f991..3e5754442ac1 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -195,15 +195,15 @@ file_is_tmp(const char* fn) char * new_tmp_file_name(void) { - static size_t tfcounter = 0; - static const char *fn = ".bsdsort."; char *ret; - size_t sz; + int fd; - sz = strlen(tmpdir) + 1 + strlen(fn) + 32 + 1; - ret = sort_malloc(sz); + if (asprintf(&ret, "%s/.bsdsort.XXXXXXXXXX", tmpdir) == -1) + err(2, "asprintf()"); + if ((fd = mkstemp(ret)) == -1) + err(2, "mkstemp()"); + close(fd); - sprintf(ret, "%s/%s%d.%lu", tmpdir, fn, (int) getpid(), (unsigned long)(tfcounter++)); tmp_file_atexit(ret); return (ret); }