mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-12 04:24:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

- danh@cvs.openbsd.org 2001/02/10 0:12:43

Browse Source 
[scp.c]
     revert a small change to allow -r option to work again; ok deraadt@
   - danh@cvs.openbsd.org 2001/02/10 15:14:11
     [scp.c]
     fix memory leak; ok markus@
This commit is contained in:
Ben Lindstrom 2001-02-10 21:50:00 +00:00
parent fdc9ab08f7
commit 550bc54cba
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -15,6 +15,12 @@
- markus@cvs.openbsd.org 2001/02/10 12:44:02 - markus@cvs.openbsd.org 2001/02/10 12:44:02
[cli.c] [cli.c]
don't call vis() for \r don't call vis() for \r
- danh@cvs.openbsd.org 2001/02/10 0:12:43
[scp.c]
revert a small change to allow -r option to work again; ok deraadt@
- danh@cvs.openbsd.org 2001/02/10 15:14:11
[scp.c]
fix memory leak; ok markus@
20010210 20010210
- (djm) Sync sftp and scp stuff from OpenBSD: - (djm) Sync sftp and scp stuff from OpenBSD:
@ -3798,4 +3804,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.717 2001/02/10 21:45:02 mouring Exp $ $Id: ChangeLog,v 1.718 2001/02/10 21:50:00 mouring Exp $

6
scp.c
View File

@ -75,7 +75,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: scp.c,v 1.56 2001/02/08 19:30:52 itojun Exp $"); RCSID("$OpenBSD: scp.c,v 1.58 2001/02/10 15:14:11 danh Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "atomicio.h" #include "atomicio.h"
@ -799,8 +799,10 @@ sink(argc, argv)
if (mkdir(np, mode | S_IRWXU) < 0) if (mkdir(np, mode | S_IRWXU) < 0)
goto bad; goto bad;
} }
vect[0] = np; vect[0] = xstrdup(np);
sink(1, vect); sink(1, vect);
if (vect[0])
xfree(vect[0]);
if (setimes) { if (setimes) {
setimes = 0; setimes = 0;
if (utimes(np, tv) < 0) if (utimes(np, tv) < 0)