From nobody Wed Sep 6 03:29:52 2023 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 4RgSYD6YxMz4sZgy; Wed, 6 Sep 2023 03:29: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 4RgSYD5lJLz4b5X; Wed, 6 Sep 2023 03:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693970992; 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=2UTB7EbQw9yoioCGee1vwrJpDugXgmTO4CpLf/LRbVk=; b=TBPL8RpLKe65rXIlCNrOF9sWd1bHVgkT5J8y5HqG73c5FLmWBcNvgBCC9o0cnW+uqePABn kP1koxkPmNdO5m72S08Fau+naMbpXgsxpayFQX1ndM0TeaAJ4Y71+tvywROOuiA6iiXwIA nV68K0d5vLC/3IO45G+RdXHfmNIXE9U7mcvyBUu0Ad/nOTvhUSG/6E85cSqaniiKsIHaC2 wccTZi6nC3MNlMIEZhmv8fGVqHC0VOlR5uM5G78vHSwcuxsQ8ii/+/5ff5z9c7EsVhyTq6 fCw+rpWzcy824H8ycQPyqQLFj6vYs4sENDrQhYcT8gVF6aXHdZAmBHnAF/eY4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693970992; a=rsa-sha256; cv=none; b=syh5FEaPCGOmMMWQYpLQReo4U3kOT7tJugyCSGiwz9nag144hui7V1iZECr0/IeZWxnujk YYLEygUWdyMrbgkUTIQrp/9Al+345KfHUCFzqgKNjoWqE/NHNxnztAkIOeSgbS51z6Llxl 1ZYJnFcplbotQMBxSQwvEt2xmFWjqHzBGDFQagUVtlcAEUh2vnI/afbYKiMiv1x9mCRUnF srhtbTC8YkBdxDotxVCVXfT94ppTo9tMxfDMfnMhyITqr7jAu8GAUc7unApozGMq75xGe9 7Z8D/nI7aSIC7k6INJpO4zMWvo/hMVCBfDd5N/ucET/Ezo45IfcmE9P+g1Dm/Q== 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=1693970992; 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=2UTB7EbQw9yoioCGee1vwrJpDugXgmTO4CpLf/LRbVk=; b=KgLQKcwIrLn+05rUf0KKgoaL9GTttZ0vwabOOVTWmE6NxvIWMmyo0y/GMRy6kb1/bdyUsx +UmECMb0m1JvLcS74pOLKikqgjH0aBBi5P4MMAqZ7v8++RA9YSEr8fnlC1b3RhTx2Cyl8x iEquulCUTkBnT5MFvJKcxO6RQOZhU7m0E4wroPQbiJF0QkJxPIX5hG1hDbbQyzWcOeM1gY CcIw0+QvUC9xVfrdH5s98F4fqgnmIMQGnFMX85XoLYwS56F/Z0VLDYNsx0xMs5yu+7eRca 0ZzPW7AkziOnpOlThG7OZUj9LYRC1RIlNW1Bbq6ROBgPPlb/5W5lrbTCY3FlwA== 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 4RgSYD4h2sz10cn; Wed, 6 Sep 2023 03:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3863Tqt5073329; Wed, 6 Sep 2023 03:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3863TqvD073326; Wed, 6 Sep 2023 03:29:52 GMT (envelope-from git) Date: Wed, 6 Sep 2023 03:29:52 GMT Message-Id: <202309060329.3863TqvD073326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 851bf856d1a7 - main - split: Code cleanup. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 851bf856d1a7ad5427ea9c22639ab6f6c4a3f503 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=851bf856d1a7ad5427ea9c22639ab6f6c4a3f503 commit 851bf856d1a7ad5427ea9c22639ab6f6c4a3f503 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 03:28:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-06 03:29:31 +0000 split: Code cleanup. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41756 --- usr.bin/split/split.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index b5a457ab6ecd..6894e9e63195 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -41,7 +41,6 @@ static const char sccsid[] = "@(#)split.c 8.2 (Berkeley) 4/16/94"; #endif #include -#include #include #include @@ -85,9 +84,9 @@ static void usage(void) __dead2; int main(int argc, char **argv) { - int ch; - int error; - char *ep, *p; + const char *p; + char *ep; + int ch, error; setlocale(LC_ALL, ""); @@ -157,17 +156,22 @@ main(int argc, char **argv) argv += optind; argc -= optind; - if (*argv != NULL) { /* Input file. */ + if (argc > 0) { /* Input file. */ if (strcmp(*argv, "-") == 0) ifd = STDIN_FILENO; else if ((ifd = open(*argv, O_RDONLY, 0)) < 0) err(EX_NOINPUT, "%s", *argv); ++argv; + --argc; } - if (*argv != NULL) /* File name prefix. */ - if (strlcpy(fname, *argv++, sizeof(fname)) >= sizeof(fname)) - errx(EX_USAGE, "file name prefix is too long"); - if (*argv != NULL) + if (argc > 0) { /* File name prefix. */ + if (strlcpy(fname, *argv, sizeof(fname)) >= sizeof(fname)) + errx(EX_USAGE, "file name prefix is too long: %s", + *argv); + ++argv; + --argc; + } + if (argc > 0) usage(); if (strlen(fname) + (unsigned long)sufflen >= sizeof(fname)) @@ -400,7 +404,6 @@ newfile(void) sufflen++; /* Reset so we start back at all 'a's in our extended suffix. */ - tfnum = 0; fnum = 0; }