From 3003050ebbb679a4d73c6463a7139bf94d12e740 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 9 Jan 2020 18:25:49 +0000 Subject: [PATCH] Remove readline support from nslookup. OK millert, deraadt --- usr.sbin/bind/bin/dig/nslookup.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/usr.sbin/bind/bin/dig/nslookup.c b/usr.sbin/bind/bin/dig/nslookup.c index 19e78e44def..2acabc9b670 100644 --- a/usr.sbin/bind/bin/dig/nslookup.c +++ b/usr.sbin/bind/bin/dig/nslookup.c @@ -42,22 +42,6 @@ #include -#if defined(HAVE_READLINE) -#if defined(HAVE_EDIT_READLINE_READLINE_H) -#include -#if defined(HAVE_EDIT_READLINE_HISTORY_H) -#include -#endif -#elif defined(HAVE_EDITLINE_READLINE_H) -#include -#elif defined(HAVE_READLINE_READLINE_H) -#include -#if defined (HAVE_READLINE_HISTORY_H) -#include -#endif -#endif -#endif - static isc_boolean_t short_form = ISC_TRUE, tcpmode = ISC_FALSE, identify = ISC_FALSE, stats = ISC_TRUE, @@ -789,15 +773,9 @@ get_next_command(void) { fatal("memory allocation failure"); isc_app_block(); if (interactive) { -#ifdef HAVE_READLINE - ptr = readline("> "); - if (ptr != NULL) - add_history(ptr); -#else fputs("> ", stderr); fflush(stderr); ptr = fgets(buf, COMMSIZE, stdin); -#endif } else ptr = fgets(buf, COMMSIZE, stdin); isc_app_unblock(); @@ -805,10 +783,6 @@ get_next_command(void) { in_use = ISC_FALSE; } else do_next_command(ptr); -#ifdef HAVE_READLINE - if (interactive) - free(ptr); -#endif isc_mem_free(mctx, buf); }