From nobody Mon Apr 21 17:41:09 2025 X-Original-To: dev-commits-src-branches@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 4ZhCMp2wTpz5snPq; Mon, 21 Apr 2025 17:41:10 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZhCMn5gXgz3ShK; Mon, 21 Apr 2025 17:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745257269; 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=80Loig6ho2nSu448kYLb7Zk8nSSPUqzmmWJ951JGGQ8=; b=rTPyZRvOBl4oK2GlqUx8VFXosNDVzX4Tf7/WUeE4flIO4Y2bN1GHlbRjfnKU9O877+0yDJ LKb6lm43ucRZ+j8fk7Mhws3vsOcooJj4MopEvCQvAEmQVI3G2WcF6JKxHchVu9JzET/iPa K2gyQURfj/cCLxYovc6C0/2VblNa7fX52qmFuMhOi/QEGMT2hv69e0U9BZcVXXP7q0ZJNk KXUZBQ4YwITkq2ijv9ycO4NKkxnRwI7NopoN2ShPnr7kcXvIA3HH7M49ipMFxVJNRjLRQq /uYuC5/e5G70iPg/K2ofHQto7bK3KMS8rZQkm0xGTwYxLtRJG35Xx6UT1aTvqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745257269; a=rsa-sha256; cv=none; b=ftSP8vB45wzyLBul957t8Wba9t7oeN/mkYygxN+9HA0rTDV+SsZedJoqCJ4VpLKSe+bw8B CCAwOSMFt/AXZaIR4njsSzb1hZQYkbyTv2+uFVK8VS3m3oCR6YNoWwVFihVlWUec8n69Q/ t64prCW/dvaZ2VjCAFf266nS5sMacd8H1ZyKnwIasRbyvhaQUklHTnnuP3iirorq1DHS2w SC2tt8yaXwiPi/Ben540b76j1Dz2br6ndpdB+fUTOLF1eT2bCQ+RwXL8KH4mZij+3fC+Z2 dbihXJBrQqWVYGPf+ViD8bMvMXnYFUlsUMP6GxI/6BdSx8jKTsJpacxlmxpk2g== 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=1745257269; 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=80Loig6ho2nSu448kYLb7Zk8nSSPUqzmmWJ951JGGQ8=; b=YjmXBxbP5NLgVK9c7zek2Hth1nsSLmE0NX5d8fUKUHlcfHINTCxDJJgbtLfT5MQSNF5rpJ EYItF+sM7sT7VoKPzv1uXYSLQYESQT5B1KWr94G3kXM+rwnIrESjUgCdQoQHm0pnwKuHIM LdlpP6VYx2VIIhQNT18iKO70V9dW9YpLKUA66M6lO9A+P5p4YiV8NjwcmpKXynql6AHbXc +OBCsAOgIx7omSrr+Evqlwd63wv0vEGnPG0tlEFcmvMuwZffOLRY18b2FnYWk6uGLXWoOa SAr9WLgvgNiRFl9DVq3tspQ8DMIq6Q+gzpXHnz5a5lAHCf5RDg7zSzObzdMmVg== 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 4ZhCMn5GCHz10bv; Mon, 21 Apr 2025 17:41:09 +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 53LHf9on035975; Mon, 21 Apr 2025 17:41:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53LHf9VA035972; Mon, 21 Apr 2025 17:41:09 GMT (envelope-from git) Date: Mon, 21 Apr 2025 17:41:09 GMT Message-Id: <202504211741.53LHf9VA035972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 57235a9b5158 - stable/14 - cp: Improve error messages. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 57235a9b51587a0d4aefe5de96da409239c5ff90 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=57235a9b51587a0d4aefe5de96da409239c5ff90 commit 57235a9b51587a0d4aefe5de96da409239c5ff90 Author: Dag-Erling Smørgrav AuthorDate: 2025-04-15 17:57:28 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-04-20 08:00:29 +0000 cp: Improve error messages. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D49841 (cherry picked from commit 7622e2d21a22f7af65a7145f91ef34179bb6ee03) --- bin/cp/cp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index a8c57308ae96..79a808059536 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -227,7 +227,7 @@ main(int argc, char *argv[]) * Case (1). Target is not a directory. */ if (argc > 1) - errx(1, "%s is not a directory", to.p_path); + errc(1, ENOTDIR, "%s", to.p_path); /* * Need to detect the case: @@ -250,17 +250,17 @@ main(int argc, char *argv[]) type = FILE_TO_FILE; if (have_trailing_slash && type == FILE_TO_FILE) { - if (r == -1) { - errx(1, "directory %s does not exist", - to.p_path); - } else - errx(1, "%s is not a directory", to.p_path); + if (r == -1) + errc(1, ENOENT, "%s", to.p_path); + else + errc(1, ENOTDIR, "%s", to.p_path); } - } else + } else { /* * Case (2). Target is a directory. */ type = FILE_TO_DIR; + } /* * For DIR_TO_DNE, we could provide copy() with the to_stat we've @@ -368,8 +368,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) base = (p == NULL) ? 0 : (int)(p - curr->fts_path + 1); - if (!strcmp(&curr->fts_path[base], - "..")) + if (strcmp(curr->fts_path + base, "..") + == 0) base += 1; } else base = curr->fts_pathlen;