mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Move the <isc/readline.h> header to bin/dig/readline.h

Browse Source 
The <isc/readline.h> header provided a compatibility shim to use when
other non-GNU readline libraries are in use.  The two places where
readline library is being used is nslookup and nsupdate, so the header
file has been moved to bin/dig directory and it's directly included from
bin/nsupdate.

This also conceals any readline headers exposed from the libisc headers.
This commit is contained in:
Ondřej Surý
2021-02-11 14:13:27 +01:00
committed by Mark Andrews
parent 00b5f4c389
commit d1448a4c2a
8 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/dig/Makefile.am
View File

@@ -25,10 +25,15 @@ libdighost_la_SOURCES = \
bin_PROGRAMS = dig host nslookup
nslookup_CPPFLAGS = \
$(AM_CPPFLAGS)
nslookup_LDADD = \
$(LDADD)
if HAVE_READLINE
nslookup_CPPFLAGS += \
$(READLINE_CFLAGS)
nslookup_LDADD += \
$(READLINE_LIBS)
endif HAVE_READLINE

1
bin/dig/include/.clang-format
View File

@@ -1 +0,0 @@
../../../.clang-format.headers

2
bin/dig/nslookup.c
View File

@@ -22,7 +22,6 @@
#include <isc/netaddr.h>
#include <isc/parseint.h>
#include <isc/print.h>
#include <isc/readline.h>
#include <isc/string.h>
#include <isc/task.h>
#include <isc/util.h>
@@ -38,6 +37,7 @@
#include <dns/rdatatype.h>
#include "dighost.h"
#include "readline.h"
static bool short_form = true, tcpmode = false, tcpmode_set = false,
identify = false, stats = true, comments = true,

0
lib/isc/include/isc/readline.h → bin/dig/readline.h
View File

7
bin/nsupdate/Makefile.am
View File

@@ -7,7 +7,8 @@ AM_CPPFLAGS += \
$(LIBIRS_CFLAGS) \
$(LIBBIND9_CFLAGS) \
$(GSSAPI_CFLAGS) \
$(KRB5_CFLAGS)
$(KRB5_CFLAGS) \
$(READLINE_CFLAGS)
AM_CPPFLAGS += \
-DSESSION_KEYFILE=\"${localstatedir}/run/named/session.key\"
@@ -27,3 +28,7 @@ LDADD += \
endif
bin_PROGRAMS = nsupdate
nsupdate_SOURCES = \
nsupdate.c \
../dig/readline.h

3
bin/nsupdate/nsupdate.c
View File

@@ -36,7 +36,6 @@
#include <isc/portset.h>
#include <isc/print.h>
#include <isc/random.h>
#include <isc/readline.h>
#include <isc/region.h>
#include <isc/sockaddr.h>
#include <isc/socket.h>
@@ -95,6 +94,8 @@
#include <bind9/getaddresses.h>
#include "../dig/readline.h"
#define MAXCMD (128 * 1024)
#define MAXWIRE (64 * 1024)
#define PACKETSIZE ((64 * 1024) - 1)

1
lib/isc/Makefile.am
View File

@@ -66,7 +66,6 @@ libisc_la_HEADERS = \
include/isc/radix.h \
include/isc/random.h \
include/isc/ratelimiter.h \
include/isc/readline.h \
include/isc/refcount.h \
include/isc/regex.h \
include/isc/region.h \

2
util/copyrights
View File

@@ -55,6 +55,7 @@
./bin/dig/host.rst RST 2020,2021
./bin/dig/nslookup.c C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
./bin/dig/nslookup.rst RST 2020,2021
./bin/dig/readline.h C 2020,2021
./bin/dig/win32/dig.vcxproj.filters.in X 2013,2015,2018,2019,2020
./bin/dig/win32/dig.vcxproj.in X 2013,2014,2015,2016,2017,2018,2019,2020
./bin/dig/win32/dig.vcxproj.user X 2013,2018,2019,2020,2021
@@ -1864,7 +1865,6 @@
./lib/isc/include/isc/radix.h C 2007,2008,2013,2014,2016,2018,2019,2020,2021
./lib/isc/include/isc/random.h C 1999,2000,2001,2004,2005,2006,2007,2009,2014,2016,2017,2018,2019,2020,2021
./lib/isc/include/isc/ratelimiter.h C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2014,2016,2018,2019,2020,2021
./lib/isc/include/isc/readline.h C 2020,2021
./lib/isc/include/isc/refcount.h C 2001,2003,2004,2005,2006,2007,2009,2016,2017,2018,2019,2020,2021
./lib/isc/include/isc/regex.h C 2013,2016,2018,2019,2020,2021
./lib/isc/include/isc/region.h C 1998,1999,2000,2001,2002,2004,2005,2006,2007,2013,2016,2018,2019,2020,2021