[scp.c]
     slightly better care
This commit is contained in:
Ben Lindstrom 2001-06-25 04:28:30 +00:00
parent 6ab6486273
commit 7d5ed3a07b
2 changed files with 7 additions and 4 deletions

View File

@ -35,6 +35,9 @@
- markus@cvs.openbsd.org 2001/06/22 23:35:21 - markus@cvs.openbsd.org 2001/06/22 23:35:21
[ssh.c] [ssh.c]
don't overwrite argv (fixes ssh user@host in 'ps'), report by ericj@ 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 20010622
- (stevesk) handle systems without pw_expire and pw_change. - (stevesk) handle systems without pw_expire and pw_change.
@ -5719,4 +5722,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

6
scp.c
View File

@ -75,7 +75,7 @@
*/ */
#include "includes.h" #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 "xmalloc.h"
#include "atomicio.h" #include "atomicio.h"
@ -662,7 +662,7 @@ sink(argc, argv)
#define atime tv[0] #define atime tv[0]
#define mtime tv[1] #define mtime tv[1]
#define SCREWUP(str) { why = str; goto screwup; } #define SCREWUP(str) do { why = str; goto screwup; } while (0)
setimes = targisdir = 0; setimes = targisdir = 0;
mask = umask(0); mask = umask(0);
@ -1003,7 +1003,7 @@ okname(cp0)
cp = cp0; cp = cp0;
do { do {
c = *cp; c = (int)*cp;
if (c & 0200) if (c & 0200)
goto bad; goto bad;
if (!isalpha(c) && !isdigit(c) && if (!isalpha(c) && !isdigit(c) &&