From owner-svn-src-all@FreeBSD.ORG Sat Mar 5 04:15:46 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B2667106566C;
Sat, 5 Mar 2011 04:15:46 +0000 (UTC)
(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 9EC668FC0A;
Sat, 5 Mar 2011 04:15:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p254FkBB005074;
Sat, 5 Mar 2011 04:15:46 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id p254Fkei005072;
Sat, 5 Mar 2011 04:15:46 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201103050415.p254Fkei005072@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sat, 5 Mar 2011 04:15:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r219297 - stable/8/contrib/lukemftp/src
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Mar 2011 04:15:46 -0000
Author: brucec
Date: Sat Mar 5 04:15:46 2011
New Revision: 219297
URL: http://svn.freebsd.org/changeset/base/219297
Log:
MFC r219081:
Merge fix from r1.108 of NetBSD's usr.bin/ftp/main.c:
Only attempt to el_parse() a command unknown by the default parser
if editing is enabled.
PR: bin/100089
Modified:
stable/8/contrib/lukemftp/src/main.c
Directory Properties:
stable/8/contrib/lukemftp/ (props changed)
Modified: stable/8/contrib/lukemftp/src/main.c
==============================================================================
--- stable/8/contrib/lukemftp/src/main.c Sat Mar 5 04:11:06 2011 (r219296)
+++ stable/8/contrib/lukemftp/src/main.c Sat Mar 5 04:15:46 2011 (r219297)
@@ -707,6 +707,7 @@ cmdscanner(void)
* such commands as invalid.
*/
if (strchr(margv[0], ':') != NULL ||
+ !editing ||
el_parse(el, margc, (const char **)margv) != 0)
#endif /* !NO_EDITCOMPLETE */
fputs("?Invalid command.\n", ttyout);