diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-06 18:29:59 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-06 18:29:59 +0000 |
commit | de3895d580cd9748d48f414a81f740451b34e850 (patch) | |
tree | 84d60a87f87e3e846fc9c035514db3bdbb642869 | |
parent | 8d6017566c99387fa52d6f5a09af2be5407acf29 (diff) |
- mouring@cvs.openbsd.org 2002/04/06 18:24:09
[scp.c]
Fixes potental double // within path.
http://bugzilla.mindrot.org/show_bug.cgi?id=76
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | scp.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -7,6 +7,10 @@ | |||
7 | [sftp-client.c] | 7 | [sftp-client.c] |
8 | Fix occasional corruption on upload due to bad reuse of request id, spotted | 8 | Fix occasional corruption on upload due to bad reuse of request id, spotted |
9 | by chombier@mac.com; ok markus@ | 9 | by chombier@mac.com; ok markus@ |
10 | - mouring@cvs.openbsd.org 2002/04/06 18:24:09 | ||
11 | [scp.c] | ||
12 | Fixes potental double // within path. | ||
13 | http://bugzilla.mindrot.org/show_bug.cgi?id=76 | ||
10 | - (bal) Slight update to OpenSC support. Better version checking. patch | 14 | - (bal) Slight update to OpenSC support. Better version checking. patch |
11 | by Juha Yrjölä <jyrjola@cc.hut.fi> | 15 | by Juha Yrjölä <jyrjola@cc.hut.fi> |
12 | 16 | ||
@@ -8179,4 +8183,4 @@ | |||
8179 | - Wrote replacements for strlcpy and mkdtemp | 8183 | - Wrote replacements for strlcpy and mkdtemp |
8180 | - Released 1.0pre1 | 8184 | - Released 1.0pre1 |
8181 | 8185 | ||
8182 | $Id: ChangeLog,v 1.2029 2002/04/06 18:19:38 mouring Exp $ | 8186 | $Id: ChangeLog,v 1.2030 2002/04/06 18:29:59 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.87 2002/03/30 17:45:46 deraadt Exp $"); | 78 | RCSID("$OpenBSD: scp.c,v 1.88 2002/04/06 18:24:09 mouring Exp $"); |
79 | 79 | ||
80 | #include "xmalloc.h" | 80 | #include "xmalloc.h" |
81 | #include "atomicio.h" | 81 | #include "atomicio.h" |
@@ -774,7 +774,7 @@ sink(argc, argv) | |||
774 | cursize = need; | 774 | cursize = need; |
775 | } | 775 | } |
776 | (void) snprintf(namebuf, need, "%s%s%s", targ, | 776 | (void) snprintf(namebuf, need, "%s%s%s", targ, |
777 | *targ ? "/" : "", cp); | 777 | strcmp(targ, "/") ? "/" : "", cp); |
778 | np = namebuf; | 778 | np = namebuf; |
779 | } else | 779 | } else |
780 | np = targ; | 780 | np = targ; |