From 7d5ed3a07b0f00e961d636514ac42d4f1bc57a3e Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 25 Jun 2001 04:28:30 +0000 Subject: - deraadt@cvs.openbsd.org 2001/06/23 00:16:16 [scp.c] slightly better care --- ChangeLog | 5 ++++- scp.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b733b4601..5f29306fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,9 @@ - markus@cvs.openbsd.org 2001/06/22 23:35:21 [ssh.c] don't overwrite argv (fixes ssh user@host in 'ps'), report by ericj@ + - deraadt@cvs.openbsd.org 2001/06/23 00:16:16 + [scp.c] + slightly better care 20010622 - (stevesk) handle systems without pw_expire and pw_change. @@ -5719,4 +5722,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1305 2001/06/25 04:26:55 mouring Exp $ +$Id: ChangeLog,v 1.1306 2001/06/25 04:28:30 mouring Exp $ diff --git a/scp.c b/scp.c index 2ca48dd57..1a83a298f 100644 --- a/scp.c +++ b/scp.c @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.74 2001/06/16 08:57:35 markus Exp $"); +RCSID("$OpenBSD: scp.c,v 1.75 2001/06/23 00:16:16 deraadt Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -662,7 +662,7 @@ sink(argc, argv) #define atime tv[0] #define mtime tv[1] -#define SCREWUP(str) { why = str; goto screwup; } +#define SCREWUP(str) do { why = str; goto screwup; } while (0) setimes = targisdir = 0; mask = umask(0); @@ -1003,7 +1003,7 @@ okname(cp0) cp = cp0; do { - c = *cp; + c = (int)*cp; if (c & 0200) goto bad; if (!isalpha(c) && !isdigit(c) && -- cgit v1.2.3