From owner-freebsd-bugs@FreeBSD.ORG  Wed Mar 19 08:20:04 2008
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27AF2106564A
	for <freebsd-bugs@hub.freebsd.org>;
	Wed, 19 Mar 2008 08:20:04 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 052168FC13
	for <freebsd-bugs@hub.freebsd.org>;
	Wed, 19 Mar 2008 08:20:04 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m2J8K3Df079350
	for <freebsd-bugs@freefall.freebsd.org>; Wed, 19 Mar 2008 08:20:03 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m2J8K3Rj079349;
	Wed, 19 Mar 2008 08:20:03 GMT (envelope-from gnats)
Date: Wed, 19 Mar 2008 08:20:03 GMT
Message-Id: <200803190820.m2J8K3Rj079349@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Jaakko Heinonen <jh@saunalahti.fi>
Cc: 
Subject: Re: bin/120256: ftp(1): ftp -u URL/<file> <file> returns a -1 exit
	code on success
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Jaakko Heinonen <jh@saunalahti.fi>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Mar 2008 08:20:04 -0000

The following reply was made to PR bin/120256; it has been noted by GNATS.

From: Jaakko Heinonen <jh@saunalahti.fi>
To: bug-followup@FreeBSD.org, minear@securecomputing.com
Cc:  
Subject: Re: bin/120256: ftp(1): ftp -u URL/<file> <file> returns a -1 exit
	code on success
Date: Wed, 19 Mar 2008 10:17:47 +0200

 --n8g4imXOkfNTN/H1
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 
 Attached patch implements the suggested change. Can you please verify
 that it works as expected.
 
 -- 
 Jaakko
 
 --n8g4imXOkfNTN/H1
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="lukemftp-return-code.diff"
 
 Index: fetch.c
 ===================================================================
 RCS file: /home/ncvs/src/contrib/lukemftp/src/fetch.c,v
 retrieving revision 1.1.1.8
 diff -p -u -r1.1.1.8 fetch.c
 --- fetch.c	17 May 2005 03:11:26 -0000	1.1.1.8
 +++ fetch.c	19 Mar 2008 08:07:51 -0000
 @@ -1819,12 +1819,11 @@ auto_put(int argc, char **argv, const ch
  	if (uargc == 3) {
  		uargv[1] = argv[0];
  		put(uargc, uargv);
 -		goto cleanup_auto_put;
 -	}
 -
 -	for(; argv[0] != NULL; argv++) {
 -		uargv[1] = argv[0];
 -		mput(uargc, uargv);
 +	} else {
 +		for(; argv[0] != NULL; argv++) {
 +			uargv[1] = argv[0];
 +			mput(uargc, uargv);
 +		}
  	}
  	rval = 0;
  
 
 --n8g4imXOkfNTN/H1--