diff options
| author |   deraadt <deraadt@openbsd.org> | 1996-08-02 12:17:04 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1996-08-02 12:17:04 +0000 |
| commit | 13c5c611fbfdc06505f442f6adc90c56b08d2352 (patch) | |
| tree | 771942115bb4032bc405b619a6db39013b952040 | |
| parent | vmin/vtime may print 255 (_POSIX_VDISABLE) (diff) | |
| download | wireguard-openbsd-13c5c611fbfdc06505f442f6adc90c56b08d2352.tar.xz wireguard-openbsd-13c5c611fbfdc06505f442f6adc90c56b08d2352.zip | |
more robust deliting, and handle negative timestamps; from freebsd
| -rw-r--r-- | bin/rcp/rcp.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index 4223da3fd80..3160a6584f4 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -1,5 +1,5 @@ /* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */ -/* $OpenBSD: rcp.c,v 1.4 1996/03/02 00:35:17 tholo Exp $ */ +/* $OpenBSD: rcp.c,v 1.5 1996/08/02 12:17:04 deraadt Exp $ */ /* * Copyright (c) 1983, 1990, 1992, 1993 @@ -581,22 +581,21 @@ sink(argc, argv) if (ch == '\n') *--cp = 0; -#define getnum(t) (t) = 0; while (isdigit(*cp)) (t) = (t) * 10 + (*cp++ - '0'); cp = buf; if (*cp == 'T') { setimes++; cp++; - getnum(mtime.tv_sec); - if (*cp++ != ' ') + mtime.tv_sec = strtol(cp, &cp, 10); + if (!cp || *cp++ != ' ') SCREWUP("mtime.sec not delimited"); - getnum(mtime.tv_usec); - if (*cp++ != ' ') + mtime.tv_usec = strtol(cp, &cp, 10); + if (!cp || *cp++ != ' ') SCREWUP("mtime.usec not delimited"); - getnum(atime.tv_sec); - if (*cp++ != ' ') + atime.tv_sec = strtol(cp, &cp, 10); + if (!cp || *cp++ != ' ') SCREWUP("atime.sec not delimited"); - getnum(atime.tv_usec); - if (*cp++ != '\0') + atime.tv_usec = strtol(cp, &cp, 10); + if (!cp || *cp++ != '\0') SCREWUP("atime.usec not delimited"); (void)write(rem, "", 1); continue; |