From owner-svn-src-stable-7@FreeBSD.ORG Sat Mar 5 04:18:29 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76508106564A; Sat, 5 Mar 2011 04:18:29 +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 632018FC12; Sat, 5 Mar 2011 04:18:29 +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 p254ITTT005364; Sat, 5 Mar 2011 04:18:29 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p254ITht005362; Sat, 5 Mar 2011 04:18:29 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201103050418.p254ITht005362@svn.freebsd.org> From: Bruce Cran Date: Sat, 5 Mar 2011 04:18:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219298 - stable/7/contrib/lukemftp/src X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Mar 2011 04:18:29 -0000 Author: brucec Date: Sat Mar 5 04:18:29 2011 New Revision: 219298 URL: http://svn.freebsd.org/changeset/base/219298 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/7/contrib/lukemftp/src/main.c Directory Properties: stable/7/contrib/lukemftp/ (props changed) Modified: stable/7/contrib/lukemftp/src/main.c ============================================================================== --- stable/7/contrib/lukemftp/src/main.c Sat Mar 5 04:15:46 2011 (r219297) +++ stable/7/contrib/lukemftp/src/main.c Sat Mar 5 04:18:29 2011 (r219298) @@ -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);