From c9f7b4d356a453a01aa77a6bb74ca7ef49732c08 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppymaster@gmail.com>
Date: Tue, 10 Jan 2017 02:39:05 -0500
Subject: [PATCH] build-sys: add check for gperf lookup function signature
 (#5055)

gperf-3.1 generates lookup functions that take a size_t length
parameter instead of unsigned int. Test for this at configure time.

Fixes: https://github.com/systemd/systemd/issues/5039
---
 configure.ac                     | 22 ++++++++++++++++++++++
 src/basic/af-list.c              |  2 +-
 src/basic/arphrd-list.c          |  2 +-
 src/basic/cap-list.c             |  2 +-
 src/basic/errno-list.c           |  2 +-
 src/core/load-fragment.h         |  2 +-
 src/journal/journald-server.h    |  2 +-
 src/login/logind.h               |  2 +-
 src/network/network-netdev.h     |  2 +-
 src/network/networkd-conf.h      |  2 +-
 src/network/networkd-network.h   |  2 +-
 src/nspawn/nspawn-settings.h     |  2 +-
 src/resolve/dns-type.c           |  2 +-
 src/resolve/resolved-conf.h      |  2 +-
 src/test/test-af-list.c          |  2 +-
 src/test/test-arphrd-list.c      |  2 +-
 src/timesync/timesyncd-conf.h    |  2 +-
 src/udev/net/link-config.h       |  2 +-
 src/udev/udev-builtin-keyboard.c |  2 +-
 19 files changed, 40 insertions(+), 18 deletions(-)

(daviddavid): Rebase for sytemd 230

diff -Nru a/configure.ac b/configure.ac
--- a/configure.ac	2016-05-22 00:31:29.000000000 +0200
+++ b/configure.ac	2017-02-09 17:29:57.203630909 +0100
@@ -254,6 +254,28 @@
        #include <sys/resource.h>
 ])
 
+GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)"
+
+AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([
+                #include <string.h>
+                const char * in_word_set(const char *, size_t);
+                $GPERF_TEST]
+        )],
+        [GPERF_LEN_TYPE=size_t],
+        [AC_COMPILE_IFELSE(
+                [AC_LANG_PROGRAM([
+                        #include <string.h>
+                        const char * in_word_set(const char *, unsigned);
+                        $GPERF_TEST]
+                )],
+                [GPERF_LEN_TYPE=unsigned],
+                [AC_MSG_ERROR([** unable to determine gperf len type])]
+        )]
+)
+
+AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type])
+
 # ------------------------------------------------------------------------------
 # we use python to build the man page index
 have_python=no
diff -Nru a/src/basic/af-list.c b/src/basic/af-list.c
--- a/src/basic/af-list.c	2016-05-22 00:31:29.000000000 +0200
+++ b/src/basic/af-list.c	2017-02-09 17:30:44.600627711 +0100
@@ -23,7 +23,7 @@
 #include "af-list.h"
 #include "macro.h"
 
-static const struct af_name* lookup_af(register const char *str, register unsigned int len);
+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
 
 #include "af-from-name.h"
 #include "af-to-name.h"
diff -Nru a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
--- a/src/basic/arphrd-list.c	2016-05-22 00:31:29.000000000 +0200
+++ b/src/basic/arphrd-list.c	2017-02-09 17:31:15.777625607 +0100
@@ -23,7 +23,7 @@
 #include "arphrd-list.h"
 #include "macro.h"
 
-static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
 
 #include "arphrd-from-name.h"
 #include "arphrd-to-name.h"
diff -Nru a/src/basic/cap-list.c b/src/basic/cap-list.c
--- a/src/basic/cap-list.c	2016-05-22 00:31:29.000000000 +0200
+++ b/src/basic/cap-list.c	2017-02-09 17:32:09.101622008 +0100
@@ -26,7 +26,7 @@
 #include "parse-util.h"
 #include "util.h"
 
-static const struct capability_name* lookup_capability(register const char *str, register unsigned int len);
+static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len);
 
 #include "cap-from-name.h"
 #include "cap-to-name.h"
diff -Nru a/src/basic/errno-list.c b/src/basic/errno-list.c
--- a/src/basic/errno-list.c	2016-05-22 00:31:29.000000000 +0200
+++ b/src/basic/errno-list.c	2017-02-09 17:32:45.189619573 +0100
@@ -23,7 +23,7 @@
 #include "macro.h"
 
 static const struct errno_name* lookup_errno(register const char *str,
-                                             register unsigned int len);
+                                             register GPERF_LEN_TYPE len);
 
 #include "errno-from-name.h"
 #include "errno-to-name.h"
