geoip: rename xt_geoip_fetch to xt_geoip_query

"fetch" sounds a bit like "download", but that is not what this
utility does. Calling it "query" seems more appropriate.

diff --git a/geoip/Makefile.am b/geoip/Makefile.am
index 8c0b6af80054b62c830cded6869dde0510deae10..f8840fbb5c1ff89b9bd0544619b3aaa27a5c12e3 100644 (file)
--- a/geoip/Makefile.am
+++ b/geoip/Makefile.am
@@ -1,9 +1,9 @@
 # -*- Makefile -*-
 
-bin_SCRIPTS = xt_geoip_fetch
+bin_SCRIPTS = xt_geoip_query
 
 pkglibexec_SCRIPTS = xt_geoip_build xt_geoip_build_maxmind xt_geoip_dl xt_geoip_dl_maxmind
 
 man1_MANS = xt_geoip_build.1 xt_geoip_dl.1 \
            xt_geoip_build_maxmind.1 xt_geoip_dl_maxmind.1 \
-           xt_geoip_fetch.1
+           xt_geoip_query.1

diff --git a/geoip/xt_geoip_fetch b/geoip/xt_geoip_query
similarity index 97%
rename from geoip/xt_geoip_fetch
rename to geoip/xt_geoip_query
index 06245195fb5166ac005b5021fa0f811e5e511c78..2d80baf4487a24f64cd1d190d7acc6dc66de74cb 100755 (executable)
--- a/geoip/xt_geoip_fetch
+++ b/geoip/xt_geoip_query
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-#      Utility to query GeoIP database
+#      Utility to query GeoIP database (.iv4/.iv6 files)
 #      Copyright Philip Prindeville, 2018
 #
 use Getopt::Long;

diff --git a/geoip/xt_geoip_fetch.1 b/geoip/xt_geoip_query.1
similarity index 65%
rename from geoip/xt_geoip_fetch.1
rename to geoip/xt_geoip_query.1
index 5d1ae48ae42e8bd48165e1fb6501a48365db7351..85e292ee469575a9f44e9d7f5be22f85b67b58ed 100644 (file)
--- a/geoip/xt_geoip_fetch.1
+++ b/geoip/xt_geoip_query.1
@@ -1,16 +1,16 @@
-.TH xt_geoip_fetch 1 "2020-04-30" "xtables-addons" "xtables-addons"
+.TH xt_geoip_query 1 "2020-04-30" "xtables-addons" "xtables-addons"
 .SH Name
 .PP
-xt_geoip_fetch \(em dump a country database to stdout
+xt_geoip_query \(em dump a country database to stdout
 .SH Syntax
 .PP
-\fBxt_geoip_fetch\fP [\fB\-D\fP
+\fBxt_geoip_query\fP [\fB\-D\fP
 \fIdatabase_dir\fP] [\fB-4\fP] [\fB-6\fP] \fIcc\fP [ \fIcc\fP ... ]
 .SH Description
 .PP
-xt_geoip_fetch unpacks a country's IPv4 or IPv6 databases and dumps
+xt_geoip_query reads a country's IPv4 or IPv6 databases and dumps
 them to standard output as a sorted, non-overlapping list of ranges (which
-is how they're represented in the database) suitable for browsing or
+is how they are represented in the database), suitable for browsing or
 further processing.
 .PP Options
 .TP
@@ -29,7 +29,7 @@ The ISO-3166 country code names of the desired countries' databases.
 .PP
 Shell command to dump the list of Swiss IPv6 address ranges:
 .PP
-xt_geoip_fetch \-D /usr/share/xt_geoip \-6 ch
+xt_geoip_query \-D /usr/share/xt_geoip \-6 ch
 .SH See also
 .PP
 xt_geoip_build(1)