From nobody Thu Dec 14 16:07:29 2023 X-Original-To: dev-commits-src-main@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 4Srcgk10p4z52gVW; Thu, 14 Dec 2023 16:07:30 +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 4Srcgk0NlWz3S6T; Thu, 14 Dec 2023 16:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702570050; 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=ayAvdkKsNaytsx0IT9PN6Qs3Njwe9+Bt1fQ3gUWr+/M=; b=WC7Gfs2C92sG+DGvaS2ufJ1dJGP0jgxmmR4kR6RnZKAJ/4Tib7vrOtkWKghBuZSBt/T4LL +Yl3HoIugNhL46H6yxSrnsu3QBQx4jaz+yDisT/cNNWkM8pu4j1CfSOB1rv7vQhzBUBqR5 CCLxrF5S3sxu3qaXnVMYNtRcRXkw8hGt3MXMiFryEeookZnNjCwIdwwzEMXsahcEE0oIu5 r0BsOsDFEQf3hpOeQ2qJa2ich1M6adExegb1gqH4YjutgDiaW+mP/Ek6j3suks8KIPFpFu TW/7xyP+jaNaYtzXAP9pYYDGwkplr7opvddtRjG3/MW0Xw3MLGZoGzcxZsmSYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702570050; a=rsa-sha256; cv=none; b=IthVqX2A6RE0O1/2YWwBf5WhaDqKCy1KVjFD6M3oisO9QFU/DtAfnB+tyzQWt+ZOc9g7f3 IIYKe6VsouFPpNY6BRc/myJFg2MkZGB5do1gHaKlMqdS9DU6RFGv+XXxuARpBouQ6il+J9 K5D5yMAyCWFqc2caGtzz69dPZVJNJpYVRk/upkayRQ81AbVlZfRgFbUq/0sRLDsP3jUpmC kiuFAYZEe9E1eswN2OZkja19zw0PC6gnmQlrUy5Q6qdQG7Zg8Ar6UOW+gXdglBhkX+4qW7 0iwq7WUsY77YxRpdC1AFJTTrv4QrVOPUgi8bg2vFRJEosHcd2x2aZ/bSGptHVw== 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=1702570050; 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=ayAvdkKsNaytsx0IT9PN6Qs3Njwe9+Bt1fQ3gUWr+/M=; b=LBSzinH7nEyEU2+pLNiCXWasav7YnhJc65SzpMA5ukHaCnMMpc/f8pp6ZtJJK1u3DkiXXl Uaqbfho0+USBSRwXUzcwNTXhx80DhV+Om2sWVAnVId9dPJrJZCt6oHvkwfN2yXouCi3xwU l54RYwhFoe2E1D3K14Ph3xE8EH47TuyrATcxCzTLrAyLSMDK4MGuZW/7UfXyFaf89Yl5R0 HxN01DInFYaAFLdHJ6604QsVU33YQ3DjaIcPZaMCEUa0Na5Wew5CAeOFPaMCvfGbyw5kAX pFskCJI6DdTTozE0i68FCd6oKbf6ckGrUcz1IWfa1TYpXdKU0oWlZwG6rWKJAg== 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 4Srcgj6bG3zZ9S; Thu, 14 Dec 2023 16:07:29 +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 3BEG7TBx015457; Thu, 14 Dec 2023 16:07:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEG7TsA015454; Thu, 14 Dec 2023 16:07:29 GMT (envelope-from git) Date: Thu, 14 Dec 2023 16:07:29 GMT Message-Id: <202312141607.3BEG7TsA015454@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: 0f4467ce444b - main - cp: Move the flags around a bit. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0f4467ce444b201468d2268958130f495951ca3c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0f4467ce444b201468d2268958130f495951ca3c commit 0f4467ce444b201468d2268958130f495951ca3c Author: Dag-Erling Smørgrav AuthorDate: 2023-12-14 16:07:00 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-12-14 16:07:00 +0000 cp: Move the flags around a bit. - The HLPR flags are grouped together at the beginning because they are the standard flags for programs using FTS. Move the N flag out from among them to its correct place in the sequence. - The Pflag variable isn't used outside main(), but moving it out lets us skip initialization and keeps it with its friends H, L and R. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D43063 --- bin/cp/cp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 78ded7af3d5a..1455979bdb6e 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -73,7 +73,7 @@ static char emptystring[] = ""; PATH_T to = { to.p_path, emptystring, "" }; int Nflag, fflag, iflag, lflag, nflag, pflag, sflag, vflag; -static int Hflag, Lflag, Rflag, rflag; +static int Hflag, Lflag, Pflag, Rflag, rflag; volatile sig_atomic_t info; enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE }; @@ -86,12 +86,11 @@ main(int argc, char *argv[]) { struct stat to_stat, tmp_stat; enum op type; - int Pflag, ch, fts_options, r, have_trailing_slash; + int ch, fts_options, r, have_trailing_slash; char *target; fts_options = FTS_NOCHDIR | FTS_PHYSICAL; - Pflag = 0; - while ((ch = getopt(argc, argv, "HLNPRafilnprsvx")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilNnprsvx")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -101,9 +100,6 @@ main(int argc, char *argv[]) Lflag = 1; Hflag = Pflag = 0; break; - case 'N': - Nflag = 1; - break; case 'P': Pflag = 1; Hflag = Lflag = 0; @@ -128,6 +124,9 @@ main(int argc, char *argv[]) case 'l': lflag = 1; break; + case 'N': + Nflag = 1; + break; case 'n': nflag = 1; fflag = iflag = 0;