removed this function which was not publically exported in glib.h. to

Mon Aug 24 02:08:56 1998  Tim Janik  <timj@gtk.org>

        * glib.h:
        * gstring.c:
        * gstrfuncs.c:
        (g_vsprintf): removed this function which was not publically
        exported in glib.h. to export it, it should have been named
        differently in the first place, since its semantics differ from
        vsprintf(). apart from that, it was a possible cause for
        problems since it worked on a previously allocated memory area and
        was used in a lot places of glib. exporting it would have been a
        guararant for problems with threaded programs.
        (g_printf_string_upper_bound): exported this function to return
        a string size, guarranteed to be big enough to hold the fully
        expanded format+args string. added 'q', 'L' and 'll' flag handling.
        in fact, the newly allocated area is in most cases much bigger than
        required.
        (g_strdup_vprintf()): new function returning a newly allocated string
        containing the contents of *format and associated args (size is
        calculated with g_printf_string_upper_bound()).
        (g_strdup_printf): new function which wraps g_strdup_vprintf().

        * configure.in: check for va_copy() or __va_copy() alternatively.
        check whether va_lists can be copyied by value.

        * glib.h: provide a definition for G_VA_COPY.

        * glib.h:
        * gmessages.c:
        (g_logv):
        (g_vsnprintf):
        pass va_lists by value, not by reference, since this causes problems
        on platforms that implement va_list as as arrays. internaly, use
        G_VA_COPY (new_arg, org_arg); va_end (new_arg); to produce a second
        va_list variable, if multiple passes are required. changed all
        callers.

        * glib.h:
        * gerror.h:
        renamed g_debug() to g_on_error_query(), cleaned up a bit.
        renamed g_stack_trace() to g_on_error_stack_trace() since both
        functions cluttered different namespaces.
        there is an appropriate comment in glib.h now that explains the
        unix and gdb specific dependencies of both functions.
        removed g_attach_process().
        g_on_error_stack_trace() should probably be handled with caution,
        i've seem several different linux versions (2.0.x) become unstable
        after invokation of this function.

1 files changed, 83 insertions, 91 deletions

diff --git a/gbacktrace.c b/gbacktrace.c
index cff505b65..b2834b289 100644
--- a/gbacktrace.c
+++ b/gbacktrace.c
@@ -36,9 +36,6 @@
 #include <string.h> /* for bzero on BSD systems */
 #endif
 
-#define INTERACTIVE 0
-#define STACK_TRACE 1
-
 
 #ifndef NO_FD_SET
 #  define SELECT_MASK fd_set
@@ -54,104 +51,105 @@
 #endif
 
 
-static int  do_query (char *prompt);
-static void debug (const gchar *progname, int method);
-static void stack_trace (char **);
-static void stack_trace_sigchld (int);
-
+static void stack_trace (char **args);
 
-static int stack_trace_done;
+extern volatile gboolean glib_on_error_halt;
+volatile gboolean glib_on_error_halt = TRUE;
 
 void
-g_debug (const gchar *progname)
+g_on_error_query (const gchar *prg_name)
 {
-  char buf[32];
-
-  fprintf (stdout, "[n]othing, [e]xit, [s]tack trace, [a]ttach to process: ");
+  static const gchar *query1 = "[E]xit, [H]alt";
+  static const gchar *query2 = ", show [S]tack trace";
+  static const gchar *query3 = " or [P]roceed";
+  gchar buf[16];
+
+  if (!prg_name)
+    prg_name = g_get_prgname ();
+  
+ retry:
+  
+  if (prg_name)
+    fprintf (stdout,
+	     "%s (pid:%u): %s%s%s: ",
+	     prg_name,
+	     (guint) getpid (),
+	     query1,
+	     query2,
+	     query3);
+  else
+    fprintf (stdout,
+	     "(process:%u): %s%s: ",
+	     (guint) getpid (),
+	     query1,
+	     query3);
   fflush (stdout);
-
-  fgets (buf, 32, stdin);
-  if (strcmp (buf, "n\n") == 0)
+  
+  fgets (buf, 8, stdin);
+
+  if ((buf[0] == 'E' || buf[0] == 'e')
+      && buf[1] == '\n')
+    _exit (0);
+  else if ((buf[0] == 'P' || buf[0] == 'p')
+	   && buf[1] == '\n')
     return;
-  else if (strcmp (buf, "s\n") == 0)
-    debug (progname, STACK_TRACE);
-  else if (strcmp (buf, "a\n") == 0)
-    debug (progname, INTERACTIVE);
+  else if (prg_name
+	   && (buf[0] == 'S' || buf[0] == 's')
+	   && buf[1] == '\n')
+    {
+      g_on_error_stack_trace (prg_name);
+      goto retry;
+    }
+  else if ((buf[0] == 'H' || buf[0] == 'h')
+	   && buf[1] == '\n')
+    {
+      while (glib_on_error_halt)
+	;
+      glib_on_error_halt = TRUE;
+      return;
+    }
   else
-    exit (0);
-}
-
-void
-g_attach_process (const gchar *progname,
-		  gboolean     query)
-{
-  if (!query || do_query ("attach to process"))
-    debug (progname, INTERACTIVE);
+    goto retry;
 }
 
 void
