Attachment #516 for bug #777

View | Details | Raw Unified | Return to bug 777
Collapse All | Expand All




		userhost = xstrdup(argv[optind]);
		file2 = argv[optind+1];

		if ((cp = colon(userhost)) != NULL) {
			*cp++ = '\0';
			file1 = cp;
		}

		if ((host = strrchr(userhost, '@')) == NULL)
			host = userhost;

		/* no subsystem if the server-spec contains a '/' */
		if (sftp_server == NULL || strchr(sftp_server, '/') == NULL)
			addargs(&args, "-s");

		if ((cp = colon(host)) != NULL) {
			*cp++ = '\0';
			file1 = cp;
		}

		addargs(&args, "%s", host);
		addargs(&args, "%s", (sftp_server != NULL ?

Return to bug 777

Lines 206-215 Link Here

(-)sftp.c.old (-4 / +5 lines)
206	userhost = xstrdup(argv[optind]);	206	userhost = xstrdup(argv[optind]);
207	file2 = argv[optind+1];	207	file2 = argv[optind+1];
208		208
209	if ((cp = colon(userhost)) != NULL) {
210	*cp++ = '\0';
211	file1 = cp;
212	}
213		209
214	if ((host = strrchr(userhost, '@')) == NULL)	210	if ((host = strrchr(userhost, '@')) == NULL)
215	host = userhost;	211	host = userhost;
Lines 233-238 Link Here
233	/* no subsystem if the server-spec contains a '/' */	229	/* no subsystem if the server-spec contains a '/' */
234	if (sftp_server == NULL \|\| strchr(sftp_server, '/') == NULL)	230	if (sftp_server == NULL \|\| strchr(sftp_server, '/') == NULL)
235	addargs(&args, "-s");	231	addargs(&args, "-s");
		232
		233	if ((cp = colon(host)) != NULL) {
		234	*cp++ = '\0';
		235	file1 = cp;
		236	}
236		237
237	addargs(&args, "%s", host);	238	addargs(&args, "%s", host);
238	addargs(&args, "%s", (sftp_server != NULL ?	239	addargs(&args, "%s", (sftp_server != NULL ?