--- bug-buddy-2.6.1/configure.in	Fri Apr 16 17:11:54 2004

+++ bug-buddy-2.6.1-new/configure.in	Tue Nov  2 15:56:53 2004

@@ -70,7 +70,12 @@ AM_GLIB_GNU_GETTEXT

 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)

-                                                                                                                             

+AC_CANONICAL_HOST

+case "$host" in

+*solaris*)

+	AC_DEFINE(SOLARIS,1,Define to 1 if solaris)

+	;;

+esac	                                                                                                                             

 AC_ARG_ENABLE(deprecations,AC_HELP_STRING([--enable-deprecations],[warn about deprecated usages]))

 AM_CONDITIONAL(ENABLE_DEPRECATIONS, test "x$enable_deprecations" = xyes)

--- bug-buddy-2.6.1/src/gdb-buddy.c	Wed Oct  8 20:10:04 2003

+++ bug-buddy-2.6.1-new/src/gdb-buddy.c	Tue Nov  2 19:34:55 2004

@@ -161,19 +161,33 @@ get_trace_from_core (const gchar *core_f

 	int status;

 	FILE *f;

-	gdb_cmd = g_strdup_printf ("gdb --batch --core=%s", core_file);

+#ifdef SOLARIS

+	char *gdb = g_find_program_in_path ("gdb");

+	if (gdb)

+#endif

+		gdb_cmd = g_strdup_printf ("gdb --batch --core=%s", core_file);

+#ifdef SOLARIS

+	else

+		gdb_cmd = g_strdup_printf ("pstack %s", core_file);

+#endif

 	f = popen (gdb_cmd, "r");

 	g_free (gdb_cmd);

 	if (!f) {

 		GtkWidget *d;

+		char *str = "gdb";

+#ifdef SOLARIS

+		if (!gdb)

+			str = "pstack";

+#endif

+

 		d = gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("druid-window")),

 					    0,

 					    GTK_MESSAGE_ERROR,

 					    GTK_BUTTONS_OK,

-					    _("Unable to process core file with gdb:\n"

-					      "'%s'"), core_file);

+					    _("Unable to process core file with %s:\n"

+					      "'%s'"), str, core_file);

 		gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);

 		gtk_dialog_run (GTK_DIALOG (d));

 		gtk_widget_destroy (d);

@@ -193,18 +207,39 @@ get_trace_from_core (const gchar *core_f

 				binary = g_strdup(s);

 			}

 		}

+#ifdef SOLARIS

+		else if (!binary && !strncmp(buf, "core ", 4)) {

+			gchar *s;

+			gchar *ptr = buf;

+			while (*ptr != ':' && *ptr !='\0') ptr++;

+			if (*ptr == ':') {

+				ptr++;

+				while (*ptr == ' ' || *ptr == '\t') ptr++;

+				s = ptr;

+				while (*ptr !='\0') ptr++;

+				*ptr = '\0';

+				binary = g_strdup(s);

+			}

+		}

+#endif

 	}

 	status = pclose(f);

 	if (!binary) {

 		GtkWidget *d;

+		char *str = "GDB";

+#ifdef SOLARIS

+		if (!gdb)

+			str = "Pstack";

+#endif

+

 		d = gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("druid-window")),

 					    0,

 					    GTK_MESSAGE_ERROR,

 					    GTK_BUTTONS_OK,

-					    _("GDB was unable to determine which binary created\n"

-					      "'%s'"), core_file);

+					    _("%s was unable to determine which binary created\n"

+					      "'%s'"), str, core_file);

 		gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);

 		gtk_dialog_run (GTK_DIALOG (d));

 		gtk_widget_destroy (d);

