Page MenuHomeFreeBSD
Differential D50357

cp: Avoid prepending ./ in file-to-file case.
ClosedPublic
Actions

Authored by des on May 14 2025, 8:10 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Feb 8, 1:30 AM
Unknown Object (File)
Sat, Jan 31, 4:37 AM
Unknown Object (File)
Sun, Jan 25, 2:19 AM
Unknown Object (File)
Wed, Jan 21, 3:29 PM
Unknown Object (File)
Dec 17 2025, 5:38 AM
Unknown Object (File)
Dec 17 2025, 5:38 AM
Unknown Object (File)
Nov 21 2025, 3:55 PM
Unknown Object (File)
Nov 18 2025, 3:45 AM
View All 59 Files
Subscribers
imp

Details

Reviewers
markj
Group Reviewers
Klara
Commits
rGb3fe9014c321: cp: Avoid prepending ./ in file-to-file case.
Summary
  • Make to.base large enough to hold a trailing separator.
  • Remove the separator from warning and error messages.
  • In the FILE_TO_FILE case, leave to.base empty.
  • In the FILE_TO_DIR and DIR_TO_DNE cases, append a separator to to.base once we've (optionally created and) opened it.
  • Thus, in the file-to-file case, we print an empty string followed by to.path, while in all other cases, to.base already contains the necessary separator.

This fixes failures in tests that used cp and expected a specific
error message and were surprised to see "./" pop up.

Fixes: 82fc0d09e862
Sponsored by: Klara, Inc.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
bin/
cp/
38 lines
2 lines
50 lines

Diff 155504

View Options

bin/cp/cp.c

Loading...
View Options

bin/cp/extern.h

Loading...
View Options

bin/cp/utils.c

Loading...