- 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

diff --git a/ChangeLog b/ChangeLog
index e1470da0ead57c92e4f9f5279b50863e12386467..981ebfad51dffe773e43c1fd76fc15defe4ea6df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
      [sftp-client.c]
      Fix occasional corruption on upload due to bad reuse of request id, spotted
      by chombier@mac.com; ok markus@
+   - 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
  - (bal) Slight update to OpenSC support.  Better version checking. patch
    by Juha Yrjölä <jyrjola@cc.hut.fi> 
 

diff --git a/scp.c b/scp.c
index fcf55abde44bfcaa82295235cfde9137b0b7c139..1fab48385688c1289b6c8ff473af3c699d91c11a 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.87 2002/03/30 17:45:46 deraadt Exp $");
+RCSID("$OpenBSD: scp.c,v 1.88 2002/04/06 18:24:09 mouring Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -774,7 +774,7 @@ sink(argc, argv)
                                cursize = need;
                        }
                        (void) snprintf(namebuf, need, "%s%s%s", targ,
-                           *targ ? "/" : "", cp);
+                           strcmp(targ, "/") ? "/" : "", cp);
                        np = namebuf;
                } else
                        np = targ;