d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make -r a synonym for -R, similar to behavior on Linux while being backwards

Browse Source 
compatible with old -r behavior with regards to -L.  You can now copy fifos
and other special files with -r.

Reviewed by:	-standards (long ago), das, bde
Approved by:	bde (recently)
This commit is contained in:
trhodes 2006-10-07 22:14:43 +00:00
parent 1f27dd98e0
commit 06666564b4
2 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bin/cp/cp.1
View File

@ -32,7 +32,7 @@
.\" @(#)cp.1 8.3 (Berkeley) 4/18/94 .\" @(#)cp.1 8.3 (Berkeley) 4/18/94
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd August 24, 2006 .Dd October 7, 2006
.Dt CP 1 .Dt CP 1
.Os .Os
.Sh NAME .Sh NAME
@ -252,8 +252,37 @@ utility had a
.Fl r .Fl r
option. option.
This implementation supports that option, however, its use is strongly This implementation supports that option, however, its use is strongly
discouraged, as it does not correctly copy special files, symbolic links discouraged as its behavior is very implementation dependent.
or fifo's. In this version of
.Nm ,
.Fl r
is just a synonym for
.Fl RL .
The
.Fl R
option gives the correct behavior while
.Fl L
preserves the sometimes-useful historical behavior of following symbolic links.
The
.Fl r
option is deprecated in
.Tn POSIX
and its behavior is likely to be different
in future versions of
.Nm
and its behavior is likely to be different
in future versions of
.Fx .
Previous versions of
.Nm
in
.Fx ,
the
.Fl r
behavior was to not correctly copy special files, symbolic links
or fifos.
Symbolic links were followed, and the contents of special
files and fifos were copied to regular files.
.Pp .Pp
The The
.Fl v .Fl v

20
bin/cp/cp.c
View File

@ -138,7 +138,8 @@ main(int argc, char *argv[])
pflag = 1; pflag = 1;
break; break;
case 'r': case 'r':
rflag = 1; rflag = Lflag = 1;
Hflag = Pflag = 0;
break; break;
case 'v': case 'v':
vflag = 1; vflag = 1;
@ -155,15 +156,12 @@ main(int argc, char *argv[])
fts_options = FTS_NOCHDIR | FTS_PHYSICAL; fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
if (rflag) { if (rflag) {
if (Rflag) if (Rflag)
errx(1, errx(1,
"the -R and -r options may not be specified together."); "the -R and -r options may not be specified together.");
if (Hflag || Lflag || Pflag) }
errx(1, if (rflag && !Hflag && !Pflag)
"the -H, -L, and -P options may not be specified with the -r option."); Rflag = 1;
fts_options &= ~FTS_PHYSICAL;
fts_options |= FTS_LOGICAL;
}
if (Rflag) { if (Rflag) {
if (Hflag) if (Hflag)
fts_options |= FTS_COMFOLLOW; fts_options |= FTS_COMFOLLOW;
@ -227,12 +225,12 @@ main(int argc, char *argv[])
* the initial mkdir(). * the initial mkdir().
*/ */
if (r == -1) { if (r == -1) {
if (rflag || (Rflag && (Lflag || Hflag))) if (Rflag && (Lflag || Hflag))
stat(*argv, &tmp_stat); stat(*argv, &tmp_stat);
else else
lstat(*argv, &tmp_stat); lstat(*argv, &tmp_stat);
if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag)) if (S_ISDIR(tmp_stat.st_mode) && (Rflag))
type = DIR_TO_DNE; type = DIR_TO_DNE;
else else
type = FILE_TO_FILE; type = FILE_TO_FILE;
@ -420,7 +418,7 @@ copy(char *argv[], enum op type, int fts_options)
} }
break; break;
case S_IFDIR: case S_IFDIR:
if (!Rflag && !rflag) { if (!Rflag) {
warnx("%s is a directory (not copied).", warnx("%s is a directory (not copied).",
curr->fts_path); curr->fts_path);
(void)fts_set(ftsp, curr, FTS_SKIP); (void)fts_set(ftsp, curr, FTS_SKIP);