-g_stack_trace (const gchar *progname,
-	       gboolean     query)
-{
-  if (!query || do_query ("print stack trace"))
-    debug (progname, STACK_TRACE);
-}
-
-static int
-do_query (char *prompt)
-{
-  char buf[32];
-
-  fprintf (stdout, "%s (y/n) ", prompt);
-  fflush (stdout);
-
-  fgets (buf, 32, stdin);
-  if ((strcmp (buf, "yes\n") == 0) ||
-      (strcmp (buf, "y\n") == 0) ||
-      (strcmp (buf, "YES\n") == 0) ||
-      (strcmp (buf, "Y\n") == 0))
-    return TRUE;
-
-  return FALSE;
-}
-
-static void
-debug (const char *progname,
-       int   method)
+g_on_error_stack_trace (const gchar *prg_name)
 {
   pid_t pid;
-  char buf[16];
-  char *args[4] = { "gdb", NULL, NULL, NULL };
-  volatile int x;
+  gchar buf[16];
+  gchar *args[4] = { "gdb", NULL, NULL, NULL };
+
+  if (!prg_name)
+    return;
 
-  sprintf (buf, "%d", (int) getpid ());
+  sprintf (buf, "%u", (guint) getpid ());
 
-  args[1] = (gchar*) progname;
+  args[1] = (gchar*) prg_name;
   args[2] = buf;
 
-  switch (method)
+  pid = fork ();
+  if (pid == 0)
     {
-    case INTERACTIVE:
-      fprintf (stdout, "pid: %s\n", buf);
-      break;
-    case STACK_TRACE:
-      pid = fork ();
-      if (pid == 0)
-	{
-	  stack_trace (args);
-	  _exit (0);
-	}
-      else if (pid == (pid_t) -1)
-	{
-	  perror ("could not fork");
-	  return;
-	}
-      break;
+      stack_trace (args);
+      _exit (0);
     }
-
-  x = 1;
-  while (x)
+  else if (pid == (pid_t) -1)
+    {
+      perror ("unable to fork gdb");
+      return;
+    }
+  
+  while (glib_on_error_halt)
     ;
+  glib_on_error_halt = TRUE;
+}
+
+static gboolean stack_trace_done = FALSE;
+
+static void
+stack_trace_sigchld (int signum)
+{
+  stack_trace_done = TRUE;
 }
 
 static void
@@ -167,12 +165,12 @@ stack_trace (char **args)
   char buffer[256];
   char c;
 
-  stack_trace_done = 0;
+  stack_trace_done = FALSE;
   signal (SIGCHLD, stack_trace_sigchld);
 
   if ((pipe (in_fd) == -1) || (pipe (out_fd) == -1))
     {
-      perror ("could open pipe");
+      perror ("unable to open pipe");
       _exit (0);
     }
 
@@ -189,7 +187,7 @@ stack_trace (char **args)
     }
   else if (pid == (pid_t) -1)
     {
-      perror ("could not fork");
+      perror ("unable to fork");
       _exit (0);
     }
 
@@ -252,9 +250,3 @@ stack_trace (char **args)
   close (out_fd[1]);
   _exit (0);
 }
-
-static void
-stack_trace_sigchld (int signum)
-{
-  stack_trace_done = 1;
-}