svn commit: r219298 - stable/7/contrib/lukemftp/src

[Bruce Cran]

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);