diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | strnlen.c | 37 | ||||
| -rw-r--r-- | strnlen.h | 32 | ||||
| -rw-r--r-- | xlsclients.c | 3 |
5 files changed, 76 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 59887e2..94f3111 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = xlsclients AM_CFLAGS = $(CWARNFLAGS) $(XLSCLIENTS_CFLAGS) -xlsclients_LDADD = $(XLSCLIENTS_LIBS) +xlsclients_LDADD = $(XLSCLIENTS_LIBS) $(LIBOBJS) xlsclients_SOURCES = \ xlsclients.c diff --git a/configure.ac b/configure.ac index f665380..3b28926 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,9 @@ AC_PROG_INSTALL # Check for functional strnlen AC_USE_SYSTEM_EXTENSIONS AC_FUNC_STRNLEN +if test "x$ac_cv_func_strnlen_working" = xyes; then + AC_DEFINE(HAVE_STRNLEN, 1, [Define to 1 if you have a working strnlen function.]) +fi XORG_DEFAULT_OPTIONS diff --git a/strnlen.c b/strnlen.c new file mode 100644 index 0000000..725e262 --- /dev/null +++ b/strnlen.c @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2009 Apple Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + + /* + * Author: Jeremy Huddleston, Apple Inc. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <strnlen.h> +#include <string.h> + +size_t strnlen(const char *s, size_t maxlen) { + const char *p = memchr(s, 0, maxlen); + return (size_t)(p ? (p - s) : maxlen); +} diff --git a/strnlen.h b/strnlen.h new file mode 100644 index 0000000..e1cdb85 --- /dev/null +++ b/strnlen.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2009 Apple Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + + /* + * Author: Jeremy Huddleston, Apple Inc. + */ + +#ifndef __STRNLEN_H__ +#define __STRNLEN_H__ 1 +#include <stdlib.h> + +extern size_t strnlen(const char *s, size_t maxlen); +#endif /* __STRNLEN_H__ */ diff --git a/xlsclients.c b/xlsclients.c index 049bc4c..2452352 100644 --- a/xlsclients.c +++ b/xlsclients.c @@ -37,6 +37,9 @@ in this Software without prior written authorization from The Open Group. #include <xcb/xcb.h> #include <xcb/xproto.h> #include <xcb/xcb_atom.h> +#ifndef HAVE_STRNLEN +#include "strnlen.h" +#endif static char *ProgramName; |