@@ -276,21 +311,41 @@ get_trace_from_pair (const gchar *app, c

 	const char *short_app;

 	char *long_app;

 	GError *error = NULL;

-	char *args[] = { "gdb",

-			 "--batch", 

-			 "--quiet",

-			 "--command=" BUDDY_DATADIR "/gdb-cmd",

-			 NULL, NULL, NULL };

-	args[0] = g_find_program_in_path ("gdb");

-	args[5] = (char *)extra;

+	char *args[7];

+	char *gdb = g_find_program_in_path ("gdb");

+

+        if (!app || !extra || !*app || !*extra)

+                return;

+

+	if (gdb) {

+		args[0] =  gdb;

+		args[1] = "--batch";

+		args[2] = "--quiet";

+		args[3] = "--command=" BUDDY_DATADIR "/gdb-cmd";

+		args[4] = NULL;

+		args[5] = (char *)extra;

+		args[6] = NULL;

+	}

+#ifdef SOLARIS

+	else {

+		args[0] = g_find_program_in_path ("pstack");

+		args[1] = (char *)extra;

+		args[2] = args[3] = args[4] =  args[5] = args[6] = NULL;

+	}

+#endif

 	if (!args[0]) {

+		char *str = "GDB";

+#ifdef SOLARIS

+		if (!gdb)		

+			str = "Pstack";

+#endif

 		d = gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("druid-window")),

 					    0,

 					    GTK_MESSAGE_ERROR,

 					    GTK_BUTTONS_OK,

-					    _("GDB could not be found on your system.\n"

-					      "Debugging information will not be obtained."));

+					    _("%s could not be found on your system.\n"

+					      "Debugging information will not be obtained."), str);

 		d(g_message ("Path: %s", getenv ("PATH")));

 		gtk_dialog_set_default_response (GTK_DIALOG (d),

 						 GTK_RESPONSE_OK);

@@ -299,10 +354,6 @@ get_trace_from_pair (const gchar *app, c

 		return;

 	}

-	if (!app || !extra || !*app || !*extra)

-		return;

-	

-

 	if (*app == G_DIR_SEPARATOR) {

 		long_app = g_strdup (app);

 		short_app = strrchr (app, G_DIR_SEPARATOR) + 1;

@@ -322,24 +373,24 @@ get_trace_from_pair (const gchar *app, c

 		g_free (args[0]);

 		return;

 	}

-

-	args[4] = long_app;

-

 	d(g_message ("About to debug '%s'", long_app));

-	

-	if (!g_file_test (BUDDY_DATADIR "/gdb-cmd", G_FILE_TEST_EXISTS)) {

-		d = gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("druid-window")),

-					    0,

-					    GTK_MESSAGE_ERROR,

-					    GTK_BUTTONS_OK,

-					    _("Could not find the gdb-cmd file.\n"

-					      "Please try reinstalling Bug Buddy."));

-		gtk_dialog_run (GTK_DIALOG (d));

-		gtk_dialog_set_default_response (GTK_DIALOG (d),

-						 GTK_RESPONSE_OK);

-		gtk_widget_destroy (d);

-		g_free (long_app);

-		return;

+

+	if (gdb) {

+		args[4] = long_app;

+		if (!g_file_test (BUDDY_DATADIR "/gdb-cmd", G_FILE_TEST_EXISTS)) {

+			d = gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("druid-window")),

+						    0,

+						    GTK_MESSAGE_ERROR,

+						    GTK_BUTTONS_OK,

+						    _("Could not find the gdb-cmd file.\n"

+						      "Please try reinstalling Bug Buddy."));

+			gtk_dialog_run (GTK_DIALOG (d));

+			gtk_dialog_set_default_response (GTK_DIALOG (d),

+							 GTK_RESPONSE_OK);

+			gtk_widget_destroy (d);

+			g_free (long_app);

+			return;

+		}

 	}

 	if (!g_spawn_async_with_pipes (NULL, args, NULL, 0, NULL, NULL,

@@ -347,11 +398,18 @@ get_trace_from_pair (const gchar *app, c

 				       NULL, 

 				       &druid_data.fd, 

 				       NULL, &error)) {

+		char *str = "gdb";

+#ifdef SOLARIS

+		if (!gdb)

+			str = "pstack";

+#endif

+

 		d = gtk_message_dialog_new (GTK_WINDOW (GTK_WIDGET ("druid-window")),

 					    0,

 					    GTK_MESSAGE_ERROR,

 					    GTK_BUTTONS_OK,

-					    _("There was an error running gdb:\n\n%s"),

+					    _("There was an error running %s:\n\n%s"),

+					    str, 

 					    error->message);

 		gtk_dialog_run (GTK_DIALOG (d));

 		gtk_dialog_set_default_response (GTK_DIALOG (d),