Mercurial > dropbear

comparison scp.c @ 641:2b1bb792cd4d dropbear-tfm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Update tfm changes to current default tip
author Matt Johnston <matt@ucc.asn.au>
date Mon, 21 Nov 2011 19:52:28 +0800
parents cf5a167776c3
children 0ad95abf8d3c
comparison
equal deleted inserted replaced
640:76097ec1a29a 641:2b1bb792cd4d
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], '@');
767 void 771 void
768 bwlimit(int amount) 772 bwlimit(int amount)
769 { 773 {
770 static struct timeval bwstart, bwend; 774 static struct timeval bwstart, bwend;
771 static int lamt, thresh = 16384; 775 static int lamt, thresh = 16384;
772 u_int64_t waitlen; 776 uint64_t waitlen;
773 struct timespec ts, rm; 777 struct timespec ts, rm;
774 778
775 if (!timerisset(&bwstart)) { 779 if (!timerisset(&bwstart)) {
776 gettimeofday(&bwstart, NULL); 780 gettimeofday(&bwstart, NULL);
777 return; 781 return;