mdocml: Even though strnlen(3) is required by POSIX 2008, Matthias

mdocml: Even though strnlen(3) is required by POSIX 2008, Matthias

[schwarze]

Log Message:
-----------
Even though strnlen(3) is required by POSIX 2008,
Matthias Scheler reports than Solaris 10 lacks it.
While here, sort the declarations in config.h
and move the headers to the top.

Modified Files:
--------------
    mdocml:
        Makefile
        config.h.post
        config.h.pre
        configure

Added Files:
-----------
    mdocml:
        compat_strnlen.c
        test-strnlen.c

Revision Data
-------------
--- /dev/null
+++ compat_strnlen.c
@@ -0,0 +1,43 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STRNLEN
+
+int dummy;
+
+#else
+
+/*	($)OpenBSD: strnlen.c,v 1.4 2012/04/26 01:22:31 matthew Exp $	*/
+
+/*
+ * Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <string.h>
+
+size_t
+strnlen(const char *str, size_t maxlen)
+{
+	const char *cp;
+
+	for (cp = str; maxlen != 0 && *cp != '\0'; cp++, maxlen--)
+		;
+
+	return (size_t)(cp - str);
+}
+
+#endif
--- /dev/null
+++ test-strnlen.c
@@ -0,0 +1,8 @@
+#include <string.h>
+
+int
+main(void)
+{
+	const char s[1] = { 'a' };
+	return(1 != strnlen(s, 1));
+}
Index: config.h.pre
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/config.h.pre,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lconfig.h.pre -Lconfig.h.pre -u -p -r1.2 -r1.3
--- config.h.pre
+++ config.h.pre
@@ -5,4 +5,5 @@
 # define _GNU_SOURCE /* strptime(), getsubopt() */
 #endif
 
+#include <sys/types.h>
 #include <stdio.h>
Index: configure
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lconfigure -Lconfigure -u -p -r1.1 -r1.2
--- configure
+++ configure
@@ -37,6 +37,7 @@ runtest ohash OHASH
 runtest strcasestr STRCASESTR
 runtest strlcat STRLCAT
 runtest strlcpy STRLCPY
+runtest strnlen STRNLEN
 runtest strptime STRPTIME
 runtest strsep STRSEP
 echo
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.407
retrieving revision 1.408
diff -LMakefile -LMakefile -u -p -r1.407 -r1.408
--- Makefile
+++ Makefile
@@ -59,6 +59,7 @@ TESTSRCS	 = test-fgetln.c \
 		   test-ohash.c \
 		   test-strlcat.c \
 		   test-strlcpy.c \
+		   test-strnlen.c \
 		   test-strptime.c
 
 SRCS		 = Makefile \
@@ -78,6 +79,7 @@ SRCS		 = Makefile \
 		   compat_strcasestr.c \
 		   compat_strlcat.c \
 		   compat_strlcpy.c \
+		   compat_strnlen.c \
 		   compat_strsep.c \
 		   config.h.post \
 		   config.h.pre \
@@ -197,6 +199,7 @@ COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_strcasestr.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o \
+		   compat_strnlen.o \
 		   compat_strsep.o
 
 arch.o: arch.in
Index: config.h.post
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/config.h.post,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lconfig.h.post -Lconfig.h.post -u -p -r1.7 -r1.8
--- config.h.post
+++ config.h.post
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-
 #if !defined(__BEGIN_DECLS)
 #  ifdef __cplusplus
 #  define	__BEGIN_DECLS		extern "C" {
@@ -15,6 +13,13 @@
 #  endif
 #endif
 
+#ifndef HAVE_FGETLN
+extern	char	 *fgetln(FILE *, size_t *);
+#endif
+#ifndef HAVE_GETSUBOPT
+extern	int	  getsubopt(char **, char * const *, char **);
+extern	char	 *suboptarg;
+#endif
 #ifndef HAVE_STRCASESTR
 extern	char	 *strcasestr(const char *, const char *);
 #endif
@@ -24,15 +29,11 @@ extern	size_t	  strlcat(char *, const ch
 #ifndef HAVE_STRLCPY
 extern	size_t	  strlcpy(char *, const char *, size_t);
 #endif
+#ifndef HAVE_STRNLEN
+extern	size_t	  strnlen(const char *, size_t);
+#endif
 #ifndef HAVE_STRSEP
 extern	char	 *strsep(char **, const char *);
-#endif
-#ifndef HAVE_GETSUBOPT
-extern	int	  getsubopt(char **, char * const *, char **);
-extern	char	 *suboptarg;
-#endif
-#ifndef HAVE_FGETLN
-extern	char	 *fgetln(FILE *, size_t *);
 #endif
 
 #endif /* MANDOC_CONFIG_H */
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv