From nobody Wed Oct 19 08:01:35 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 4MsjqN1PcWz4gDTR; Wed, 19 Oct 2022 08:01:36 +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 4MsjqN0kPNz40CN; Wed, 19 Oct 2022 08:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166496; 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=k2dK6WcVOMWy49ikyW0w1l0RvdfX9AonhP6VWza9mFw=; b=UV8PRBk9CNG9kDaX369quBj8eUggnWGg6GBVPlsQyAKIB9LG9Mveuj9m36ys9k2XwBjh6N WB8R/H8eoVPq4fRebmi438nC0Z1Q6vTZdVnd9vAUdly5iPKOUmpyXj2cfThIhcMJXc0Kkk p0Ahf4vfBa0C8wzYWT3qc0Pmnwqt6cIn/Clma7XOUsNmFvVC5Daw9CwSywCR8zeRfbixY9 ZPegjR/jz1x3LfxNKhlkzQWKxS9KrPW4wP6R9ebnKvgatRvJ8/jLNWA+BsIznh03qjuu3b +EHlYKkEX2b6oZv1urT63dAAaBYucbAiEc0GRkmJh058JF1+jVcIXsBePz/xVA== 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 4MsjqM6sDSzSTQ; Wed, 19 Oct 2022 08:01:35 +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 29J81Zcf061394; Wed, 19 Oct 2022 08:01:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J81Zh3061393; Wed, 19 Oct 2022 08:01:35 GMT (envelope-from git) Date: Wed, 19 Oct 2022 08:01:35 GMT Message-Id: <202210190801.29J81Zh3061393@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: 67ca992f5ce6 - stable/13 - sort: use asprintf(3) instead of malloc + snprintf(3) 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: 67ca992f5ce64ffaeaabf969379579a0b774c5de Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166496; 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=k2dK6WcVOMWy49ikyW0w1l0RvdfX9AonhP6VWza9mFw=; b=KfxmRz1UW362xkcjcmzeQbRUZkb697lZwAUHez1P+8k3EjwJu5obF/Woj+opEQFgQxHRr0 8XWqIAfTm6c74bHQworL5ge5SpnBnVvpv2wjdmAodEw53ks7Kkm+s5m7wx9dd8lvhuHV/a 8ZmmY2AIy/ZSYASRxqnTcAquNNwlbCyYRx5/8osyYmlGP9FT7eojOX74t1FeklrBD57OzA 3etP6sx5VHtIi1KF8SqW+HsiqOgcRyYVBoVq+EJvIZDIHPEvJU1IilMkvF7vEaSz6HqOkl 1V3MsRCVi1Kq+zekqJ0BU5H775eV91IbnhTVZpoDYhhi8cEKffjDKAMLXpnHEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666166496; a=rsa-sha256; cv=none; b=bHZTQByjoWaJkMfTIzXPwDJgvIz/fZLa5cipwYG4VBWXdtPLKQbh6yrfIHhV28dK2Mxo3f UtjpbMo/8znpoJypBTlJqM5H5+vo5WYF107T15vNZTtMkJ1OJuE+kZ18ZNm7Dx4OlXBcuz dFCtS/BjllmAt9az1g92w5ar1Q+ascMfPCut/EBXxUjDPG7cZ37i2dJqeEtQ7Z6JFuIo1Y rVzXv6ud42fQv9SI2TFHFig65CzNse24/UOb36Ob7EGvZ8cOAsU9ZgBCznCQ4bemy1shnw 7uNALeUc0AppGbv/9PJ7fl5sOyVqL7FaJY/o9VvG7WLekgi4KFR039vjXfZz2w== 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=67ca992f5ce64ffaeaabf969379579a0b774c5de commit 67ca992f5ce64ffaeaabf969379579a0b774c5de Author: Baptiste Daroussin AuthorDate: 2022-10-13 08:34:57 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-19 07:59:30 +0000 sort: use asprintf(3) instead of malloc + snprintf(3) (cherry picked from commit 48a53cc4849555f1a0b805adddb9f517a305a2ae) --- usr.bin/sort/file.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index c390b4c2a71f..05058a2509b5 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -538,28 +538,26 @@ openfile(const char *fn, const char *mode) S_IRGRP | S_IROTH); if (is_tmp && (compress_program != NULL)) { + int r; char *cmd; - size_t cmdsz; - - cmdsz = strlen(fn) + 128; - cmd = sort_malloc(cmdsz); fflush(stdout); if (mode[0] == 'r') - snprintf(cmd, cmdsz - 1, "cat %s | %s -d", + r = asprintf(&cmd, "cat %s | %s -d", fn, compress_program); else if (mode[0] == 'w') - snprintf(cmd, cmdsz - 1, "%s > %s", + r = asprintf(&cmd, "%s > %s", compress_program, fn); else err(2, "%s", getstr(7)); + if (r == -1) + err(2, "aspritnf()"); + if ((file = popen(cmd, mode)) == NULL) err(2, NULL); - - sort_free(cmd); - + free(cmd); } else if ((file = fopen(fn, mode)) == NULL) err(2, NULL);