* target.h (target_signal_to_string): Make return type const char *.

[deliverable/binutils-gdb.git] / gdb / gdbserver / utils.c

diff --git a/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c
index ecff057ac48daa3a329b5fa280105193d05e9c70..7d309dd7295b9e1cf17cf80a46aa0aeee937ed9d 100644 (file)
--- a/gdb/gdbserver/utils.c
+++ b/gdb/gdbserver/utils.c
@@ -1,11 +1,12 @@
 /* General utility routines for the remote server for GDB.
-   Copyright (C) 1986, 1989, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1989, 1993, 1995, 1996, 1997, 1999, 2000, 2002, 2003,
+   2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    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 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,33 +15,90 @@
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#if HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 
 /* Generally useful subroutines used throughout the program.  */
 
+static void malloc_failure (size_t size) ATTR_NORETURN;
+
+static void
+malloc_failure (size_t size)
+{
+  fprintf (stderr, "gdbserver: ran out of memory while trying to allocate %lu bytes\n",
+          (unsigned long) size);
+  exit (1);
+}
+
+/* Allocate memory without fail.
+   If malloc fails, this will print a message to stderr and exit.  */
+
+void *
+xmalloc (size_t size)
+{
+  void *newmem;
+
+  if (size == 0)
+    size = 1;
+  newmem = malloc (size);
+  if (!newmem)
+    malloc_failure (size);
+
+  return newmem;
+}
+
+/* Allocate memory without fail and set it to zero.
+   If malloc fails, this will print a message to stderr and exit.  */
+
+void *
+xcalloc (size_t nelem, size_t elsize)
+{
+  void *newmem;
+
+  if (nelem == 0 || elsize == 0)
+    nelem = elsize = 1;
+
+  newmem = calloc (nelem, elsize);
+  if (!newmem)
+    malloc_failure (nelem * elsize);
+
+  return newmem;
+}
+
+/* Copy a string into a memory buffer.
+   If malloc fails, this will print a message to stderr and exit.  */
+
+char *
+xstrdup (const char *s)
+{
+  char *ret = strdup (s);
+  if (ret == NULL)
+    malloc_failure (strlen (s) + 1);
+  return ret;
+}
+
 /* Print the system error message for errno, and also mention STRING
    as the file name for which the error was encountered.
    Then return to command level.  */
 
 void
-perror_with_name (string)
-     char *string;
+perror_with_name (const char *string)
 {
-  extern int sys_nerr;
-  extern char *sys_errlist[];
-  extern int errno;
-  char *err;
+  const char *err;
   char *combined;
 
-  if (errno < sys_nerr)
-    err = sys_errlist[errno];
-  else
+  err = strerror (errno);
+  if (err == NULL)
     err = "unknown error";
 
   combined = (char *) alloca (strlen (err) + strlen (string) + 3);
@@ -55,33 +113,14 @@ perror_with_name (string)
    STRING is the error message, used as a fprintf string,
    and ARG is passed as an argument to it.  */
 
-#ifdef ANSI_PROTOTYPES
-NORETURN void
-error (const char *string,...)
-#else
 void
-error (va_alist)
-     va_dcl
-#endif
+error (const char *string,...)
 {
   extern jmp_buf toplevel;
   va_list args;
-#ifdef ANSI_PROTOTYPES
   va_start (args, string);
-#else
-  va_start (args);
-#endif
   fflush (stdout);
-#ifdef ANSI_PROTOTYPES
   vfprintf (stderr, string, args);
-#else
-  {
-    char *string1;
-
-    string1 = va_arg (args, char *);
-    vfprintf (stderr, string1, args);
-  }
-#endif
   fprintf (stderr, "\n");
   longjmp (toplevel, 1);
 }
@@ -91,25 +130,26 @@ error (va_alist)
    STRING and ARG are passed to fprintf.  */
 
 /* VARARGS */
-NORETURN void
-#ifdef ANSI_PROTOTYPES
-fatal (char *string,...)
-#else
-fatal (va_alist)
-     va_dcl
-#endif
+void
+fatal (const char *string,...)
 {
   va_list args;
-#ifdef ANSI_PROTOTYPES
   va_start (args, string);
-#else
-  char *string;
-  va_start (args);
-  string = va_arg (args, char *);
-#endif
-  fprintf (stderr, "gdb: ");
+  fprintf (stderr, "gdbserver: ");
   vfprintf (stderr, string, args);
   fprintf (stderr, "\n");
   va_end (args);
   exit (1);
 }
+
+/* VARARGS */
+void
+warning (const char *string,...)
+{
+  va_list args;
+  va_start (args, string);
+  fprintf (stderr, "gdbserver: ");
+  vfprintf (stderr, string, args);
+  fprintf (stderr, "\n");
+  va_end (args);
+}