From bd12f1741e9ea6432d5ca7006c4cf2553aebbdbf Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 18 Jun 2004 16:23:43 +1000 Subject: - 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@ --- ChangeLog | 5 ++++- sftp.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a24d8812..56c49b6ce 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 @@ -1289,4 +1292,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3409 2004/06/18 06:22:39 dtucker Exp $ +$Id: ChangeLog,v 1.3410 2004/06/18 06:23:43 dtucker Exp $ diff --git a/sftp.c b/sftp.c index dca5505d0..1e216be7d 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); } -- cgit v1.2.3