summaryrefslogtreecommitdiff
path: root/lib/malloc
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-04-09 16:13:32 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-04-09 16:15:01 -0700
commit2d698b6e42d8dca191ac795ef5dba3bf62496eec (patch)
treeac5e0b67043c50f49160e9fe407435706cf30444 /lib/malloc
parentf1250933e4a2ac09a3d0b25b3877068e12f44da5 (diff)
downloadvyatta-bash-2d698b6e42d8dca191ac795ef5dba3bf62496eec.tar.gz
vyatta-bash-2d698b6e42d8dca191ac795ef5dba3bf62496eec.zip
Integrate bash 3.2 version
This is merge of current Debian stable (Lenny) version of Bash with Vyatta changes.
Diffstat (limited to 'lib/malloc')
-rw-r--r--lib/malloc/stats.c1
-rw-r--r--lib/malloc/table.c1
-rwxr-xr-xlib/malloc/xleaktrace4
3 files changed, 6 insertions, 0 deletions
diff --git a/lib/malloc/stats.c b/lib/malloc/stats.c
index 18c3cef..0d119fa 100644
--- a/lib/malloc/stats.c
+++ b/lib/malloc/stats.c
@@ -28,6 +28,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <string.h>
#include "mstats.h"
diff --git a/lib/malloc/table.c b/lib/malloc/table.c
index ee37b3a..b9310a6 100644
--- a/lib/malloc/table.c
+++ b/lib/malloc/table.c
@@ -22,6 +22,7 @@
#endif
#include <stdio.h>
+#include <string.h>
#include "imalloc.h"
#include "table.h"
diff --git a/lib/malloc/xleaktrace b/lib/malloc/xleaktrace
index 573437c..d7e3cd5 100755
--- a/lib/malloc/xleaktrace
+++ b/lib/malloc/xleaktrace
@@ -5,6 +5,10 @@
#
# NOTE: we ignore `realloc' tags because they're just extra information
#
+# Copyright (c) 2001 Chester Ramey
+# Permission is hereby granted to deal in this Software without restriction.
+# THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND.
+#
# Chet Ramey
# chet@po.cwru.edu
#