From nobody Fri Jan 28 09:07:52 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 BE253198BF65; Fri, 28 Jan 2022 09:07:52 +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 4JlWnh4n27z4hvJ; Fri, 28 Jan 2022 09:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643360872; 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=BklU0jZa3DyiW6UcMqSNoW8jvVD+bZKmZ/vfQRJ7xVY=; b=JicCHMuNJKLvfQLEb+9X9RMdwjSClrB4LS0owanBfb/YNCIfpAKdY0IU1fD6iQ3hX7ypV8 oDXhkbsoDFteh0gCGQbOCYsdOajZX3d1wBR+/0KGJFUaZxKDpVqlspkh7KgGzHuiciArKC BO8USbJUQUz0EVyL+4PH2PZb4mfGwO6Y6glkRzCdci696/52z6m8ElyKXQDxXrX6/60EzF SuJGzviXDnG6syldlXDbQT04z4CNtMtVUxmK/IdG8XXCfPuD9j33IdYYtKGySgF2YPCFh3 OSs94HVzUX2ROwTaPIhfFIleZ03b7SbsIR2N4cvrCt8Ja1+33V4C2Cm9Moko8w== 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 79EEA2778B; Fri, 28 Jan 2022 09:07:52 +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 20S97qho039489; Fri, 28 Jan 2022 09:07:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20S97qAJ039488; Fri, 28 Jan 2022 09:07:52 GMT (envelope-from git) Date: Fri, 28 Jan 2022 09:07:52 GMT Message-Id: <202201280907.20S97qAJ039488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: dd8ca6b27f69 - main - distextract: simply code by using strsep(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/main X-Git-Reftype: branch X-Git-Commit: dd8ca6b27f69f841ab2e0f1424fe766034469205 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643360872; 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=BklU0jZa3DyiW6UcMqSNoW8jvVD+bZKmZ/vfQRJ7xVY=; b=PBvW9EtRTc2rjHhMkB04MGal3yxlY1wBcvlXDZsQ05foPS/sRe/l1ibFxyw3eQtgCmQx+S qV/E+eiwQUf8Vg1AOuNYkYFAY35VIKJhVdwvl9Aoe6YVQDWheaYDnOwKl9PpkthfBEwf5p aEQlDrw1FlgVTdKTR7vRPBi8lLyCIWPeXETa1FGDgfc6pDLtDcu1rHmqqbmWeafjOTiTs6 bqDCUNbSWuYM6gKkQc9SwYksuyIpGhKnqCRRMa7Dasr79fe/+aScgcJ6/zHzweyYr05zkv 4WQJpSYhqfOsv7MnKsKCIN56fbl1yO07VYFez7aYcwkV1ajUuAdRrBBqKUWw9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643360872; a=rsa-sha256; cv=none; b=EP+nKF7yoyjC8rSC5e2cHO3if/JNDt2ppbGDQeF1x0zaJKxv3rK7g9d1ZcbHlSeed9Fo0w HxX9UnV8EL6NgQPllG5GgIH4fpJdAMTCJtjrgUrdDNmI9SiaRdeqy0Eq+TvOW36oBCSRNB 80sHkK8i/ZFk360Aj6b3hAVJTRkLj7kk0wFHFf153aLZFHYyCa38m+JRDjZdVWRV573S02 Dw7MrY7DSMZmU15a8s2P7QXLX1Jn8VlYOcCGIR173jsZl79bsH7/99qpvXxYAJ3j0bB4IZ V2ZWWV6XdFrBIdBt8kDvVRGDtjT1lC49Zfu9AhsQHHoAFdNxS9Jg5M1Gfw6IIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=dd8ca6b27f69f841ab2e0f1424fe766034469205 commit dd8ca6b27f69f841ab2e0f1424fe766034469205 Author: Baptiste Daroussin AuthorDate: 2022-01-28 09:06:55 +0000 Commit: Baptiste Daroussin CommitDate: 2022-01-28 09:06:55 +0000 distextract: simply code by using strsep(3) --- usr.sbin/bsdinstall/distextract/distextract.c | 28 ++++++++------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/usr.sbin/bsdinstall/distextract/distextract.c b/usr.sbin/bsdinstall/distextract/distextract.c index fa3b52925dff..81931e7cf50d 100644 --- a/usr.sbin/bsdinstall/distextract/distextract.c +++ b/usr.sbin/bsdinstall/distextract/distextract.c @@ -61,11 +61,9 @@ main(void) { char *chrootdir; char *distributions; - char *path; + char *distribs, *distrib; int retval; - unsigned int i; size_t minibar_size = sizeof(struct bsddialog_fileminibar); - size_t span; unsigned int nminibars; struct bsddialog_fileminibar *dists; struct bsddialog_progviewconf pvconf; @@ -77,6 +75,8 @@ main(void) errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set"); if ((distdir = getenv("BSDINSTALL_DISTDIR")) == NULL) distdir = __DECONST(char *, ""); + if ((distribs = strdup(distributions)) == NULL) + errx(EXIT_FAILURE, "memory error"); if (bsddialog_init() == BSDDIALOG_ERROR) errx(EXIT_FAILURE, "Error libbsdialog: %s", @@ -89,12 +89,9 @@ main(void) /* Parse $DISTRIBUTIONS */ nminibars = 0; dists = NULL; - while (*distributions != '\0') { - span = strcspn(distributions, "\t\n\v\f\r "); - if (span < 1) { /* currently on whitespace */ - distributions++; + while ((distrib = strsep(&distribs, "\t\n\v\f\r ")) != NULL) { + if (strlen(distrib) == 0) continue; - } /* Allocate a new struct for the distribution */ dists = realloc(dists, (nminibars + 1) * minibar_size); @@ -102,11 +99,7 @@ main(void) _errx(EXIT_FAILURE, "Out of memory!"); /* Set file path */ - if ((path = malloc(span + 1)) == NULL) - _errx(EXIT_FAILURE, "Out of memory!"); - snprintf(path, span + 1, "%s", distributions); - path[span] = '\0'; - dists[nminibars].path = path; + dists[nminibars].path = distrib; /* Set mini bar label */ dists[nminibars].label = strrchr(dists[nminibars].path, '/'); @@ -126,7 +119,6 @@ main(void) /* Set initial read */ dists[nminibars].read = 0; - distributions += span; nminibars += 1; } @@ -164,12 +156,8 @@ main(void) bsddialog_end(); - for (i = 0; i < nminibars; i++) { - if (dists[i].path != NULL) - free(__DECONST(char *, dists[i].path)); - } - if (dists != NULL) - free(dists); + free(distribs); + free(dists); return (retval); }