Date: Sun, 27 Feb 2011 10:13:16 +0000 (UTC) From: Bruce Cran <brucec@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r219081 - head/contrib/lukemftp/src Message-ID: <201102271013.p1RADGfF071412@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102271013.p1RADGfF071412>