View | Details | Raw Unified | Return to bug 88056 | Differences between
and this patch

Collapse All | Expand All

(-)cp.c (-3 / +9 lines)
Lines 83-89 Link Here
83
83
84
PATH_T to = { to.p_path, emptystring, "" };
84
PATH_T to = { to.p_path, emptystring, "" };
85
85
86
int fflag, iflag, nflag, pflag, vflag;
86
int fflag, iflag, nflag, pflag, vflag, xflag;
87
static int Rflag, rflag;
87
static int Rflag, rflag;
88
volatile sig_atomic_t info;
88
volatile sig_atomic_t info;
89
89
Lines 101-108 Link Here
101
	int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash;
101
	int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash;
102
	char *target;
102
	char *target;
103
103
104
	Hflag = Lflag = Pflag = 0;
104
	Hflag = Lflag = Pflag = xflag = 0;
105
	while ((ch = getopt(argc, argv, "HLPRfinprv")) != -1)
105
	while ((ch = getopt(argc, argv, "HLPRfinprvx")) != -1)
106
		switch (ch) {
106
		switch (ch) {
107
		case 'H':
107
		case 'H':
108
			Hflag = 1;
108
			Hflag = 1;
Lines 140-145 Link Here
140
		case 'v':
140
		case 'v':
141
			vflag = 1;
141
			vflag = 1;
142
			break;
142
			break;
143
		case 'x':
144
		        xflag = 1;
145
			break;
143
		default:
146
		default:
144
			usage();
147
			usage();
145
			break;
148
			break;
Lines 151-156 Link Here
151
		usage();
154
		usage();
152
155
153
	fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
156
	fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
157
	if (xflag) {
158
	        fts_options |= FTS_XDEV;
159
	}
154
	if (rflag) {
160
	if (rflag) {
155
		if (Rflag)
161
		if (Rflag)
156
			errx(1,
162
			errx(1,

Return to bug 88056