system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-09 04:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

cp: Move the flags around a bit.

Browse Source 
- 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
This commit is contained in:
Dag-Erling Smørgrav 2023-12-14 17:07:00 +01:00
parent ac56b9d83c
commit 0f4467ce44
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/cp/cp.c
View File

@ -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;