src/usr.bin/ssh/scp.c - diff

Return to scp.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/scp.c between version 1.139 and 1.140

version 1.139, 2006/03/25 13:17:02

version 1.140, 2006/04/01 05:42:20

Line 88

#include "misc.h"

#include "progressmeter.h"

int do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc);

int do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout);

void bwlimit(int);

Line 175

int

do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)

do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout)

{

int pin[2], pout[2], reserved[2];

Line 242

BUF *allocbuf(BUF *, int, int);

void lostconn(int);

void nospace(void);

int okname(char *);

void run_err(const char *,...);

void verifydir(char *);

Line 412

Line 411

void

toremote(char *targ, int argc, char **argv)

{

int i, len;

char *bp, *host, *src, *suser, *thost, *tuser, *arg;

arglist alist;

size_t len;

int i;

memset(&alist, '\0', sizeof(alist));

alist.list = NULL;

Line 484

(void) snprintf(bp, len, "%s -t %s", cmd, targ);

host = cleanhostname(thost);

if (do_cmd(host, tuser, bp, &remin,

&remout, argc) < 0)

&remout) < 0)

exit(1);

if (response() < 0)

exit(1);

Line 498

void

tolocal(int argc, char **argv)

{

int i, len;

char *bp, *host, *src, *suser;

arglist alist;

size_t len;

int i;

memset(&alist, '\0', sizeof(alist));

alist.list = NULL;

Line 535

Line 536

len = strlen(src) + CMDNEEDS + 20;

bp = xmalloc(len);

(void) snprintf(bp, len, "%s -f %s", cmd, src);

if (do_cmd(host, suser, bp, &remin, &remout, argc) < 0) {

if (do_cmd(host, suser, bp, &remin, &remout) < 0) {

(void) xfree(bp);

++errs;

continue;

Line 780

Line 781

BUF *bp;

off_t i;

size_t j, count;

int amt, exists, first, mask, mode, ofd, omode;

int amt, exists, first, ofd;

mode_t mode, omode, mask;

off_t size, statbytes;

int setimes, targisdir, wrerrno = 0;

char ch, *cp, *np, *targ, *why, *vect[1], buf[2048];