From nobody Sat May 10 08:57:12 2025 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 4ZvfrT1DBzz5w62M; Sat, 10 May 2025 08:57:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvfrT0ThRz3bGh; Sat, 10 May 2025 08:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746867433; 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=idAzz+C9S7ukN3ej/idndLAsFL9UE7wn9GhLJSHAvGs=; b=w0nMlatMtx+bjrcLggt7He0mwCFKgj5l+EGS3UVFuFG875VVUsyBTRiKpQhD6wdcFRYvvd xb291pNP0sbWSyVhhFh33wyGezL1FViS8nQ8J5ZFjtuAAL7jh6H35yJxglLKQYV2fppvG1 WXgb3TlAdWkkQt/EFpAADexkqyYdDKybJ3vBIrvT5M2CLqbO/lC6hwEVXGK6Oe2bad+UFG 9xVnC3t2tP7nwfe+baL37wLwH/wpHdX7RtICy1xPGq/O9jQQmDWUfd48EW0M+q/69IIBaA xy1r0d5/WV2iyRZBithCKamVfwM7Z8LGa51zFH77npKqPN4Ji8pO5/x/W25coA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746867433; 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=idAzz+C9S7ukN3ej/idndLAsFL9UE7wn9GhLJSHAvGs=; b=jnf98My6aAuhNaRWATQnLe3Cg95oUyo3MlGGqfl4Z+FGbK5O9/SQENL/BYampPxer3UZPd 7TsHKC6i7cdYZU4YubdJ8G+H94Aj92HRepgYmBV6h+ULurR8Ugp/EXQ8CMw/5l6g02Tu+O fOIA9U2CZyxgB7gkYyLqhrIUQ9gm7J6jCT5wgO3SvOLCtcZr8HntiZHhmQcJbP7Q1dLaMS G3p6ZlYd4/ft2KL6wYFI4R4DQD0p2mYb9Ed6q0I7yPiPIyTOgHXlGY7hpRwUzDWi/qVlrM vwa7k3XAhfrN29l990txF+NBNMsJCvcwfSNly4bmSueAunngculEG5m2lWEOsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746867433; a=rsa-sha256; cv=none; b=a/Yi+bU062nGUKB0vnCCjxQXRo1e/i/+Jqh02ne8Yw1LYpVnZDr8QaY+qbxcbeyuDHYDsz ExIwGjUb/DL+7c5mALzlIPXTdySTgCUygCOI+QeoOIdXk/4iET5SypfuovZ49yL2RIw9R9 lDWdp/4cOuFxyfNgV/KCDkAC6/VjEf4syqrtvGqpm1oQ3+J++eNpbt04sKBIsdIwEdvqA/ wQz+PiGfnRfLxHDbsyV1r5gOspUZubQvcq7cfO+hBXZj9pmwIzs6XSNNJoCZzTnYDXeMo7 UGTalYfftCPBJ5ghLC7gIVTKj8nm6HU3qHWfTBx1lrEWzM1v7hTEcKYbCLP3Yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZvfrT02tJzg6d; Sat, 10 May 2025 08:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54A8vCde059694; Sat, 10 May 2025 08:57:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54A8vCEi059691; Sat, 10 May 2025 08:57:12 GMT (envelope-from git) Date: Sat, 10 May 2025 08:57:12 GMT Message-Id: <202505100857.54A8vCEi059691@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: a4f6317bb64b - main - cp: Address style issues from external review. 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: a4f6317bb64b8eb6a61c51c49811101fe74e8a9e Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a4f6317bb64b8eb6a61c51c49811101fe74e8a9e commit a4f6317bb64b8eb6a61c51c49811101fe74e8a9e Author: Dag-Erling Smørgrav AuthorDate: 2025-05-10 08:55:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-10 08:55:03 +0000 cp: Address style issues from external review. * Correctly indent some comment blocks. * Avoid using strcpy(), even when we know it's safe. * Drop the (void) casts from fts_set() calls which can never fail. Fixes: 82fc0d09e862 Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D50256 --- bin/cp/cp.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 62cc2abc3654..f1cfde7e5008 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -280,7 +280,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) if (type == FILE_TO_FILE) { to.dir = AT_FDCWD; to.end = to.path + strlcpy(to.path, to.base, sizeof(to.path)); - strcpy(to.base, dot); + strlcpy(to.base, dot, sizeof(to.base)); } else if (type == FILE_TO_DIR) { to.dir = open(to.base, O_DIRECTORY | O_SEARCH); if (to.dir < 0) @@ -333,7 +333,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) mode = curr_stat->st_mode | S_IRWXU; if (mkdir(to.base, mode) != 0) { warn("%s", to.base); - (void)fts_set(ftsp, curr, FTS_SKIP); + fts_set(ftsp, curr, FTS_SKIP); badcp = rval = 1; continue; } @@ -341,7 +341,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) if (to.dir < 0) { warn("%s", to.base); (void)rmdir(to.base); - (void)fts_set(ftsp, curr, FTS_SKIP); + fts_set(ftsp, curr, FTS_SKIP); badcp = rval = 1; continue; } @@ -349,7 +349,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) warn("%s", to.base); (void)close(to.dir); (void)rmdir(to.base); - (void)fts_set(ftsp, curr, FTS_SKIP); + fts_set(ftsp, curr, FTS_SKIP); to.dir = -1; badcp = rval = 1; continue; @@ -371,33 +371,33 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) to.end += len; } skipdp = false; - /* - * We're on the verge of recursing on ourselves. - * Either we need to stop right here (we knowingly - * just created it), or we will in an immediate - * descendant. Record the path of the immediate - * descendant to make our lives a little less - * complicated looking. - */ + /* + * We're on the verge of recursing on ourselves. + * Either we need to stop right here (we knowingly + * just created it), or we will in an immediate + * descendant. Record the path of the immediate + * descendant to make our lives a little less + * complicated looking. + */ if (type != FILE_TO_FILE && root_stat->st_dev == curr_stat->st_dev && root_stat->st_ino == curr_stat->st_ino) { assert(recpath == NULL); if (root_stat == &created_root_stat) { - /* - * This directory didn't exist - * when we started, we created it - * as part of traversal. Stop - * right here before we do - * something silly. - */ - (void)fts_set(ftsp, curr, FTS_SKIP); + /* + * This directory didn't exist + * when we started, we created it + * as part of traversal. Stop + * right here before we do + * something silly. + */ + fts_set(ftsp, curr, FTS_SKIP); continue; } if (asprintf(&recpath, "%s/%s", to.path, rootname) < 0) { warnc(ENOMEM, NULL); - (void)fts_set(ftsp, curr, FTS_SKIP); + fts_set(ftsp, curr, FTS_SKIP); badcp = rval = 1; continue; } @@ -476,9 +476,9 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) /* * This can happen in two cases: * - DIR_TO_DNE; we created the directory and - * populated root_stat earlier. + * populated root_stat earlier. * - FILE_TO_DIR if a source has a trailing slash; - * the caller populated root_stat. + * the caller populated root_stat. */ dne = false; to_stat = *root_stat; @@ -497,7 +497,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) to.base, to.path, curr->fts_path); badcp = rval = 1; if (S_ISDIR(curr_stat->st_mode)) - (void)fts_set(ftsp, curr, FTS_SKIP); + fts_set(ftsp, curr, FTS_SKIP); continue; } @@ -524,7 +524,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) if (!Rflag) { warnx("%s is a directory (not copied).", curr->fts_path); - (void)fts_set(ftsp, curr, FTS_SKIP); + fts_set(ftsp, curr, FTS_SKIP); badcp = rval = 1; break; } @@ -540,13 +540,13 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) mode = curr_stat->st_mode | S_IRWXU; if (mkdirat(to.dir, to.path, mode) != 0) { warn("%s/%s", to.base, to.path); - (void)fts_set(ftsp, curr, FTS_SKIP); + fts_set(ftsp, curr, FTS_SKIP); badcp = rval = 1; break; } } else if (!S_ISDIR(to_stat.st_mode)) { warnc(ENOTDIR, "%s/%s", to.base, to.path); - (void)fts_set(ftsp, curr, FTS_SKIP); + fts_set(ftsp, curr, FTS_SKIP); badcp = rval = 1; break; }