From 904be498c59dfc4b5ecbec636c04a60d16c1b28e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 29 Oct 2024 00:33:21 -0400
Subject: [PATCH] Small improvements to g_on_error_query

We can do the [S] option even if g_prgname isn't set, now that
g_on_error_stack_trace(NULL) works.
---
 glib/gbacktrace.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index af59f479b..3d5774e5e 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -157,20 +157,12 @@ g_on_error_query (const gchar *prg_name)
 
  retry:
 
-  if (prg_name)
-    _g_fprintf (stdout,
-                "%s (pid:%u): %s%s%s: ",
-                prg_name,
-                (guint) getpid (),
-                query1,
-                query2,
-                query3);
-  else
-    _g_fprintf (stdout,
-                "(process:%u): %s%s: ",
-                (guint) getpid (),
-                query1,
-                query3);
+  _g_fprintf (stdout,
+              "(process:%u): %s%s%s: ",
+              (guint) getpid (),
+              query1,
+              query2,
+              query3);
   fflush (stdout);
 
   if (isatty(0) && isatty(1))
@@ -189,8 +181,7 @@ g_on_error_query (const gchar *prg_name)
   else if ((buf[0] == 'P' || buf[0] == 'p')
            && buf[1] == '\n')
     return;
-  else if (prg_name
-           && (buf[0] == 'S' || buf[0] == 's')
+  else if ((buf[0] == 'S' || buf[0] == 's')
            && buf[1] == '\n')
     {
       g_on_error_stack_trace (prg_name);