Attachment #1966 for bug #1837





/* Struct for addargs */
arglist args;
arglist remote_remote_args;

/* Bandwidth limit */
long long limit_kbps = 0;

	argv = newargv;

	memset(&args, '\0', sizeof(args));
	memset(&remote_remote_args, '\0', sizeof(remote_remote_args));
	args.list = remote_remote_args.list = NULL;
	addargs(&args, "%s", ssh_program);
	addargs(&args, "-x");
	addargs(&args, "-oForwardAgent no");

		case '6':
		case 'C':
			addargs(&args, "-%c", ch);
			addargs(&remote_remote_args, "-%c", ch);
			break;
		case 'o':
		case 'c':
		case 'i':
		case 'F':
			addargs(&remote_remote_args, "-%c", ch);
			addargs(&remote_remote_args, "%s", optarg);
			addargs(&args, "-%c", ch);
			addargs(&args, "%s", optarg);
			break;
		case 'P':
			addargs(&remote_remote_args, "-p");
			addargs(&remote_remote_args, "%s", optarg);
			addargs(&args, "-p");
			addargs(&args, "%s", optarg);
			break;
		case 'B':
			addargs(&remote_remote_args, "-oBatchmode yes");
			addargs(&args, "-oBatchmode yes");
			break;
		case 'l':

			break;
		case 'v':
			addargs(&args, "-v");
			addargs(&remote_remote_args, "-v");
			verbose_mode = 1;
			break;
		case 'q':
			addargs(&args, "-q");
			addargs(&remote_remote_args, "-q");
			showprogress = 0;
			break;


	char *bp, *host, *src, *suser, *thost, *tuser, *arg;
	arglist alist;
	int i;
	u_int j;

	memset(&alist, '\0', sizeof(alist));
	alist.list = NULL;

		if (src) {	/* remote to remote */
			freeargs(&alist);
			addargs(&alist, "%s", ssh_program);
			if (verbose_mode)
				addargs(&alist, "-v");
			addargs(&alist, "-x");
			addargs(&alist, "-oClearAllForwardings yes");
			addargs(&alist, "-n");
			for (j = 0; j < remote_remote_args.num; j++) {
				addargs(&alist, "%s",
				    remote_remote_args.list[j]);
			}
			*src++ = 0;
			if (*src == 0)
				src = ".";

Return to bug 1837

Lines 106-111 int do_cmd(char host, char remuser, ch Link Here

(-)scp.c (-4 / +16 lines)
106		106
107	/* Struct for addargs */	107	/* Struct for addargs */
108	arglist args;	108	arglist args;
		109	arglist remote_remote_args;
109		110
110	/* Bandwidth limit */	111	/* Bandwidth limit */
111	long long limit_kbps = 0;	112	long long limit_kbps = 0;
Lines 316-322 main(int argc, char **argv) Link Here
316	argv = newargv;	317	argv = newargv;
317		318
318	memset(&args, '\0', sizeof(args));	319	memset(&args, '\0', sizeof(args));
319	args.list = NULL;	320	memset(&remote_remote_args, '\0', sizeof(remote_remote_args));
		321	args.list = remote_remote_args.list = NULL;
320	addargs(&args, "%s", ssh_program);	322	addargs(&args, "%s", ssh_program);
321	addargs(&args, "-x");	323	addargs(&args, "-x");
322	addargs(&args, "-oForwardAgent no");	324	addargs(&args, "-oForwardAgent no");
Lines 333-351 main(int argc, char **argv) Link Here
333	case '6':	335	case '6':
334	case 'C':	336	case 'C':
335	addargs(&args, "-%c", ch);	337	addargs(&args, "-%c", ch);
		338	addargs(&remote_remote_args, "-%c", ch);
336	break;	339	break;
337	case 'o':	340	case 'o':
338	case 'c':	341	case 'c':
339	case 'i':	342	case 'i':
340	case 'F':	343	case 'F':
		344	addargs(&remote_remote_args, "-%c", ch);
		345	addargs(&remote_remote_args, "%s", optarg);
341	addargs(&args, "-%c", ch);	346	addargs(&args, "-%c", ch);
342	addargs(&args, "%s", optarg);	347	addargs(&args, "%s", optarg);
343	break;	348	break;
344	case 'P':	349	case 'P':
		350	addargs(&remote_remote_args, "-p");
		351	addargs(&remote_remote_args, "%s", optarg);
345	addargs(&args, "-p");	352	addargs(&args, "-p");
346	addargs(&args, "%s", optarg);	353	addargs(&args, "%s", optarg);
347	break;	354	break;
348	case 'B':	355	case 'B':
		356	addargs(&remote_remote_args, "-oBatchmode yes");
349	addargs(&args, "-oBatchmode yes");	357	addargs(&args, "-oBatchmode yes");
350	break;	358	break;
351	case 'l':	359	case 'l':
Lines 367-376 main(int argc, char **argv) Link Here
367	break;	375	break;
368	case 'v':	376	case 'v':
369	addargs(&args, "-v");	377	addargs(&args, "-v");
		378	addargs(&remote_remote_args, "-v");
370	verbose_mode = 1;	379	verbose_mode = 1;
371	break;	380	break;
372	case 'q':	381	case 'q':
373	addargs(&args, "-q");	382	addargs(&args, "-q");
		383	addargs(&remote_remote_args, "-q");
374	showprogress = 0;	384	showprogress = 0;
375	break;	385	break;
376		386
Lines 471-476 toremote(char targ, int argc, char *ar Link Here
471	char bp, host, src, suser, thost, tuser, *arg;	481	char bp, host, src, suser, thost, tuser, *arg;
472	arglist alist;	482	arglist alist;
473	int i;	483	int i;
		484	u_int j;
474		485
475	memset(&alist, '\0', sizeof(alist));	486	memset(&alist, '\0', sizeof(alist));
476	alist.list = NULL;	487	alist.list = NULL;
Lines 501-512 toremote(char targ, int argc, char *ar Link Here
501	if (src) { /* remote to remote */	512	if (src) { /* remote to remote */
502	freeargs(&alist);	513	freeargs(&alist);
503	addargs(&alist, "%s", ssh_program);	514	addargs(&alist, "%s", ssh_program);
504	if (verbose_mode)
505	addargs(&alist, "-v");
506	addargs(&alist, "-x");	515	addargs(&alist, "-x");
507	addargs(&alist, "-oClearAllForwardings yes");	516	addargs(&alist, "-oClearAllForwardings yes");
508	addargs(&alist, "-n");	517	addargs(&alist, "-n");
509		518	for (j = 0; j < remote_remote_args.num; j++) {
		519	addargs(&alist, "%s",
		520	remote_remote_args.list[j]);
		521	}
510	*src++ = 0;	522	*src++ = 0;
511	if (*src == 0)	523	if (*src == 0)
512	src = ".";	524	src = ".";