diff -Nru a/src/core/load-fragment.h b/src/core/load-fragment.h
--- a/src/core/load-fragment.h	2016-05-22 00:31:29.000000000 +0200
+++ b/src/core/load-fragment.h	2017-02-09 17:33:38.367615984 +0100
@@ -113,7 +113,7 @@
 int config_parse_sec_fix_0(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 
 /* gperf prototypes */
-const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 extern const char load_fragment_gperf_nulstr[];
 
 typedef enum Disabled {
diff -Nru a/src/journal/journald-server.h b/src/journal/journald-server.h
--- a/src/journal/journald-server.h	2016-05-22 00:31:29.000000000 +0200
+++ b/src/journal/journald-server.h	2017-02-09 17:34:41.367611733 +0100
@@ -163,7 +163,7 @@
 void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,0) _sentinel_;
 
 /* gperf lookup function */
-const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* journald_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 
 int config_parse_storage(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 
diff -Nru a/src/login/logind.h b/src/login/logind.h
--- a/src/login/logind.h	2016-05-22 00:31:29.000000000 +0200
+++ b/src/login/logind.h	2017-02-09 17:35:31.836608327 +0100
@@ -182,7 +182,7 @@
 int manager_job_is_active(Manager *manager, const char *path);
 
 /* gperf lookup function */
-const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 
 int manager_set_lid_switch_ignore(Manager *m, usec_t until);
 
diff -Nru a/src/network/networkd-conf.h b/src/network/networkd-conf.h
--- a/src/network/networkd-conf.h	2016-05-22 00:31:29.000000000 +0200
+++ b/src/network/networkd-conf.h	2017-02-09 17:37:17.064601225 +0100
@@ -23,7 +23,7 @@
 
 int manager_parse_config_file(Manager *m);
 
-const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 
 int config_parse_duid_type(
                 const char *unit,
diff -Nru a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h
--- a/src/network/networkd-netdev.h	2016-05-22 00:31:29.000000000 +0200
+++ b/src/network/networkd-netdev.h	2017-02-09 17:45:34.000567690 +0100
@@ -173,7 +173,7 @@
 int config_parse_netdev_kind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 
 /* gperf */
-const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 
 /* Macros which append INTERFACE= to the message */
 
diff -Nru a/src/network/networkd-network.h b/src/network/networkd-network.h
--- a/src/network/networkd-network.h	2016-05-22 00:31:29.000000000 +0200
+++ b/src/network/networkd-network.h	2017-02-09 17:38:01.983598194 +0100
@@ -214,7 +214,7 @@
 /* Legacy IPv4LL support */
 int config_parse_ipv4ll(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 
-const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 
 extern const sd_bus_vtable network_vtable[];
 
diff -Nru a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h
--- a/src/nspawn/nspawn-settings.h	2016-05-22 00:31:29.000000000 +0200
+++ b/src/nspawn/nspawn-settings.h	2017-02-09 17:38:38.959595699 +0100
@@ -101,7 +101,7 @@
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Settings*, settings_free);
 
-const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 
 int config_parse_capability(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_id128(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff -Nru a/src/resolve/dns-type.c b/src/resolve/dns-type.c
--- a/src/resolve/dns-type.c	2016-05-22 00:31:29.000000000 +0200
+++ b/src/resolve/dns-type.c	2017-02-09 17:39:14.640593291 +0100
@@ -29,7 +29,7 @@
 } dns_type;
 
 static const struct dns_type_name *
-lookup_dns_type (register const char *str, register unsigned int len);
+lookup_dns_type (register const char *str, register GPERF_LEN_TYPE len);
 
 #include "dns_type-from-name.h"
 #include "dns_type-to-name.h"
diff -Nru a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h
--- a/src/resolve/resolved-conf.h	2016-05-22 00:31:29.000000000 +0200
+++ b/src/resolve/resolved-conf.h	2017-02-09 17:39:44.910591248 +0100
@@ -29,7 +29,7 @@
 int manager_add_dns_server_by_string(Manager *m, DnsServerType type, const char *word);
 int manager_parse_dns_server_string_and_warn(Manager *m, DnsServerType type, const char *string);
 
-const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 
 int config_parse_dns_servers(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_search_domains(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff -Nru a/src/test/test-af-list.c b/src/test/test-af-list.c
--- a/src/test/test-af-list.c	2016-05-22 00:31:29.000000000 +0200
+++ b/src/test/test-af-list.c	2017-02-09 17:40:21.376588787 +0100
@@ -24,7 +24,7 @@
 #include "string-util.h"
 #include "util.h"
 
-static const struct af_name* lookup_af(register const char *str, register unsigned int len);
+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
 
 #include "af-from-name.h"
 #include "af-list.h"
diff -Nru a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c
--- a/src/test/test-arphrd-list.c	2016-05-22 00:31:29.000000000 +0200
+++ b/src/test/test-arphrd-list.c	2017-02-09 17:40:48.155586980 +0100
@@ -24,7 +24,7 @@
 #include "string-util.h"
 #include "util.h"
 
-static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
 
 #include "arphrd-from-name.h"
 #include "arphrd-list.h"
diff -Nru a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
--- a/src/timesync/timesyncd-conf.h	2016-05-22 00:31:29.000000000 +0200
+++ b/src/timesync/timesyncd-conf.h	2017-02-09 17:41:24.033584559 +0100
@@ -22,7 +22,7 @@
 #include "conf-parser.h"
 #include "timesyncd-manager.h"
 
-const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 
 int manager_parse_server_string(Manager *m, ServerType type, const char *string);
 
diff -Nru a/src/udev/net/link-config.h b/src/udev/net/link-config.h
--- a/src/udev/net/link-config.h	2016-05-22 00:31:29.000000000 +0200
+++ b/src/udev/net/link-config.h	2017-02-09 17:42:00.566582093 +0100
@@ -92,7 +92,7 @@
 MACPolicy mac_policy_from_string(const char *p) _pure_;
 
 /* gperf lookup function */
-const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 
 int config_parse_mac_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_name_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff -Nru a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
--- a/src/udev/udev-builtin-keyboard.c	2016-05-22 00:31:29.000000000 +0200
+++ b/src/udev/udev-builtin-keyboard.c	2017-02-09 17:42:35.833579713 +0100
@@ -29,7 +29,7 @@
 #include "string-util.h"
 #include "udev.h"
 
-static const struct key *keyboard_lookup_key(const char *str, unsigned len);
+static const struct key *keyboard_lookup_key(const char *str, GPERF_LEN_TYPE len);
 #include "keyboard-keys-from-name.h"
 
 static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) {