comparison scp.c @ 579:8c737cd7c1af

merge of '48fdaa8706d1acda35e9d564adc9a1fbc96c18c8' and '658fd03abd21e0da7c4c89b9fff9dc693c72daae'
author Matt Johnston <matt@ucc.asn.au>
date Sat, 27 Feb 2010 11:53:18 +0000
parents 281ed8384eb4
children cf5a167776c3
comparison
equal deleted inserted replaced
577:69e98c45db7c 579:8c737cd7c1af
341 break; 341 break;
342 case 'P': 342 case 'P':
343 addargs(&args, "-p%s", optarg); 343 addargs(&args, "-p%s", optarg);
344 break; 344 break;
345 case 'B': 345 case 'B':
346 addargs(&args, "-oBatchmode yes"); 346 fprintf(stderr, "Note: -B option is disabled in this version of scp");
347 break; 347 break;
348 case 'l': 348 case 'l':
349 speed = strtod(optarg, &endp); 349 speed = strtod(optarg, &endp);
350 if (speed <= 0 || *endp != '\0') 350 if (speed <= 0 || *endp != '\0')
351 usage(); 351 usage();
490 if (src) { /* remote to remote */ 490 if (src) { /* remote to remote */
491 freeargs(&alist); 491 freeargs(&alist);
492 addargs(&alist, "%s", ssh_program); 492 addargs(&alist, "%s", ssh_program);
493 if (verbose_mode) 493 if (verbose_mode)
494 addargs(&alist, "-v"); 494 addargs(&alist, "-v");
495 #if 0
496 // Disabled since dbclient won't understand them
497 // and scp works fine without them.
495 addargs(&alist, "-x"); 498 addargs(&alist, "-x");
496 addargs(&alist, "-oClearAllForwardings yes"); 499 addargs(&alist, "-oClearAllForwardings yes");
497 addargs(&alist, "-n"); 500 addargs(&alist, "-n");
501 #endif
498 502
499 *src++ = 0; 503 *src++ = 0;
500 if (*src == 0) 504 if (*src == 0)
501 src = "."; 505 src = ".";
502 host = strrchr(argv[i], '@'); 506 host = strrchr(argv[i], '@');