]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
Switch strlcpy test to use a test file too.
authorPeter Powell <petpow@saberuk.com>
Tue, 21 Jul 2015 22:22:17 +0000 (23:22 +0100)
committerPeter Powell <petpow@saberuk.com>
Tue, 21 Jul 2015 22:22:17 +0000 (23:22 +0100)
configure
make/check_strlcpy.cpp [new file with mode: 0644]

index bdbcf6afe8c41df8648a7456cadd0c78580df866..2eba9edb11b5f1b5f67a4ba79afe2c0927764ec5 100755 (executable)
--- a/configure
+++ b/configure
@@ -363,23 +363,8 @@ print "yes\n" if $config{HAS_STDINT} eq "true";
 print "no\n" if $config{HAS_STDINT} eq "false";
 
 printf "Checking if strlcpy exists... ";
-# Perform the strlcpy() test..
-$config{HAS_STRLCPY} = "false";
-$fail = 0;
-open(STRLCPY, "</usr/include/string.h") or $fail = 1;
-if (!$fail) {
-       while (defined(my $line = <STRLCPY>)) {
-               chomp($line);
-               # try and find the delcaration of:
-               # size_t strlcpy(...)
-               if ($line =~ /size_t(\0x9|\s)+strlcpy/) {
-                       $config{HAS_STRLCPY} = "true";
-               }
-       }
-       close(STRLCPY);
-}
-print "yes\n" if $config{HAS_STRLCPY} eq "true";
-print "no\n" if $config{HAS_STRLCPY} eq "false";
+$config{HAS_STRLCPY} = test_compile('strlcpy');
+print $config{HAS_STRLCPY} ? "yes\n" : "no\n";
 
 printf "Checking if kqueue exists... ";
 $has_kqueue = test_compile('kqueue');
diff --git a/make/check_strlcpy.cpp b/make/check_strlcpy.cpp
new file mode 100644 (file)
index 0000000..e51d18d
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2015 Peter Powell <petpow@saberuk.com>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <string.h>
+
+int main() {
+       char test[5];
+       strlcpy(test, "test", sizeof(test));
+}