|
|
|
|
@ -1,17 +1,7 @@
|
|
|
|
|
Index: Makefile.in
|
|
|
|
|
--- Makefile.in.orig 2009-11-02 20:09:57 +0100
|
|
|
|
|
+++ Makefile.in 2009-12-03 08:44:32 +0100
|
|
|
|
|
@@ -45,9 +45,7 @@
|
|
|
|
|
PACKAGE_NAME = @PACKAGE_NAME@
|
|
|
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
|
|
|
STDBOOL_H = @STDBOOL_H@
|
|
|
|
|
-ifneq (@GETOPT_H@,)
|
|
|
|
|
GETOPT_H = gl/lib/@GETOPT_H@
|
|
|
|
|
-endif
|
|
|
|
|
HAVE__BOOL = @HAVE__BOOL@
|
|
|
|
|
ENABLE_MERGE = @ENABLE_MERGE@
|
|
|
|
|
|
|
|
|
|
@@ -107,9 +105,7 @@
|
|
|
|
|
--- 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
|
|
|
|
|
|
|
|
|
|
@ -21,9 +11,9 @@ Index: Makefile.in
|
|
|
|
|
|
|
|
|
|
OBJS = $(LIBOBJS) $(MERGEOBJ) \
|
|
|
|
|
src/inp.$(OBJEXT) \
|
|
|
|
|
@@ -222,9 +218,7 @@
|
|
|
|
|
@@ -221,9 +219,7 @@
|
|
|
|
|
@echo "[$@]"
|
|
|
|
|
@srcdir=$(srcdir)/tests $(TEST_SHELL) $@
|
|
|
|
|
@srcdir=$(srcdir)/tests $(TEST_SHELL) $(srcdir)/$@
|
|
|
|
|
|
|
|
|
|
-ifeq ($(ENABLE_MERGE),1)
|
|
|
|
|
DEFINE_ENABLE_MERGE = -DENABLE_MERGE
|
|
|
|
|
@ -31,45 +21,38 @@ Index: Makefile.in
|
|
|
|
|
COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \
|
|
|
|
|
$(DEFINE_ENABLE_MERGE) -I. -I$(srcdir)/src -I$(srcdir)/gl/lib $(CFLAGS)
|
|
|
|
|
|
|
|
|
|
Index: gl/lib/xstrndup.c
|
|
|
|
|
--- gl/lib/xstrndup.c.orig 2009-11-02 20:09:57 +0100
|
|
|
|
|
+++ gl/lib/xstrndup.c 2009-12-03 08:42:53 +0100
|
|
|
|
|
@@ -23,13 +23,37 @@
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include "xalloc.h"
|
|
|
|
|
|
|
|
|
|
+static size_t
|
|
|
|
|
+my_strnlen(const char *s, size_t maxlen)
|
|
|
|
|
+{
|
|
|
|
|
+ size_t len;
|
|
|
|
|
+ for (len = 0; len < maxlen; len++, s++) {
|
|
|
|
|
+ if (!*s)
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ return (len);
|
|
|
|
|
+}
|
|
|
|
|
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.
|
|
|
|
|
+
|
|
|
|
|
+static char *
|
|
|
|
|
+my_strndup (char const *s, size_t n)
|
|
|
|
|
+{
|
|
|
|
|
+ size_t len = my_strnlen (s, n);
|
|
|
|
|
+ char *new = malloc (len + 1);
|
|
|
|
|
+ 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.
|
|
|
|
|
+
|
|
|
|
|
+ if (new == NULL)
|
|
|
|
|
+ return NULL;
|
|
|
|
|
+ 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.
|
|
|
|
|
+
|
|
|
|
|
+ new[len] = '\0';
|
|
|
|
|
+ return memcpy (new, s, len);
|
|
|
|
|
+}
|
|
|
|
|
+ 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>
|
|
|
|
|
+
|
|
|
|
|
/* Return a newly allocated copy of at most N bytes of STRING.
|
|
|
|
|
In other words, return a copy of the initial segment of length N of
|
|
|
|
|
STRING. */
|
|
|
|
|
char *
|
|
|
|
|
xstrndup (const char *string, size_t n)
|
|
|
|
|
{
|
|
|
|
|
- char *s = strndup (string, n);
|
|
|
|
|
+ char *s = my_strndup (string, n);
|
|
|
|
|
if (! s)
|
|
|
|
|
xalloc_die ();
|
|
|
|
|
return s;
|
|
|
|
|
+/* 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;
|
|
|
|
|
+}
|
|
|
|
|
|
