From: dtucker <dtucker>
Date: Fri, 18 Jun 2004 06:23:43 +0000 (+0000)
Subject:    - dtucker@cvs.openbsd.org 2004/06/18 06:13:25
X-Git-Tag: V_3_9_P1~109
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/35e499155411c86afd6a50f57de603e7e50aa49d

   - dtucker@cvs.openbsd.org 2004/06/18 06:13:25
     [sftp.c]
     Use execvp instead of execv so sftp -S ssh works.  "makes sense" markus@
---

diff --git a/ChangeLog b/ChangeLog
index 6c6b47e7..201338cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
    - djm@cvs.openbsd.org 2004/06/17 23:56:57
      [ssh.1 ssh.c]
      sync usage() and SYNPOSIS with connection sharing changes
+   - dtucker@cvs.openbsd.org 2004/06/18 06:13:25
+     [sftp.c]
+     Use execvp instead of execv so sftp -S ssh works.  "makes sense" markus@
 
 20040617
  - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
diff --git a/sftp.c b/sftp.c
index dca5505d..1e216be7 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.48 2004/06/03 12:22:20 pedro Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.49 2004/06/18 06:13:25 dtucker Exp $");
 
 #include "buffer.h"
 #include "xmalloc.h"
@@ -1279,7 +1279,7 @@ connect_to_server(char *path, char **args, int *in, int *out)
 		 * kill it too
 		 */
 		signal(SIGINT, SIG_IGN);
-		execv(path, args);
+		execvp(path, args);
 		fprintf(stderr, "exec: %s: %s\n", path, strerror(errno));
 		_exit(1);
 	}