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

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.

diff --git a/bin/dig/Makefile.am b/bin/dig/Makefile.am
index 538a5fdcfedc89c53f8e8f85bb1673ad5315583b..e130df08c14ab83c66f7b10db6075564785c2bad 100644 (file)
--- a/bin/dig/Makefile.am
+++ b/bin/dig/Makefile.am
@@ -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

diff --git a/bin/dig/include/.clang-format b/bin/dig/include/.clang-format
deleted file mode 120000 (symlink)
index 0e62f72..0000000
--- a/bin/dig/include/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../../../.clang-format.headers
\ No newline at end of file

diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index c28a432b2a7aa6ff3374983f576c67b659a29440..ad5e970d2dce7b12d7105c5e1ba7551c4c438df2 100644 (file)
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -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,

diff --git a/lib/isc/include/isc/readline.h b/bin/dig/readline.h
similarity index 100%
rename from lib/isc/include/isc/readline.h
rename to bin/dig/readline.h

diff --git a/bin/nsupdate/Makefile.am b/bin/nsupdate/Makefile.am
index 29fd0cfac0cc5525ec327d64af7f94fd52f96343..fc0e62b99cf77a3f12a38919ae57ce97e57ace39 100644 (file)
--- a/bin/nsupdate/Makefile.am
+++ b/bin/nsupdate/Makefile.am
@@ -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

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 2d10feb95d0c9a5c1568ca74cd7eb6aeedc1e526..e303ee9dc86f36c22a31338f333ea49eacc5a5ba 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -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)

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index 48ead7c17f47ee8495d76768858383f972b65ff7..58438d5c5e98d837ade3c2a6cc3d35f52a3f3d05 100644 (file)
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -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            \

diff --git a/util/copyrights b/util/copyrights
index 32b2552982daae74473d0c69c8dba70b474a342b..5c0d643f4b16fdc6a6373bca6032f556392abe22 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -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