diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | scp.c | 6 |
2 files changed, 11 insertions, 3 deletions
@@ -15,6 +15,12 @@ | |||
15 | - markus@cvs.openbsd.org 2001/02/10 12:44:02 | 15 | - markus@cvs.openbsd.org 2001/02/10 12:44:02 |
16 | [cli.c] | 16 | [cli.c] |
17 | don't call vis() for \r | 17 | don't call vis() for \r |
18 | - danh@cvs.openbsd.org 2001/02/10 0:12:43 | ||
19 | [scp.c] | ||
20 | revert a small change to allow -r option to work again; ok deraadt@ | ||
21 | - danh@cvs.openbsd.org 2001/02/10 15:14:11 | ||
22 | [scp.c] | ||
23 | fix memory leak; ok markus@ | ||
18 | 24 | ||
19 | 20010210 | 25 | 20010210 |
20 | - (djm) Sync sftp and scp stuff from OpenBSD: | 26 | - (djm) Sync sftp and scp stuff from OpenBSD: |
@@ -3798,4 +3804,4 @@ | |||
3798 | - Wrote replacements for strlcpy and mkdtemp | 3804 | - Wrote replacements for strlcpy and mkdtemp |
3799 | - Released 1.0pre1 | 3805 | - Released 1.0pre1 |
3800 | 3806 | ||
3801 | $Id: ChangeLog,v 1.717 2001/02/10 21:45:02 mouring Exp $ | 3807 | $Id: ChangeLog,v 1.718 2001/02/10 21:50:00 mouring Exp $ |
@@ -75,7 +75,7 @@ | |||
75 | */ | 75 | */ |
76 | 76 | ||
77 | #include "includes.h" | 77 | #include "includes.h" |
78 | RCSID("$OpenBSD: scp.c,v 1.56 2001/02/08 19:30:52 itojun Exp $"); | 78 | RCSID("$OpenBSD: scp.c,v 1.58 2001/02/10 15:14:11 danh Exp $"); |
79 | 79 | ||
80 | #include "xmalloc.h" | 80 | #include "xmalloc.h" |
81 | #include "atomicio.h" | 81 | #include "atomicio.h" |
@@ -799,8 +799,10 @@ sink(argc, argv) | |||
799 | if (mkdir(np, mode | S_IRWXU) < 0) | 799 | if (mkdir(np, mode | S_IRWXU) < 0) |
800 | goto bad; | 800 | goto bad; |
801 | } | 801 | } |
802 | vect[0] = np; | 802 | vect[0] = xstrdup(np); |
803 | sink(1, vect); | 803 | sink(1, vect); |
804 | if (vect[0]) | ||
805 | xfree(vect[0]); | ||
804 | if (setimes) { | 806 | if (setimes) { |
805 | setimes = 0; | 807 | setimes = 0; |
806 | if (utimes(np, tv) < 0) | 808 | if (utimes(np, tv) < 0) |