D43063.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D43063.diff
View Options

	diff --git a/bin/cp/cp.c b/bin/cp/cp.c
	--- a/bin/cp/cp.c
	+++ b/bin/cp/cp.c
	@@ -73,7 +73,7 @@
	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 @@
	{
	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 @@
	Lflag = 1;
	Hflag = Pflag = 0;
	break;
	- case 'N':
	- Nflag = 1;
	- break;
	case 'P':
	Pflag = 1;
	Hflag = Lflag = 0;
	@@ -128,6 +124,9 @@
	case 'l':
	lflag = 1;
	break;
	+ case 'N':
	+ Nflag = 1;
	+ break;
	case 'n':
	nflag = 1;
	fflag = iflag = 0;