head	1.3;
access;
symbols;
locks; strict;
comment	@# @;


1.3
date	2009.12.30.21.22.17;	author rse;	state Exp;
branches;
next	1.2;
commitid	Mz4Cv6s2qMmCxrhu;

1.2
date	2009.12.03.07.51.04;	author rse;	state Exp;
branches;
next	1.1;
commitid	Me0JZr9hXNV7VTdu;

1.1
date	2009.11.27.21.52.19;	author rse;	state Exp;
branches;
next	;
commitid	Is2QczNkYzPGLcdu;


desc
@@


1.3
log
@upgrading package: patch 2.6 -> 2.6.1
@
text
@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;
+}
@


1.2
log
@enable merge functionality
@
text
@d2 3
a4 13
--- 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 @@@@
d14 1
a14 1
@@@@ -222,9 +218,7 @@@@
d16 1
a16 1
 	@@srcdir=$(srcdir)/tests $(TEST_SHELL) $@@
d24 23
a46 17
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);
+}
d48 1
a48 5
+static char *
+my_strndup (char const *s, size_t n)
+{
+  size_t len = my_strnlen (s, n);
+  char *new = malloc (len + 1);
d50 2
a51 2
+  if (new == NULL)
+    return NULL;
d53 5
a57 2
+  new[len] = '\0';
+  return memcpy (new, s, len);
a58 12
+
 /* 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;
@


1.1
log
@increase portability
@
text
@d1 33
d36 1
a36 1
+++ gl/lib/xstrndup.c	2009-11-27 22:49:55 +0100
@