From b512fa8e1dcf56b109b62c6b367f894188e5e699 Mon Sep 17 00:00:00 2001
From: Alexandre Carmel-Veilleux <acv@miniguru.ca>
Date: Fri, 2 Dec 2011 08:55:08 -0500
Subject: [PATCH] Removed malloc.h, fixed off-by-one in bestmatch.c, it was
 silent in Linux and deadly on Mac OS X.

Signed-off-by: Neil Brown <neilb@suse.de>
---
 bestmatch.c |  6 +++++-
 diff.c      |  1 -
 dotest      | 10 +++++++++-
 extract.c   |  1 -
 load.c      |  2 +-
 merge2.c    |  1 -
 split.c     |  2 +-
 vpatch.c    |  1 -
 8 files changed, 16 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 dotest

diff --git a/bestmatch.c b/bestmatch.c
index c59bc78..1d5515b 100644
--- a/bestmatch.c
+++ b/bestmatch.c
@@ -61,7 +61,6 @@
  * many fewer symbols.
  */
 
-#include	<malloc.h>
 #include	<ctype.h>
 #include	<stdlib.h>
 #include	"wiggle.h"
@@ -392,6 +391,11 @@ static void remap(struct best *best, int cnt,
 		while (pb > 0 && is_skipped(b2.list[pb-1]))
 			pb--;
 
+		if (pa <= 0)
+			pa = 1;
+		if (pb <= 0)
+			pb = 1;
+
 		best[b].xlo = pa;
 		best[b].ylo = pb;
 
diff --git a/diff.c b/diff.c
index 8c0463a..51d8421 100644
--- a/diff.c
+++ b/diff.c
@@ -128,7 +128,6 @@
  *
  */
 
-#include	<malloc.h>
 #include	"wiggle.h"
 #include	<stdlib.h>
 
diff --git a/dotest b/dotest
old mode 100755
new mode 100644
index f3b6903..a65c42b
--- a/dotest
+++ b/dotest
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+# Redirect for non-GNU time systems
+if [ "xxTIME_CMD" = "xx" ]
+then
+  time_cmd=/usr/bin/time
+else
+  time_cmd=$TIME_CMD
+fi
+
 dir=$PWD
 
 while [ ! -f $dir/wiggle ]
@@ -16,7 +24,7 @@ if [ -d tests ]
 then cd tests
 fi
 
-TIME="/usr/bin/time -o .time -f %U"
+TIME="$time_cmd -o .time -f %U"
 if $TIME true > /dev/null 2>&1
 then :
 else TIME=
diff --git a/extract.c b/extract.c
index dc695dd..f7ee0dc 100644
--- a/extract.c
+++ b/extract.c
@@ -29,7 +29,6 @@
  */
 
 #include	"wiggle.h"
-#include	<malloc.h>
 #include	<stdlib.h>
 
 static void skip_eol(char **cp, char *end)
diff --git a/load.c b/load.c
index 979175b..1da2b6f 100644
--- a/load.c
+++ b/load.c
@@ -38,7 +38,7 @@
 #include	<sys/stat.h>
 #include	<unistd.h>
 #include	<fcntl.h>
-#include	<malloc.h>
+#include	<stdlib.h>
 
 static void join_streams(struct stream list[], int cnt)
 {
diff --git a/merge2.c b/merge2.c
index 3d86c33..c25b2d8 100644
--- a/merge2.c
+++ b/merge2.c
@@ -25,7 +25,6 @@
 
 #include "wiggle.h"
 #include <stdlib.h>
-#include <malloc.h>
 
 /*
  * Second attempt at merging....
diff --git a/split.c b/split.c
index 0562310..f38ba04 100644
--- a/split.c
+++ b/split.c
@@ -45,7 +45,7 @@
 #include	"wiggle.h"
 #include	<stdlib.h>
 #include	<ctype.h>
-#include	<malloc.h>
+#include	<stdlib.h>
 #define BITS_PER_LONG 32
 
 #include "hash.h"
diff --git a/vpatch.c b/vpatch.c
index 256d9c4..21de2bb 100644
--- a/vpatch.c
+++ b/vpatch.c
@@ -38,7 +38,6 @@
  */
 
 #include "wiggle.h"
-#include <malloc.h>
 #include <curses.h>
 #include <unistd.h>
 #include <stdlib.h>
-- 
2.39.5