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.30 and 1.30.2.1

version 1.30, 2000/05/02 18:21:48

version 1.30.2.1, 2000/09/01 18:23:22

Line 11

* Parts from:

Line 45

Line 47

#include "includes.h"

RCSID("$Id$");

RCSID("$OpenBSD$");

#include "ssh.h"

#include "xmalloc.h"

Line 61

Line 63

/* Returns width of the terminal (for progress meter calculations). */

int getttywidth(void);

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

/* Time a transfer started. */

static struct timeval start;

Line 103

Line 106

/* This is the port to use in contacting the remote site (is non-NULL). */

char *port = NULL;

/* This is the program to execute for the secured connection. ("ssh" or -S) */

char *ssh_program = SSH_PROGRAM;

* This function executes the given command as the specified user on the

* given host. This returns < 0 if execution fails, and >= 0 otherwise. This

Line 110

Line 116

int

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

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

{

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

if (verbose_mode)

fprintf(stderr, "Executing: host %s, user %s, command %s\n",

host, remuser ? remuser : "(unspecified)", cmd);

* Reserve two descriptors so that the real pipes won't get

Line 136

Line 142

/* For a child to execute the command on the remote host using ssh. */

if (fork() == 0) {

char *args[100];

char *args[100]; /* XXX careful */

unsigned int i;

/* Child. */

Line 148

Line 154

close(pout[1]);

i = 0;

args[i++] = SSH_PROGRAM;

args[i++] = ssh_program;

args[i++] = "-x";

args[i++] = "-oFallBackToRsh no";

if (IPv4)

args[i++] = "-4";

if (IPv6)

args[i++] = "-6";

args[i++] = "-oFallBackToRsh no";

if (verbose_mode)

args[i++] = "-v";

if (compress)

Line 182

Line 187

args[i++] = cmd;

args[i++] = NULL;

execvp(SSH_PROGRAM, args);

execvp(ssh_program, args);

perror(SSH_PROGRAM);

perror(ssh_program);

exit(1);

}

/* Parent. Close the other side, and return the local side. */

Line 207

Line 212

exit(255);

}

/* This stuff used to be in BSD rcp extern.h. */

typedef struct {

int cnt;

char *buf;

Line 224

Line 227

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

void verifydir(char *);

/* Stuff from BSD rcp.c continues. */

struct passwd *pwd;

uid_t userid;

int errs, remin, remout;

Line 253

Line 254

extern int optind;

fflag = tflag = 0;

while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46")) != EOF)

while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S")) != EOF)

switch (ch) {

/* User-visible flags. */

case '4':

Line 271

Line 272

case 'r':

iamrecursive = 1;

break;

case 'S':

ssh_program = optarg;

break;

/* Server options. */

case 'd':

targetshouldbedirectory = 1;

Line 336

Line 341

remin = remout = -1;

/* Command to be executed on remote system using "ssh". */

(void) sprintf(cmd, "scp%s%s%s%s", verbose_mode ? " -v" : "",

iamrecursive ? " -r" : "", pflag ? " -p" : "",

targetshouldbedirectory ? " -d" : "");

(void) signal(SIGPIPE, lostconn);

Line 394

Line 399

if (*src == 0)

src = ".";

host = strchr(argv[i], '@');

len = strlen(SSH_PROGRAM) + strlen(argv[i]) +

len = strlen(ssh_program) + strlen(argv[i]) +

strlen(src) + (tuser ? strlen(tuser) : 0) +

strlen(thost) + strlen(targ) + CMDNEEDS + 32;

bp = xmalloc(len);

if (host) {

*host++ = 0;

Line 407

Line 412

else if (!okname(suser))

continue;

(void) sprintf(bp,

"%s%s -x -o'FallBackToRsh no' -n -l %s %s %s %s '%s%s%s:%s'",

SSH_PROGRAM, verbose_mode ? " -v" : "",

ssh_program, verbose_mode ? " -v" : "",

suser, host, cmd, src,

tuser ? tuser : "", tuser ? "@" : "",

thost, targ);

} else {

host = cleanhostname(argv[i]);

(void) sprintf(bp,

"exec %s%s -x -o'FallBackToRsh no' -n %s %s %s '%s%s%s:%s'",

SSH_PROGRAM, verbose_mode ? " -v" : "",

ssh_program, verbose_mode ? " -v" : "",

host, cmd, src,

tuser ? tuser : "", tuser ? "@" : "",

thost, targ);

}

if (verbose_mode)

fprintf(stderr, "Executing: %s\n", bp);

Line 431

Line 436

bp = xmalloc(len);

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

host = cleanhostname(thost);

if (do_cmd(host, tuser,

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

bp, &remin, &remout) < 0)

&remout, argc) < 0)

