*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.64 2001/03/28 20:04:38 stevesk Exp $");
+RCSID("$OpenBSD: scp.c,v 1.68 2001/04/22 12:34:05 markus Exp $");
#include "xmalloc.h"
#include "atomicio.h"
#include "pathnames.h"
#include "log.h"
#include "misc.h"
+#include "scp-common.h"
#ifdef HAVE___PROGNAME
extern char *__progname;
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;
} BUF;
BUF *allocbuf(BUF *, int, int);
-char *colon(char *);
void lostconn(int);
void nospace(void);
int okname(char *);
void sink(int, char *[]);
void source(int, char *[]);
void tolocal(int, char *[]);
-char *cleanhostname(char *);
void toremote(char *, int, char *[]);
void usage(void);
case 't': /* "to" */
iamremote = 1;
tflag = 1;
+#ifdef HAVE_CYGWIN
+ setmode(0, O_BINARY);
+#endif
break;
default:
usage();
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[];
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 ((fd = open(name, O_RDONLY, 0)) < 0)
goto syserr;
if (fstat(fd, &stb) < 0) {
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;
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;
}
}
-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;