From owner-svn-src-head@FreeBSD.ORG  Sun Feb 27 10:13:17 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2CB031065672;
	Sun, 27 Feb 2011 10:13:17 +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 1B75E8FC14;
	Sun, 27 Feb 2011 10:13:17 +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 p1RADHJ1071414;
	Sun, 27 Feb 2011 10:13:17 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1RADGfF071412;
	Sun, 27 Feb 2011 10:13:16 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201102271013.p1RADGfF071412@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sun, 27 Feb 2011 10:13:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219081 - head/contrib/lukemftp/src
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Feb 2011 10:13:17 -0000

Author: brucec
Date: Sun Feb 27 10:13:16 2011
New Revision: 219081
URL: http://svn.freebsd.org/changeset/base/219081

Log:
  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
  MFC after:	3 days

Modified:
  head/contrib/lukemftp/src/main.c

Modified: head/contrib/lukemftp/src/main.c
==============================================================================
--- head/contrib/lukemftp/src/main.c	Sun Feb 27 09:12:24 2011	(r219080)
+++ head/contrib/lukemftp/src/main.c	Sun Feb 27 10:13:16 2011	(r219081)
@@ -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);