X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=xmalloc.c;h=2344d2d54ec62edfe13b4549aa09d48cc8bfb748;hb=refs%2Fheads%2Ftizen_3.0.2015.q2_common;hp=743d4b3832a61ca9eb86cc90689349c4d74b4903;hpb=ccc6cda312fea9f0468ee65b8f368e9653e1380b;p=platform%2Fupstream%2Fbash.git
diff --git a/xmalloc.c b/xmalloc.c
index 743d4b3..2344d2d 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,29 +1,28 @@
/* xmalloc.c -- safe versions of malloc and realloc */
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2009 Free Software Foundation, Inc.
- This file is part of GNU Readline, a library for reading lines
- of text with interactive input and history editing.
+ This file is part of GNU Bash, the GNU Bourne Again SHell.
- Readline 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 1, or (at your option) any
- later version.
+ Bash 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 3 of the License, or
+ (at your option) any later version.
- Readline 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.
+ Bash 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 Readline; see the file COPYING. If not, write to the Free
- Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+ along with Bash. If not, see .
+*/
#if defined (HAVE_CONFIG_H)
#include
#endif
-#include
+#include "bashtypes.h"
#include
#if defined (HAVE_UNISTD_H)
@@ -38,6 +37,8 @@
#include "error.h"
+#include "bashintl.h"
+
#if !defined (PTR_T)
# if defined (__STDC__)
# define PTR_T void *
@@ -46,7 +47,7 @@
# endif /* !__STDC__ */
#endif /* !PTR_T */
-#if !defined (SBRK_DECLARED)
+#if defined (HAVE_SBRK) && !HAVE_DECL_SBRK
extern char *sbrk();
#endif
@@ -60,50 +61,79 @@ static size_t allocated;
/* */
/* **************************************************************** */
+#if defined (HAVE_SBRK)
+#define FINDBRK() \
+do { \
+ if (brkfound == 0) \
+ { \
+ lbreak = (PTR_T)sbrk (0); \
+ brkfound++; \
+ } \
+} while (0)
+
+static size_t
+findbrk ()
+{
+ FINDBRK();
+ return (char *)sbrk (0) - (char *)lbreak;
+}
+#else
+#define FINDBRK()
+#endif
+
+static void
+allocerr (func, bytes)
+ const char *func;
+ size_t bytes;
+{
+#if defined (HAVE_SBRK)
+ allocated = findbrk ();
+ fatal_error (_("%s: cannot allocate %lu bytes (%lu bytes allocated)"), func, (unsigned long)bytes, (unsigned long)allocated);
+#else
+ fatal_error (_("%s: cannot allocate %lu bytes"), func, (unsigned long)bytes);
+#endif /* !HAVE_SBRK */
+}
+
/* Return a pointer to free()able block of memory large enough
to hold BYTES number of bytes. If the memory cannot be allocated,
print an error message and abort. */
-char *
+PTR_T
xmalloc (bytes)
size_t bytes;
{
- char *temp;
+ PTR_T temp;
+
+#if defined (DEBUG)
+ if (bytes == 0)
+ internal_warning("xmalloc: size argument is 0");
+#endif
- temp = (char *)malloc (bytes);
+ FINDBRK();
+ temp = malloc (bytes);
if (temp == 0)
- {
- if (brkfound == 0)
- {
- lbreak = (PTR_T)sbrk (0);
- brkfound++;
- }
- allocated = (char *)sbrk (0) - (char *)lbreak;
- fatal_error ("xmalloc: cannot allocate %lu bytes (%lu bytes allocated)", (unsigned long)bytes, (unsigned long)allocated);
- }
+ allocerr ("xmalloc", bytes);
return (temp);
}
-char *
+PTR_T
xrealloc (pointer, bytes)
PTR_T pointer;
size_t bytes;
{
- char *temp;
+ PTR_T temp;
- temp = pointer ? (char *)realloc (pointer, bytes) : (char *)malloc (bytes);
+#if defined (DEBUG)
+ if (bytes == 0)
+ internal_warning("xrealloc: size argument is 0");
+#endif
+
+ FINDBRK();
+ temp = pointer ? realloc (pointer, bytes) : malloc (bytes);
if (temp == 0)
- {
- if (brkfound == 0)
- {
- lbreak = (PTR_T)sbrk (0);
- brkfound++;
- }
- allocated = (char *)sbrk (0) - (char *)lbreak;
- fatal_error ("xrealloc: cannot reallocate %lu bytes (%lu bytes allocated)", (unsigned long)bytes, (unsigned long)allocated);
- }
+ allocerr ("xrealloc", bytes);
return (temp);
}
@@ -112,8 +142,82 @@ xrealloc (pointer, bytes)
don't need to know what free() returns. */
void
xfree (string)
- char *string;
+ PTR_T string;
{
if (string)
free (string);
}
+
+#ifdef USING_BASH_MALLOC
+#include
+
+static void
+sh_allocerr (func, bytes, file, line)
+ const char *func;
+ size_t bytes;
+ char *file;
+ int line;
+{
+#if defined (HAVE_SBRK)
+ allocated = findbrk ();
+ fatal_error (_("%s: %s:%d: cannot allocate %lu bytes (%lu bytes allocated)"), func, file, line, (unsigned long)bytes, (unsigned long)allocated);
+#else
+ fatal_error (_("%s: %s:%d: cannot allocate %lu bytes"), func, file, line, (unsigned long)bytes);
+#endif /* !HAVE_SBRK */
+}
+
+PTR_T
+sh_xmalloc (bytes, file, line)
+ size_t bytes;
+ char *file;
+ int line;
+{
+ PTR_T temp;
+
+#if defined (DEBUG)
+ if (bytes == 0)
+ internal_warning("xmalloc: %s:%d: size argument is 0", file, line);
+#endif
+
+ FINDBRK();
+ temp = sh_malloc (bytes, file, line);
+
+ if (temp == 0)
+ sh_allocerr ("xmalloc", bytes, file, line);
+
+ return (temp);
+}
+
+PTR_T
+sh_xrealloc (pointer, bytes, file, line)
+ PTR_T pointer;
+ size_t bytes;
+ char *file;
+ int line;
+{
+ PTR_T temp;
+
+#if defined (DEBUG)
+ if (bytes == 0)
+ internal_warning("xrealloc: %s:%d: size argument is 0", file, line);
+#endif
+
+ FINDBRK();
+ temp = pointer ? sh_realloc (pointer, bytes, file, line) : sh_malloc (bytes, file, line);
+
+ if (temp == 0)
+ sh_allocerr ("xrealloc", bytes, file, line);
+
+ return (temp);
+}
+
+void
+sh_xfree (string, file, line)
+ PTR_T string;
+ char *file;
+ int line;
+{
+ if (string)
+ sh_free (string, file, line);
+}
+#endif