exit(1);

if (response() < 0)

exit(1);

Line 454

Line 459

for (i = 0; i < argc - 1; i++) {

if (!(src = colon(argv[i]))) { /* Local to local. */

len = strlen(_PATH_CP) + strlen(argv[i]) +

strlen(argv[argc - 1]) + 20;

bp = xmalloc(len);

(void) sprintf(bp, "exec %s%s%s %s %s", _PATH_CP,

iamrecursive ? " -r" : "", pflag ? " -p" : "",

argv[i], argv[argc - 1]);

if (verbose_mode)

fprintf(stderr, "Executing: %s\n", bp);

if (system(bp))

Line 484

Line 489

len = strlen(src) + CMDNEEDS + 20;

bp = xmalloc(len);

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

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

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

(void) xfree(bp);

++errs;

continue;

Line 541

Line 546

* versions expecting microseconds.

(void) sprintf(buf, "T%lu 0 %lu 0\n",

(unsigned long) stb.st_mtime,

(unsigned long) stb.st_atime);

(void) atomicio(write, remout, buf, strlen(buf));

if (response() < 0)

goto next;

Line 619

Line 624

last++;

if (pflag) {

(void) sprintf(path, "T%lu 0 %lu 0\n",

(unsigned long) statp->st_mtime,

(unsigned long) statp->st_atime);

(void) atomicio(write, remout, path, strlen(path));

if (response() < 0) {

closedir(dirp);

Line 628

Line 633

}

(void) sprintf(path, "D%04o %d %.1024s\n",

(unsigned int) (statp->st_mode & FILEMODEMASK),

(unsigned int) (statp->st_mode & FILEMODEMASK), 0, last);

0, last);

if (verbose_mode)

fprintf(stderr, "Entering directory: %s", path);

(void) atomicio(write, remout, path, strlen(path));

Line 668

Line 672

BUF *bp;

off_t i, j;

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

int setimes, size, targisdir, wrerrno = 0;

off_t size;

int setimes, targisdir, wrerrno = 0;

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

struct utimbuf ut;

int dummy_usec;

Line 776

Line 781

if (need > cursize)

namebuf = xmalloc(need);

(void) sprintf(namebuf, "%s%s%s", targ,

*targ ? "/" : "", cp);

np = namebuf;

} else

np = targ;

Line 882

Line 887

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

np, strerror(errno));

}

(void) close(ofd);

if (close(ofd) == -1) {

wrerr = YES;

wrerrno = errno;

}

(void) response();

if (setimes && wrerr == NO) {

setimes = 0;

Line 944

Line 952

void

usage()

{

(void) fprintf(stderr,

(void) fprintf(stderr, "usage: scp "

"usage: scp [-pqrvC46] [-P port] [-c cipher] [-i identity] f1 f2; or:\n scp [options] f1 ... fn directory\n");

"[-pqrvC46] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2; or:\n"

" scp [options] f1 ... fn directory\n");

exit(1);

}

Line 972

Line 981

va_end(ap);

}

/* Stuff below is from BSD rcp util.c. */

/*-

* Redistribution and use in source and binary forms, with or without

* modification, are permitted provided that the following conditions

* are met:

* 1. Redistributions of source code must retain the above copyright

* notice, this list of conditions and the following disclaimer.

* 2. Redistributions in binary form must reproduce the above copyright

* notice, this list of conditions and the following disclaimer in the

* documentation and/or other materials provided with the distribution.

* 3. All advertising materials mentioning features or use of this software

* must display the following acknowledgement:

* This product includes software developed by the University of

* California, Berkeley and its contributors.

* 4. Neither the name of the University nor the names of its contributors

* may be used to endorse or promote products derived from this software

* without specific prior written permission.

* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

* SUCH DAMAGE.

* $Id$

char *

colon(cp)

char *cp;

Line 1085

Line 1057

size = blksize;

else

size = blksize + (stb.st_blksize - blksize % stb.st_blksize) %

stb.st_blksize;

if (bp->cnt >= size)

return (bp);

if (bp->buf == NULL)

Line 1174

Line 1146

if (barlength > 0) {

i = barlength * ratio / 100;

snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),

"|%.*s%*s|", i,

"*****************************************************************************"

"*****************************************************************************",

barlength - i, "");

}

i = 0;

abbrevsize = cursize;

Line 1218

Line 1190

i = remaining / 3600;

if (i)

snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),

"%2d:", i);

else

snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),

" ");

i = remaining % 3600;

snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),

"%02d:%02d%s", i / 60, i % 60,

(flag != 1) ? " ETA" : " ");

}

atomicio(write, fileno(stdout), buf, strlen(buf));