|
|
|
|
Index: Makefile.in
|
|
|
|
|
--- Makefile.in.orig 2009-12-30 13:56:30 +0100
|
|
|
|
|
+++ Makefile.in 2009-12-30 22:09:02 +0100
|
|
|
|
|
@@ -105,9 +105,7 @@
|
|
|
|
|
src/util.c \
|
|
|
|
|
src/version.c
|
|
|
|
|
|
|
|
|
|
-ifeq ($(ENABLE_MERGE),1)
|
|
|
|
|
MERGEOBJ = src/merge.$(OBJEXT)
|
|
|
|
|
-endif
|
|
|
|
|
|
|
|
|
|
OBJS = $(LIBOBJS) $(MERGEOBJ) \
|
|
|
|
|
src/inp.$(OBJEXT) \
|
|
|
|
|
@@ -221,9 +219,7 @@
|
|
|
|
|
@echo "[$@]"
|
|
|
|
|
@srcdir=$(srcdir)/tests $(TEST_SHELL) $(srcdir)/$@
|
|
|
|
|
|
|
|
|
|
-ifeq ($(ENABLE_MERGE),1)
|
|
|
|
|
DEFINE_ENABLE_MERGE = -DENABLE_MERGE
|
|
|
|
|
-endif
|
|
|
|
|
COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \
|
|
|
|
|
$(DEFINE_ENABLE_MERGE) -I. -I$(srcdir)/src -I$(srcdir)/gl/lib $(CFLAGS)
|
|
|
|
|
|
|
|
|
|
Index: gl/lib/strnlen.c
|
|
|
|
|
--- gl/lib/strnlen.c.orig 2009-12-30 22:16:59 +0100
|
|
|
|
|
+++ gl/lib/strnlen.c 2009-12-30 22:15:51 +0100
|
|
|
|
|
@@ -0,0 +1,31 @@
|
|
|
|
|
+/* Find the length of STRING, but scan at most MAXLEN characters.
|
|
|
|
|
+ Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
|
|
|
|
|
+ Written by Simon Josefsson.
|
|
|
|
|
+
|
|
|
|
|
+ This program 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; either version 2, or (at your option)
|
|
|
|
|
+ any later version.
|
|
|
|
|
+
|
|
|
|
|
+ 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, write to the Free Software Foundation,
|
|
|
|
|
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
|
|
|
|
|
+
|
|
|
|
|
+#include <config.h>
|
|
|
|
|
+
|
|
|
|
|
+#include <string.h>
|
|
|
|
|
+
|
|
|
|
|
+/* Find the length of STRING, but scan at most MAXLEN characters.
|
|
|
|
|
+ If no '\0' terminator is found in that many characters, return MAXLEN. */
|
|
|
|
|
+
|
|
|
|
|
+size_t
|
|
|
|
|
+strnlen (const char *string, size_t maxlen)
|
|
|
|
|
+{
|
|
|
|
|
+ const char *end = memchr (string, '\0', maxlen);
|
|
|
|
|
+ return end ? (size_t) (end - string) : maxlen;
|
|
|
|
|
+}
|
