* called by a name other than "ssh" or "Secure Shell".
*/
/*
- * Copyright (c) 1999 Theo de Raadt. All rights reserved.
- * Copyright (c) 1999 Aaron Campbell. All rights reserved.
+ * Copyright (c) 1999 Theo de Raadt. All rights reserved.
+ * Copyright (c) 1999 Aaron Campbell. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.47 2000/12/19 23:17:57 markus Exp $");
+RCSID("$OpenBSD: scp.c,v 1.88 2002/04/06 18:24:09 mouring Exp $");
-#include "ssh.h"
#include "xmalloc.h"
-
-#ifndef _PATH_CP
-#define _PATH_CP "cp"
-#endif
+#include "atomicio.h"
+#include "pathnames.h"
+#include "log.h"
+#include "misc.h"
#ifdef HAVE___PROGNAME
extern char *__progname;
/* For progressmeter() -- number of seconds before xfer considered "stalled" */
#define STALLTIME 5
-
-/* Progress meter bar */
-#define BAR \
- "************************************************************"\
- "************************************************************"\
- "************************************************************"\
- "************************************************************"
-#define MAX_BARLENGTH (sizeof(BAR) - 1)
+/* alarm() interval for updating progress meter */
+#define PROGRESSTIME 1
/* Visual statistics about files as they are transferred. */
void progressmeter(int);
int getttywidth(void);
int do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc);
-/* setup arguments for the call to ssh */
-void addargs(char *fmt, ...) __attribute__((format(printf, 1, 2)));
+/* Struct for addargs */
+arglist args;
/* Time a transfer started. */
static struct timeval start;
/* Number of bytes of current file transferred so far. */
-volatile u_long statbytes;
+volatile off_t statbytes;
/* Total size of current file. */
off_t totalbytes = 0;
int showprogress = 1;
/* This is the program to execute for the secured connection. ("ssh" or -S) */
-char *ssh_program = SSH_PROGRAM;
-
-/* This is the list of arguments that scp passes to ssh */
-struct {
- char **list;
- int num;
- int nalloc;
-} args;
+char *ssh_program = _PATH_SSH_PROGRAM;
/*
* This function executes the given command as the specified user on the
int pin[2], pout[2], reserved[2];
if (verbose_mode)
- fprintf(stderr, "Executing: program %s host %s, user %s, command %s\n",
- ssh_program, host, remuser ? remuser : "(unspecified)", cmd);
+ fprintf(stderr,
+ "Executing: program %s host %s, user %s, command %s\n",
+ ssh_program, host,
+ remuser ? remuser : "(unspecified)", cmd);
/*
* Reserve two descriptors so that the real pipes won't get
args.list[0] = ssh_program;
if (remuser != NULL)
- addargs("-l%s", remuser);
- addargs("%s", host);
- addargs("%s", cmd);
+ addargs(&args, "-l%s", remuser);
+ addargs(&args, "%s", host);
+ addargs(&args, "%s", cmd);
execvp(ssh_program, args.list);
perror(ssh_program);
return 0;
}
-void
-fatal(const char *fmt,...)
-{
- va_list ap;
- char buf[1024];
-
- va_start(ap, fmt);
- vsnprintf(buf, sizeof(buf), fmt, ap);
- va_end(ap);
- fprintf(stderr, "%s\n", buf);
- exit(255);
-}
-
typedef struct {
int cnt;
char *buf;
} BUF;
-extern int iamremote;
-
BUF *allocbuf(BUF *, int, int);
-char *colon(char *);
void lostconn(int);
void nospace(void);
int okname(char *);
__progname = get_progname(argv[0]);
args.list = NULL;
- addargs("ssh"); /* overwritten with ssh_program */
- addargs("-x");
- addargs("-oFallBackToRsh no");
+ addargs(&args, "ssh"); /* overwritten with ssh_program */
+ addargs(&args, "-x");
+ addargs(&args, "-oForwardAgent no");
+ addargs(&args, "-oFallBackToRsh no");
+ addargs(&args, "-oClearAllForwardings yes");
fflag = tflag = 0;
- while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:")) != EOF)
+ while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:F:")) != -1)
switch (ch) {
/* User-visible flags. */
case '4':
case '6':
case 'C':
- addargs("-%c", ch);
+ addargs(&args, "-%c", ch);
break;
case 'o':
case 'c':
case 'i':
- addargs("-%c%s", ch, optarg);
+ case 'F':
+ addargs(&args, "-%c%s", ch, optarg);
break;
case 'P':
- addargs("-p%s", optarg);
+ addargs(&args, "-p%s", optarg);
break;
case 'B':
- addargs("-oBatchmode yes");
+ addargs(&args, "-oBatchmode yes");
break;
case 'p':
pflag = 1;
ssh_program = xstrdup(optarg);
break;
case 'v':
+ addargs(&args, "-v");
verbose_mode = 1;
break;
case 'q':
case 't': /* "to" */
iamremote = 1;
tflag = 1;
+#ifdef HAVE_CYGWIN
+ setmode(0, O_BINARY);
+#endif
break;
- case '?':
default:
usage();
}
remin = STDIN_FILENO;
remout = STDOUT_FILENO;
- if (fflag) {
+ if (fflag) {
/* Follow "protocol", send data. */
(void) response();
source(argc, argv);
remin = remout = -1;
/* Command to be executed on remote system using "ssh". */
- (void) sprintf(cmd, "scp%s%s%s%s", verbose_mode ? " -v" : "",
+ (void) snprintf(cmd, sizeof cmd, "scp%s%s%s%s",
+ verbose_mode ? " -v" : "",
iamrecursive ? " -r" : "", pflag ? " -p" : "",
targetshouldbedirectory ? " -d" : "");
exit(errs != 0);
}
-char *
-cleanhostname(host)
- char *host;
-{
- if (*host == '[' && host[strlen(host) - 1] == ']') {
- host[strlen(host) - 1] = '\0';
- return (host + 1);
- } else
- return host;
-}
-
void
toremote(targ, argc, argv)
char *targ, *argv[];
for (i = 0; i < argc - 1; i++) {
src = colon(argv[i]);
if (src) { /* remote to remote */
+ static char *ssh_options =
+ "-x -o'FallBackToRsh no' "
+ "-o'ClearAllForwardings yes'";
*src++ = 0;
if (*src == 0)
src = ".";
host = strchr(argv[i], '@');
len = strlen(ssh_program) + strlen(argv[i]) +
strlen(src) + (tuser ? strlen(tuser) : 0) +
- strlen(thost) + strlen(targ) + CMDNEEDS + 32;
+ strlen(thost) + strlen(targ) +
+ strlen(ssh_options) + CMDNEEDS + 20;
bp = xmalloc(len);
if (host) {
*host++ = 0;
suser = pwd->pw_name;
else if (!okname(suser))
continue;
- sprintf(bp,
- "%s%s -x -o'FallBackToRsh no' -n -l %s %s %s %s '%s%s%s:%s'",
+ snprintf(bp, len,
+ "%s%s %s -n "
+ "-l %s %s %s %s '%s%s%s:%s'",
ssh_program, verbose_mode ? " -v" : "",
- suser, host, cmd, src,
+ ssh_options, suser, host, cmd, src,
tuser ? tuser : "", tuser ? "@" : "",
thost, targ);
} else {
host = cleanhostname(argv[i]);
- sprintf(bp,
- "exec %s%s -x -o'FallBackToRsh no' -n %s %s %s '%s%s%s:%s'",
+ snprintf(bp, len,
+ "exec %s%s %s -n %s "
+ "%s %s '%s%s%s:%s'",
ssh_program, verbose_mode ? " -v" : "",
- host, cmd, src,
+ ssh_options, host, cmd, src,
tuser ? tuser : "", tuser ? "@" : "",
thost, targ);
}
if (remin == -1) {
len = strlen(targ) + CMDNEEDS + 20;
bp = xmalloc(len);
- (void) sprintf(bp, "%s -t %s", cmd, targ);
+ (void) snprintf(bp, len, "%s -t %s", cmd, targ);
host = cleanhostname(thost);
if (do_cmd(host, tuser, bp, &remin,
&remout, argc) < 0)
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,
+ (void) snprintf(bp, len, "exec %s%s%s %s %s", _PATH_CP,
iamrecursive ? " -r" : "", pflag ? " -p" : "",
argv[i], argv[argc - 1]);
if (verbose_mode)
host = cleanhostname(host);
len = strlen(src) + CMDNEEDS + 20;
bp = xmalloc(len);
- (void) sprintf(bp, "%s -f %s", cmd, src);
+ (void) snprintf(bp, len, "%s -f %s", cmd, src);
if (do_cmd(host, suser, bp, &remin, &remout, argc) < 0) {
(void) xfree(bp);
++errs;
struct stat stb;
static BUF buffer;
BUF *bp;
- off_t i;
- int amt, fd, haderr, indx, result;
+ off_t i, amt, result;
+ int fd, haderr, indx;
char *last, *name, buf[2048];
+ int len;
for (indx = 0; indx < argc; ++indx) {
name = argv[indx];
statbytes = 0;
+ len = strlen(name);
+ while (len > 1 && name[len-1] == '/')
+ name[--len] = '\0';
+ if (strchr(name, '\n') != NULL) {
+ run_err("%s: skipping, filename contains a newline",
+ name);
+ goto next;
+ }
if ((fd = open(name, O_RDONLY, 0)) < 0)
goto syserr;
if (fstat(fd, &stb) < 0) {
* Make it compatible with possible future
* versions expecting microseconds.
*/
- (void) sprintf(buf, "T%lu 0 %lu 0\n",
+ (void) snprintf(buf, sizeof buf, "T%lu 0 %lu 0\n",
(u_long) stb.st_mtime,
(u_long) stb.st_atime);
(void) atomicio(write, remout, buf, strlen(buf));
goto next;
}
#define FILEMODEMASK (S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
- sprintf(buf, "C%04o %lu %s\n",
+#ifdef HAVE_LONG_LONG_INT
+ snprintf(buf, sizeof buf, "C%04o %lld %s\n",
+ (u_int) (stb.st_mode & FILEMODEMASK),
+ (long long)stb.st_size, last);
+#else
+ /* XXX: Handle integer overflow? */
+ snprintf(buf, sizeof buf, "C%04o %lu %s\n",
(u_int) (stb.st_mode & FILEMODEMASK),
(u_long) stb.st_size, last);
+#endif
if (verbose_mode) {
fprintf(stderr, "Sending file modes: %s", buf);
fflush(stderr);
else
last++;
if (pflag) {
- (void) sprintf(path, "T%lu 0 %lu 0\n",
+ (void) snprintf(path, sizeof(path), "T%lu 0 %lu 0\n",
(u_long) statp->st_mtime,
(u_long) statp->st_atime);
(void) atomicio(write, remout, path, strlen(path));
return;
}
}
- (void) sprintf(path, "D%04o %d %.1024s\n",
+ (void) snprintf(path, sizeof path, "D%04o %d %.1024s\n",
(u_int) (statp->st_mode & FILEMODEMASK), 0, last);
if (verbose_mode)
fprintf(stderr, "Entering directory: %s", path);
closedir(dirp);
return;
}
- while ((dp = readdir(dirp))) {
+ while ((dp = readdir(dirp)) != NULL) {
if (dp->d_ino == 0)
continue;
if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
run_err("%s/%s: name too long", name, dp->d_name);
continue;
}
- (void) sprintf(path, "%s/%s", name, dp->d_name);
+ (void) snprintf(path, sizeof path, "%s/%s", name, dp->d_name);
vect[0] = path;
source(1, vect);
}
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 SCREWUP(str) { why = str; goto screwup; }
+#define atime tv[0]
+#define mtime tv[1]
+#define SCREWUP(str) do { why = str; goto screwup; } while (0)
setimes = targisdir = 0;
mask = umask(0);
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);
- if (*cp++ != ' ')
+ mtime.tv_sec = strtol(cp, &cp, 10);
+ if (!cp || *cp++ != ' ')
SCREWUP("mtime.sec not delimited");
- getnum(dummy_usec);
- tv[1].tv_usec = 0;
- if (*cp++ != ' ')
+ mtime.tv_usec = strtol(cp, &cp, 10);
+ if (!cp || *cp++ != ' ')
SCREWUP("mtime.usec not delimited");
- getnum(tv[0].tv_sec);
- if (*cp++ != ' ')
+ atime.tv_sec = strtol(cp, &cp, 10);
+ if (!cp || *cp++ != ' ')
SCREWUP("atime.sec not delimited");
- getnum(dummy_usec);
- tv[0].tv_usec = 0;
- if (*cp++ != '\0')
+ atime.tv_usec = strtol(cp, &cp, 10);
+ if (!cp || *cp++ != '\0')
SCREWUP("atime.usec not delimited");
(void) atomicio(write, remout, "", 1);
continue;
if (*cp++ != ' ')
SCREWUP("mode not delimited");
- for (size = 0; *cp >= '0' && *cp <= '9';)
+ for (size = 0; isdigit(*cp);)
size = size * 10 + (*cp++ - '0');
if (*cp++ != ' ')
SCREWUP("size not delimited");
size_t need;
need = strlen(targ) + strlen(cp) + 250;
- if (need > cursize)
+ if (need > cursize) {
+ if (namebuf)
+ xfree(namebuf);
namebuf = xmalloc(need);
- (void) sprintf(namebuf, "%s%s%s", targ,
- *targ ? "/" : "", cp);
+ cursize = need;
+ }
+ (void) snprintf(namebuf, need, "%s%s%s", targ,
+ strcmp(targ, "/") ? "/" : "", cp);
np = namebuf;
} else
np = targ;
if (mkdir(np, mode | S_IRWXU) < 0)
goto bad;
}
- vect[0] = np;
+ vect[0] = xstrdup(np);
sink(1, vect);
if (setimes) {
setimes = 0;
- if (utimes(np, tv) < 0)
+ if (utimes(vect[0], tv) < 0)
run_err("%s: set times: %s",
- np, strerror(errno));
+ vect[0], strerror(errno));
}
if (mod_flag)
- (void) chmod(np, mode);
+ (void) chmod(vect[0], mode);
+ if (vect[0])
+ xfree(vect[0]);
continue;
}
omode = mode;
mode |= S_IWRITE;
- if ((ofd = open(np, O_WRONLY | O_CREAT | O_TRUNC, mode)) < 0) {
+ if ((ofd = open(np, O_WRONLY|O_CREAT, mode)) < 0) {
bad: run_err("%s: %s", np, strerror(errno));
continue;
}
count += amt;
do {
j = read(remin, cp, amt);
- if (j == -1 && (errno == EINTR || errno == EAGAIN)) {
+ if (j == -1 && (errno == EINTR ||
+ errno == EAGAIN)) {
continue;
} else if (j <= 0) {
run_err("%s", j ? strerror(errno) :
- "dropped connection");
+ "dropped connection");
exit(1);
}
amt -= j;
wrerr = YES;
wrerrno = j >= 0 ? EIO : errno;
}
-#if 0
if (ftruncate(ofd, size)) {
run_err("%s: truncate: %s", np, strerror(errno));
wrerr = DISPLAYED;
}
-#endif
if (pflag) {
if (exists || omode != mode)
#ifdef HAVE_FCHMOD
if (chmod(np, omode))
#endif /* HAVE_FCHMOD */
run_err("%s: set mode: %s",
- np, strerror(errno));
+ np, strerror(errno));
} else {
if (!exists && omode != mode)
#ifdef HAVE_FCHMOD
if (chmod(np, omode & ~mask))
#endif /* HAVE_FCHMOD */
run_err("%s: set mode: %s",
- np, strerror(errno));
+ np, strerror(errno));
}
if (close(ofd) == -1) {
wrerr = YES;
setimes = 0;
if (utimes(np, tv) < 0) {
run_err("%s: set times: %s",
- np, strerror(errno));
+ np, strerror(errno));
wrerr = DISPLAYED;
}
}
}
int
-response()
+response(void)
{
char ch, *cp, resp, rbuf[2048];
}
void
-usage()
+usage(void)
{
- (void) fprintf(stderr, "usage: scp "
- "[-pqrvC46] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2; or:\n"
- " scp [options] f1 ... fn directory\n");
+ (void) fprintf(stderr,
+ "usage: scp [-pqrvBC46] [-F config] [-S ssh] [-P port] [-c cipher] [-i identity]\n"
+ " [-o option] f1 f2\n"
+ " or: scp [options] f1 ... fn directory\n");
exit(1);
}
}
}
-char *
-colon(cp)
- char *cp;
-{
- int flag = 0;
-
- if (*cp == ':') /* Leading colon is part of file name. */
- return (0);
- if (*cp == '[')
- flag = 1;
-
- for (; *cp; ++cp) {
- if (*cp == '@' && *(cp+1) == '[')
- flag = 1;
- if (*cp == ']' && *(cp+1) == ':' && flag)
- return (cp+1);
- if (*cp == ':' && !flag)
- return (cp);
- if (*cp == '/')
- return (0);
- }
- return (0);
-}
-
void
verifydir(cp)
char *cp;
cp = cp0;
do {
- c = *cp;
+ c = (int)*cp;
if (c & 0200)
goto bad;
if (!isalpha(c) && !isdigit(c) &&
int fd, blksize;
{
size_t size;
-#ifdef HAVE_ST_BLKSIZE
+#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
struct stat stb;
if (fstat(fd, &stb) < 0) {
else
size = blksize + (stb.st_blksize - blksize % stb.st_blksize) %
stb.st_blksize;
-#else /* HAVE_ST_BLKSIZE */
- size = blksize;
-#endif /* HAVE_ST_BLKSIZE */
+#else /* HAVE_STRUCT_STAT_ST_BLKSIZE */
+ size = blksize;
+#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */
if (bp->cnt >= size)
return (bp);
if (bp->buf == NULL)
bp->buf = xmalloc(size);
else
bp->buf = xrealloc(bp->buf, size);
+ memset(bp->buf, 0, size);
bp->cnt = size;
return (bp);
}
int signo;
{
if (!iamremote)
- fprintf(stderr, "lost connection\n");
- exit(1);
-}
-
-
-void
-alarmtimer(int wait)
-{
- struct itimerval itv;
-
- itv.it_value.tv_sec = wait;
- itv.it_value.tv_usec = 0;
- itv.it_interval = itv.it_value;
- setitimer(ITIMER_REAL, &itv, NULL);
+ write(STDERR_FILENO, "lost connection\n", 16);
+ if (signo)
+ _exit(1);
+ else
+ exit(1);
}
-void
+static void
updateprogressmeter(int ignore)
{
int save_errno = errno;
progressmeter(0);
+ signal(SIGALRM, updateprogressmeter);
+ alarm(PROGRESSTIME);
errno = save_errno;
}
-int
-foregroundproc()
+static int
+foregroundproc(void)
{
static pid_t pgrp = -1;
int ctty_pgrp;
if (pgrp == -1)
pgrp = getpgrp();
-#ifdef HAVE_CYGWIN
- /*
- * Cygwin only supports tcgetpgrp() for getting the controlling tty
- * currently.
- */
+#ifdef HAVE_TCGETPGRP
return ((ctty_pgrp = tcgetpgrp(STDOUT_FILENO)) != -1 &&
ctty_pgrp == pgrp);
#else
off_t cursize, abbrevsize;
double elapsed;
int ratio, barlength, i, remaining;
- char buf[256];
+ char buf[512];
if (flag == -1) {
(void) gettimeofday(&start, (struct timezone *) 0);
snprintf(buf, sizeof(buf), "\r%-20.20s %3d%% ", curfile, ratio);
barlength = getttywidth() - 51;
- barlength = (barlength <= MAX_BARLENGTH)?barlength:MAX_BARLENGTH;
if (barlength > 0) {
i = barlength * ratio / 100;
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
- "|%.*s%*s|", i, BAR, barlength - i, "");
+ "|%.*s%*s|", i,
+ "*******************************************************"
+ "*******************************************************"
+ "*******************************************************"
+ "*******************************************************"
+ "*******************************************************"
+ "*******************************************************"
+ "*******************************************************",
+ barlength - i, "");
}
i = 0;
abbrevsize = cursize;
i++;
abbrevsize >>= 10;
}
- snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5d %c%c ",
- (int) abbrevsize, prefixes[i], prefixes[i] == ' ' ? ' ' : 'B');
+ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5lu %c%c ",
+ (unsigned long) abbrevsize, prefixes[i],
+ prefixes[i] == ' ' ? ' ' : 'B');
timersub(&now, &lastupdate, &wait);
if (cursize > lastsize) {
atomicio(write, fileno(stdout), buf, strlen(buf));
if (flag == -1) {
- struct sigaction sa;
- sa.sa_handler = updateprogressmeter;
- sigemptyset((sigset_t *)&sa.sa_mask);
-#ifdef SA_RESTART
- sa.sa_flags = SA_RESTART;
-#endif
- sigaction(SIGALRM, &sa, NULL);
- alarmtimer(1);
+ mysignal(SIGALRM, updateprogressmeter);
+ alarm(PROGRESSTIME);
} else if (flag == 1) {
- alarmtimer(0);
+ alarm(0);
atomicio(write, fileno(stdout), "\n", 1);
statbytes = 0;
}
else
return (80);
}
-
-void
-addargs(char *fmt, ...)
-{
- va_list ap;
- char buf[1024];
-
- va_start(ap, fmt);
- vsnprintf(buf, sizeof(buf), fmt, ap);
- va_end(ap);
-
- if (args.list == NULL) {
- args.nalloc = 32;
- args.num = 0;
- args.list = xmalloc(args.nalloc * sizeof(char *));
- } else if (args.num+2 >= args.nalloc) {
- args.nalloc *= 2;
- args.list = xrealloc(args.list, args.nalloc * sizeof(char *));
- }
- args.list[args.num++] = xstrdup(buf);
- args.list[args.num] = NULL;
-}
andersk / openssh.git / blobdiff