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.39 and 1.40

version 1.39, 2000/09/07 20:53:00

version 1.40, 2000/09/21 11:11:42

Line 79

#include "ssh.h"

#include "xmalloc.h"

#include <utime.h>

#define _PATH_CP "cp"

Line 703

Line 702

off_t size;

int setimes, targisdir, wrerrno = 0;

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

struct utimbuf ut;

int dummy_usec;

struct timeval tv[2];

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

Line 758

Line 757

if (*cp == 'T') {

setimes++;

cp++;

getnum(ut.modtime);

getnum(tv[1].tv_sec);

if (*cp++ != ' ')

SCREWUP("mtime.sec not delimited");

getnum(dummy_usec);

tv[1].tv_usec = 0;

if (*cp++ != ' ')

SCREWUP("mtime.usec not delimited");

getnum(ut.actime);

getnum(tv[0].tv_sec);

if (*cp++ != ' ')

SCREWUP("atime.sec not delimited");

getnum(dummy_usec);

tv[0].tv_usec = 0;

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

SCREWUP("atime.usec not delimited");

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

Line 835

Line 836

sink(1, vect);

if (setimes) {

setimes = 0;

if (utime(np, &ut) < 0)

if (utimes(np, tv) < 0)

run_err("%s: set times: %s",

np, strerror(errno));

}

Line 922

Line 923

(void) response();

if (setimes && wrerr == NO) {

setimes = 0;

if (utime(np, &ut) < 0) {

if (utimes(np, tv) < 0) {

run_err("%s: set times: %s",

np, strerror(errno));

wrerr = DISPLAYED;