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.65 and 1.66

version 1.65, 2001/04/06 16:46:59

version 1.66, 2001/04/14 17:04:42

Line 649

off_t size;

int setimes, targisdir, wrerrno = 0;

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

int dummy_usec;

struct timeval tv[2];

#define atime tv[0]

#define mtime tv[1]

#define SCREWUP(str) { why = str; goto screwup; }

setimes = targisdir = 0;

Line 698

Line 699

if (ch == '\n')

*--cp = 0;

#define getnum(t) (t) = 0; \

while (*cp >= '0' && *cp <= '9') (t) = (t) * 10 + (*cp++ - '0');

cp = buf;

if (*cp == 'T') {

setimes++;

cp++;

getnum(tv[1].tv_sec);

mtime.tv_sec = strtol(cp, &cp, 10);

if (*cp++ != ' ')

if (!cp || *cp++ != ' ')

SCREWUP("mtime.sec not delimited");

getnum(dummy_usec);

mtime.tv_usec = strtol(cp, &cp, 10);

tv[1].tv_usec = 0;

if (!cp || *cp++ != ' ')

if (*cp++ != ' ')

SCREWUP("mtime.usec not delimited");

getnum(tv[0].tv_sec);

atime.tv_sec = strtol(cp, &cp, 10);

if (*cp++ != ' ')

if (!cp || *cp++ != ' ')

SCREWUP("atime.sec not delimited");

getnum(dummy_usec);

atime.tv_usec = strtol(cp, &cp, 10);

tv[0].tv_usec = 0;

if (!cp || *cp++ != '\0')

if (*cp++ != '\0')

SCREWUP("atime.usec not delimited");

(void) atomicio(write, remout, "", 1);

continue;