diff -crN ./bug-buddy/bugzilla/gnome/products /users3/dionjp/sb/gnome_221/src/./bug-buddy/bugzilla/gnome/products *** ./bug-buddy/bugzilla/gnome/products Mon Mar 10 21:14:29 2003 --- /users3/dionjp/sb/gnome_221/src/./bug-buddy/bugzilla/gnome/products Mon Aug 18 11:03:33 2003 *************** *** 8,17 **** ! ! ! ! --- 8,17 ---- ! ! ! ! *************** *** 32,39 **** ! ! --- 32,39 ---- ! ! *************** *** 63,74 **** --- 63,76 ---- + + *************** *** 80,86 **** ! --- 82,88 ---- ! *************** *** 150,155 **** --- 152,158 ---- + *************** *** 165,174 **** ! ! ! --- 168,177 ---- ! ! ! *************** *** 226,231 **** --- 229,235 ---- + *************** *** 237,242 **** --- 241,247 ---- + *************** *** 272,277 **** --- 277,283 ---- + *************** *** 299,313 **** ! ! ! ! ! ! ! --- 305,326 ---- + + + + + + + ! ! ! ! ! ! ! *************** *** 315,320 **** --- 328,334 ---- + *************** *** 338,346 **** ! --- 352,361 ---- ! + *************** *** 349,354 **** --- 364,370 ---- + *************** *** 376,381 **** --- 392,404 ---- + + + + + + + *************** *** 416,423 **** ! ! --- 439,445 ---- ! *************** *** 482,487 **** --- 504,514 ---- + + + + + *************** *** 507,515 **** ! ! ! --- 534,542 ---- ! ! ! *************** *** 525,544 **** ! ! - - - - - --- 552,567 ---- + ! + *************** *** 554,585 **** ! - - - - - - - - - - - - - - - - - - - --- 577,590 ---- ! + *************** *** 615,620 **** --- 620,630 ---- + + + + + *************** *** 639,645 **** ! --- 649,655 ---- ! *************** *** 655,660 **** --- 665,674 ---- + + + + *************** *** 708,713 **** --- 722,728 ---- + *************** *** 724,748 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 739,751 ---- ! ! ! ! ! ! ! *************** *** 752,758 **** - --- 755,760 ---- *************** *** 762,769 **** --- 764,773 ---- + + *************** *** 783,788 **** --- 787,793 ---- + *************** *** 795,803 **** ! --- 800,809 ---- + ! *************** *** 827,832 **** --- 833,839 ---- + *************** *** 886,895 **** --- 893,910 ---- + + + + + + + + *************** *** 998,1004 **** ! --- 1013,1019 ---- ! *************** *** 1090,1096 **** ! --- 1105,1112 ---- ! ! *************** *** 1138,1144 **** ! --- 1154,1160 ---- ! *************** *** 1175,1180 **** --- 1191,1197 ---- + *************** *** 1208,1259 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 1225,1231 ---- ! *************** *** 1282,1287 **** --- 1254,1260 ---- + *************** *** 1292,1297 **** --- 1265,1271 ---- + *************** *** 1300,1305 **** --- 1274,1280 ---- + *************** *** 1317,1322 **** --- 1292,1300 ---- + + + *************** *** 1336,1341 **** --- 1314,1320 ---- + *************** *** 1405,1411 **** ! --- 1384,1390 ---- ! *************** *** 1414,1419 **** --- 1393,1399 ---- + *************** *** 1489,1494 **** --- 1469,1475 ---- + *************** *** 1501,1506 **** --- 1482,1488 ---- + *************** *** 1509,1514 **** --- 1491,1497 ---- + *************** *** 1534,1539 **** --- 1517,1523 ---- + *************** *** 1542,1548 **** ! --- 1526,1532 ---- ! *************** *** 1553,1558 **** --- 1537,1544 ---- + + *************** *** 1561,1566 **** --- 1547,1553 ---- + *************** *** 1568,1575 **** ! --- 1555,1563 ---- + ! *************** *** 1583,1588 **** --- 1571,1578 ---- + + *************** *** 1602,1611 **** ! --- 1592,1603 ---- ! + + *************** *** 1627,1632 **** --- 1619,1630 ---- + + + + + + *************** *** 1663,1668 **** --- 1661,1667 ---- + *************** *** 1692,1697 **** --- 1691,1697 ---- + *************** *** 1702,1710 **** ! --- 1702,1711 ---- + ! *************** *** 1712,1726 **** ! ! ! ! ! --- 1713,1727 ---- ! ! ! ! ! *************** *** 1735,1749 **** ! ! ! --- 1736,1751 ---- ! ! ! + *************** *** 1770,1775 **** --- 1772,1779 ---- + + --- 1783,1790 ---- new codecs and filters by writing a simple plugin with a clean, generic interface. GStreamer is released under the LGPL, with many of the included plugins retaining the license of the code they were derived from, usually ! GPL or BSD." maxvotesperbug="10000" milestoneurl="http://www.gstreamer.net" votesperuser="0" defaultmilestone="HEAD" name="GStreamer" disallownew="0"> ! *************** *** 1788,1794 **** ! --- 1793,1799 ---- ! *************** *** 1797,1802 **** --- 1802,1812 ---- + + + + + *************** *** 1819,1842 **** ! ! ! --- 1829,1855 ---- + ! ! ! + + *************** *** 1852,1857 **** --- 1865,1872 ---- + + + + + + + *************** *** 1881,1886 **** --- 1901,1933 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + *************** *** 1975,1980 **** --- 2023,2030 ---- + + *************** *** 1993,1998 **** --- 2043,2053 ---- + + + + + *************** *** 2035,2048 **** ! --- 2090,2114 ---- ! + + + + + + + + + + + *************** *** 2056,2062 **** ! ! ! ! ! ! ! ! --- 2147,2179 ---- ! + + + + + + + + + + + + + + + + ! ! *************** *** 2189,2214 **** ! ! ! ! ! --- 2274,2435 ---- + + + + + + ! ! ! ! ! ! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -crN ./bug-buddy/configure.in /users3/dionjp/sb/gnome_221/src/./bug-buddy/configure.in *** ./bug-buddy/configure.in Mon Mar 10 21:15:20 2003 --- /users3/dionjp/sb/gnome_221/src/./bug-buddy/configure.in Tue Jul 8 12:58:25 2003 *************** *** 8,13 **** --- 8,14 ---- AM_MAINTAINER_MODE AC_PROG_INTLTOOL + AC_PROG_LIBTOOL SCROLLKEEPER_REQUIRED=0.3.8 AC_SUBST(SCROLLKEEPER_REQUIRED) *************** *** 65,70 **** --- 66,85 ---- AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + dnl if the host in an aix system, check the presence of gdb and dbx + case "$host" in + *aix*) + AC_CHECK_PROGS(DBG_NAME, gdb dbx, gdb) + if test x$DBG_NAME = xdbx ; then + AC_DEFINE(HAVE_AND_USE_DBX, , define this variable if dbx is present on the system and should be used) + fi + ;; + *) + ;; + esac + + + AC_OUTPUT([ bug-buddy.spec Makefile diff -crN ./bug-buddy/src/Makefile.am /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/Makefile.am *** ./bug-buddy/src/Makefile.am Mon Dec 16 23:43:30 2002 --- /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/Makefile.am Tue Jul 8 13:00:09 2003 *************** *** 32,37 **** --- 32,39 ---- bin_PROGRAMS = bug-buddy + bin_SCRIPTS = dbx-cmd dbx-core + $(bug_buddy_OBJECTS): $(bb_built_sources) bug_buddy_SOURCES = \ *************** *** 100,102 **** --- 102,105 ---- for file in $(DONT_DIST_SOURCE) ; do \ rm -f $(distdir)/$$file ; \ done + diff -crN ./bug-buddy/src/bug-buddy.h /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/bug-buddy.h *** ./bug-buddy/src/bug-buddy.h Mon Dec 16 23:43:30 2002 --- /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/bug-buddy.h Tue Jul 8 13:01:37 2003 *************** *** 160,167 **** --- 160,175 ---- void druid_set_sensitive (gboolean prev, gboolean next, gboolean cancel); void druid_set_state (BuddyState state); + + #ifdef HAVE_AND_USE_DBX + void get_trace_with_dbx (char **args, const gchar *app); + void get_trace_from_pid_with_dbx (const gchar *app, const gchar *extra); + void get_trace_from_core_with_dbx (const gchar *core_file); + #else void get_trace_from_core (const gchar *core_file); void get_trace_from_pair (const gchar *app, const gchar *extra); + #endif + void stop_gdb (void); void start_gdb (void); diff -crN ./bug-buddy/src/bugzilla.c /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/bugzilla.c *** ./bug-buddy/src/bugzilla.c Sat Feb 1 19:50:03 2003 --- /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/bugzilla.c Thu Aug 21 15:16:28 2003 *************** *** 571,591 **** { xmlDoc *doc; ! if (bts->products_xml) { // && !bts->products_xml->done) { doc = load_bugzilla_xml_file (bts->products_xml); if (doc) load_products_xml (bts, doc); bts->products_xml->done = TRUE; } ! if (bts->config_xml) { // && !bts->config_xml->done) { doc = load_bugzilla_xml_file (bts->config_xml); if (doc) load_config_xml (bts, doc); bts->config_xml->done = TRUE; } ! if (bts->mostfreq_xml) { // && !bts->mostfreq_xml->done) { doc = load_bugzilla_xml_file (bts->mostfreq_xml); if (doc) load_mostfreq_xml (bts, doc); --- 571,591 ---- { xmlDoc *doc; ! if (bts->products_xml) { /* && !bts->products_xml->done) { */ doc = load_bugzilla_xml_file (bts->products_xml); if (doc) load_products_xml (bts, doc); bts->products_xml->done = TRUE; } ! if (bts->config_xml) { /* && !bts->config_xml->done) { */ doc = load_bugzilla_xml_file (bts->config_xml); if (doc) load_config_xml (bts, doc); bts->config_xml->done = TRUE; } ! if (bts->mostfreq_xml) { /* && !bts->mostfreq_xml->done) { */ doc = load_bugzilla_xml_file (bts->mostfreq_xml); if (doc) load_mostfreq_xml (bts, doc); diff -crN ./bug-buddy/src/bugzilla.h /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/bugzilla.h *** ./bug-buddy/src/bugzilla.h Mon Dec 16 23:43:30 2002 --- /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/bugzilla.h Tue Jul 8 13:02:13 2003 *************** *** 146,152 **** MOSTFREQ_DESC, MOSTFREQ_SHOWN, ! MOSTFREQ_COLS, }; void load_applications (void); --- 146,152 ---- MOSTFREQ_DESC, MOSTFREQ_SHOWN, ! MOSTFREQ_COLS }; void load_applications (void); diff -crN ./bug-buddy/src/cell-renderer-uri.c /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/cell-renderer-uri.c *** ./bug-buddy/src/cell-renderer-uri.c Sat Dec 14 17:14:17 2002 --- /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/cell-renderer-uri.c Tue Jul 8 13:02:33 2003 *************** *** 11,22 **** enum { PROP_0, PROP_URI, ! PROP_SHOWN, }; enum { SIGNAL_URI_SHOWN, ! LAST_SIGNAL, }; static guint uri_cell_signals[LAST_SIGNAL] = { 0 }; --- 11,22 ---- enum { PROP_0, PROP_URI, ! PROP_SHOWN }; enum { SIGNAL_URI_SHOWN, ! LAST_SIGNAL }; static guint uri_cell_signals[LAST_SIGNAL] = { 0 }; diff -crN ./bug-buddy/src/config.c /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/config.c *** ./bug-buddy/src/config.c Mon Dec 16 23:43:30 2002 --- /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/config.c Thu Aug 14 13:50:32 2003 *************** *** 37,43 **** CONFIG_ENTRY, CONFIG_USER, CONFIG_MAILER, ! CONFIG_INT_ENTRY, } ConfigType; typedef struct { --- 37,43 ---- CONFIG_ENTRY, CONFIG_USER, CONFIG_MAILER, ! CONFIG_INT_ENTRY } ConfigType; typedef struct { *************** *** 58,64 **** { CONFIG_MAILER, "email-sendmail-gnome-entry", "/bug-buddy/last/mailer", "email-sendmail-entry" }, { CONFIG_ENTRY, "email-file-gnome-entry", "/bug-buddy/last/bugfile", "email-file-entry" }, { CONFIG_TOGGLE, "email-sendmail-radio", "/bug-buddy/last/use_sendmail=true" }, ! //{ CONFIG_INT_ENTRY, "last-updated-entry", "/bug-buddy/last/last_update_check" }, { CONFIG_DONE } }; --- 58,64 ---- { CONFIG_MAILER, "email-sendmail-gnome-entry", "/bug-buddy/last/mailer", "email-sendmail-entry" }, { CONFIG_ENTRY, "email-file-gnome-entry", "/bug-buddy/last/bugfile", "email-file-entry" }, { CONFIG_TOGGLE, "email-sendmail-radio", "/bug-buddy/last/use_sendmail=true" }, ! /*{ CONFIG_INT_ENTRY, "last-updated-entry", "/bug-buddy/last/last_update_check" },*/ { CONFIG_DONE } }; *************** *** 190,197 **** #if 0 if (gnome_config_get_bool ("/bug-buddy/last/show_debugging=0")) gtk_button_clicked (GTK_BUTTON (GET_WIDGET ("debugging-options-button"))); - #endif if (gnome_config_get_bool ("/bug-buddy/last/show_products=1")) gtk_button_clicked (GTK_BUTTON (GET_WIDGET ("product-toggle"))); } --- 190,197 ---- #if 0 if (gnome_config_get_bool ("/bug-buddy/last/show_debugging=0")) gtk_button_clicked (GTK_BUTTON (GET_WIDGET ("debugging-options-button"))); if (gnome_config_get_bool ("/bug-buddy/last/show_products=1")) gtk_button_clicked (GTK_BUTTON (GET_WIDGET ("product-toggle"))); + #endif } diff -crN ./bug-buddy/src/dbx-cmd /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/dbx-cmd *** ./bug-buddy/src/dbx-cmd Thu Jan 1 01:00:00 1970 --- /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/dbx-cmd Mon Sep 16 08:51:05 2002 *************** *** 0 **** --- 1,4 ---- + dbx $* </dev/null + where + detach + !EOF diff -crN ./bug-buddy/src/dbx-core /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/dbx-core *** ./bug-buddy/src/dbx-core Thu Jan 1 01:00:00 1970 --- /users3/dionjp/sb/gnome_221/src/./bug-buddy/src/dbx-core Mon Sep 16 08:51:56 2002 *************** *** 0 **** --- 1,3 ---- + dbx $* < - - #include "bug-buddy.h" - - #include - #include #include --- 18,23 ---- *************** *** 32,37 **** --- 26,37 ---- #include #include + #include + + #include "bug-buddy.h" + + #include + #include #define d(x) *************** *** 93,99 **** --- 93,103 ---- (old_type != CRASH_DIALOG) || (!old_app || strcmp (app, old_app)) || (!old_extra || strcmp (extra, old_extra))) { + #ifdef HAVE_AND_USE_DBX + get_trace_from_pid_with_dbx (app, extra); + #else get_trace_from_pair (app, extra); + #endif } break; case CRASH_CORE: *************** *** 101,107 **** --- 105,115 ---- if (druid_data.explicit_dirty || (old_type != CRASH_CORE) || (!old_extra || strcmp (extra, old_extra))) { + #ifdef HAVE_AND_USE_DBX + get_trace_from_core_with_dbx (extra); + #else get_trace_from_core (extra); + #endif } break; default: *************** *** 152,167 **** return; } void ! get_trace_from_core (const gchar *core_file) { gchar *gdb_cmd; gchar buf[1024]; gchar *binary = NULL; int status; FILE *f; ! gdb_cmd = g_strdup_printf ("gdb --batch --core=%s", core_file); f = popen (gdb_cmd, "r"); g_free (gdb_cmd); --- 160,308 ---- return; } + static gboolean + handle_gdb_input (GIOChannel *ioc, GIOCondition condition, gpointer data) + { + gboolean retval = FALSE; + gchar buf[1024]; + guint len; + GIOStatus io_status; + + gdb_try_read: + io_status = g_io_channel_read_chars (ioc, buf, 1024, &len, NULL); + + switch (io_status) { + case G_IO_STATUS_AGAIN: + goto gdb_try_read; + case G_IO_STATUS_ERROR: + d(g_warning (_("Error on read... aborting"))); + break; + case G_IO_STATUS_NORMAL: + retval = TRUE; + break; + default: + break; + } + + if (len > 0) { + GtkTextIter end; + GtkTextBuffer *buffy; + GtkTextView *tv; + + tv = GTK_TEXT_VIEW (GET_WIDGET ("gdb-text")); + buffy = gtk_text_view_get_buffer (tv); + + gtk_text_buffer_get_end_iter (buffy, &end); + gtk_text_buffer_insert (buffy, &end, buf, len); + } + + if (!retval) + stop_gdb (); + + return retval; + } + + #ifdef HAVE_AND_USE_DBX + + void + get_trace_with_dbx (char **args, const gchar *app) + { + GtkWidget *d; + char *s; + args[0] = g_find_program_in_path ("dbx-cmd"); + + if (!args[0]) { + d = gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("druid-window")), + 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("dbx-cmd could not be found on your system.\n" + "Debugging information will not be obtained.")); + d(g_message ("Path: %s", getenv ("PATH"))); + gtk_dialog_set_default_response (GTK_DIALOG (d), + GTK_RESPONSE_OK); + gtk_dialog_run (GTK_DIALOG (d)); + gtk_widget_destroy (d); + return; + } + if (!app || !*app) { + g_free(args[0]); + return; + } + + d(g_message ("About to debug '%s'", app)); + + if (!g_find_program_in_path ("dbx")) { + d = gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("druid-window")), + 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("dbx could not be found on your system.\n" + "Debugging information will not be obtained.")); + d(g_message ("Path: %s", getenv ("PATH"))); + gtk_dialog_set_default_response (GTK_DIALOG (d), + GTK_RESPONSE_OK); + gtk_dialog_run (GTK_DIALOG (d)); + gtk_widget_destroy (d); + g_free(args[0]); + return; + } + + /* FIXME: use GError */ + if (!g_spawn_async_with_pipes (NULL, args, NULL, 0, NULL, NULL, + &druid_data.gdb_pid, + NULL, + &druid_data.fd, + NULL, NULL)) { + d = gtk_message_dialog_new (GTK_WINDOW (GTK_WIDGET ("druid-window")), + 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("There was an error running dbx-cmd.")); + gtk_dialog_run (GTK_DIALOG (d)); + gtk_dialog_set_default_response (GTK_DIALOG (d), + GTK_RESPONSE_OK); + gtk_widget_destroy (d); + g_free (args[0]); + return; + } + + druid_data.ioc = g_io_channel_unix_new (druid_data.fd); + + s = g_strdup_printf ("Backtrace was generated from '%s'\n\n", app); + buddy_set_text ("gdb-text", s); + g_free (s); + g_io_add_watch (druid_data.ioc, G_IO_IN | G_IO_HUP, + handle_gdb_input, NULL); + g_io_channel_unref (druid_data.ioc); + + druid_set_sensitive (FALSE, FALSE, TRUE); + start_animation (); + + gtk_widget_set_sensitive (GTK_WIDGET (GET_WIDGET ("gdb-stop")), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (GET_WIDGET ("gdb-go")), FALSE); + + druid_data.explicit_dirty = FALSE; + + g_free (args[0]); + } + void ! get_trace_from_core_with_dbx (const gchar *core_file) { gchar *gdb_cmd; gchar buf[1024]; gchar *binary = NULL; int status; FILE *f; + char* args[] = {"dbx-cmd", "ObjectFile", "CoreFile", NULL}; + char *app2; ! if (!core_file || !*core_file) { ! return; ! } ! ! gdb_cmd = g_strdup_printf ("dbx-core %s %s 2>&1", core_file, core_file); f = popen (gdb_cmd, "r"); g_free (gdb_cmd); *************** *** 172,178 **** 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, ! _("Unable to process core file with gdb:\n" "'%s'"), core_file); gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_dialog_run (GTK_DIALOG (d)); --- 313,319 ---- 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, ! _("Unable to process core file with dbx:\n" "'%s'"), core_file); gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_dialog_run (GTK_DIALOG (d)); *************** *** 180,197 **** return; } ! while (fgets(buf, 1024, f) != NULL) { ! if (!binary && !strncmp(buf, "Core was generated", 16)) { ! gchar *s; ! gchar *ptr = buf; ! while (*ptr != '`' && *ptr !='\0') ptr++; ! if (*ptr == '`') { ! ptr++; ! s = ptr; ! while (*ptr != '\'' && *ptr !=' ' && *ptr !='\0') ptr++; ! *ptr = '\0'; ! binary = g_strdup(s); ! } } } --- 321,336 ---- return; } ! while ( (!binary) && (fgets(buf, 1024, f) != NULL) ) { ! gchar *s; ! gchar *ptr = buf; ! while (*ptr != '(' && *ptr !='\0') ptr++; ! if (*ptr == '(') { ! ptr++; ! s = ptr; ! while (*ptr != ')' && *ptr !=' ' && *ptr !='\0') ptr++; ! *ptr = '\0'; ! binary = g_strdup(s); } } *************** *** 203,209 **** 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, ! _("GDB was unable to determine which binary created\n" "'%s'"), core_file); gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_dialog_run (GTK_DIALOG (d)); --- 342,348 ---- 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, ! _("DBX was unable to determine which binary created\n" "'%s'"), core_file); gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_dialog_run (GTK_DIALOG (d)); *************** *** 211,271 **** return; } if (!popt_data.app_file) { d(g_message ("Setting binary: %s", binary)); popt_data.app_file = g_strdup (binary); } ! get_trace_from_pair (binary, core_file); g_free (binary); } ! static gboolean ! handle_gdb_input (GIOChannel *ioc, GIOCondition condition, gpointer data) ! { ! gboolean retval = FALSE; ! gchar buf[1024]; ! gsize len; ! GIOStatus io_status; ! ! gdb_try_read: ! io_status = g_io_channel_read_chars (ioc, buf, 1024, &len, NULL); ! switch (io_status) { ! case G_IO_STATUS_AGAIN: ! goto gdb_try_read; ! case G_IO_STATUS_ERROR: ! d(g_warning (_("Error on read... aborting"))); ! break; ! case G_IO_STATUS_NORMAL: ! retval = TRUE; ! break; ! default: ! break; } ! if (len > 0) { ! GtkTextIter end; ! GtkTextBuffer *buffy; ! GtkTextView *tv; ! char *utftext; ! gsize utflen; ! ! tv = GTK_TEXT_VIEW (GET_WIDGET ("gdb-text")); ! buffy = gtk_text_view_get_buffer (tv); ! gtk_text_buffer_get_end_iter (buffy, &end); ! utftext = g_locale_to_utf8 (buf, len, NULL, &utflen, NULL); ! gtk_text_buffer_insert (buffy, &end, utftext, utflen); ! g_free (utftext); } ! ! if (!retval) ! stop_gdb (); ! ! return retval; } void get_trace_from_pair (const gchar *app, const gchar *extra) { --- 350,422 ---- return; } + /* FIXME: we should probably be fully expanding the link to + see if it is a directory, but unix sucks and i am lazy */ + if (g_file_test (binary, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + app2 = g_strdup (binary); + else + app2 = g_find_program_in_path (binary); + + if (!app2) { + GtkWidget *d; + d = gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("druid-window")), + 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("Unable to determine the path to the binary '%s'"), binary); + gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); + gtk_dialog_run (GTK_DIALOG (d)); + gtk_widget_destroy (d); + g_free (binary); + return; + } + if (!popt_data.app_file) { d(g_message ("Setting binary: %s", binary)); popt_data.app_file = g_strdup (binary); } ! args[1] = app2; ! args[2] = (char *)core_file; ! ! get_trace_with_dbx (args, app2); ! g_free (binary); + g_free (app2); } ! void ! get_trace_from_pid_with_dbx (const gchar *app, const gchar *pid) ! { ! char* args[] = {"dbx-cmd", "-a pid", "ObjectFile", NULL}; ! char *app2; ! if (!app || !pid || !*app || !*pid) { ! return; } ! /* FIXME: we should probably be fully expanding the link to ! see if it is a directory, but unix sucks and i am lazy */ ! if (g_file_test (app, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) ! app2 = g_strdup (app); ! else ! app2 = g_find_program_in_path (app); ! if (!app2) { ! return; } ! ! args[1] = g_strdup_printf ("-a %s", pid); ! args[2] = app2; ! ! get_trace_with_dbx (args, app2); ! ! g_free (args[1]); ! g_free (app2); } + #else /* HAVE_AND_USE_DBX */ + void get_trace_from_pair (const gchar *app, const gchar *extra) { *************** *** 297,304 **** return; } ! if (!app || !extra || !*app || !*extra) return; if (*app == G_DIR_SEPARATOR) { --- 448,457 ---- return; } ! if (!app || !extra || !*app || !*extra) { ! g_free (args[0]); return; + } if (*app == G_DIR_SEPARATOR) { *************** *** 336,342 **** gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_widget_destroy (d); ! g_free (long_app); return; } --- 489,496 ---- gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_widget_destroy (d); ! g_free (app2); ! g_free (args[0]); return; } *************** *** 355,362 **** gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_widget_destroy (d); ! g_error_free (error); ! g_free (long_app); return; } --- 509,516 ---- gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_widget_destroy (d); ! g_free (app2); ! g_free (args[0]); return; } *************** *** 378,382 **** druid_data.explicit_dirty = FALSE; ! g_free (long_app); } --- 532,607 ---- druid_data.explicit_dirty = FALSE; ! g_free (app2); ! g_free (args[0]); ! } ! ! void ! get_trace_from_core (const gchar *core_file) ! { ! gchar *gdb_cmd; ! gchar buf[1024]; ! gchar *binary = NULL; ! int status; ! FILE *f; ! ! gdb_cmd = g_strdup_printf ("gdb --batch --core=%s", core_file); ! ! f = popen (gdb_cmd, "r"); ! g_free (gdb_cmd); ! ! if (!f) { ! GtkWidget *d; ! 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); ! gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); ! gtk_dialog_run (GTK_DIALOG (d)); ! gtk_widget_destroy (d); ! return; ! } ! ! while (fgets(buf, 1024, f) != NULL) { ! if (!binary && !strncmp(buf, "Core was generated", 16)) { ! gchar *s; ! gchar *ptr = buf; ! while (*ptr != '`' && *ptr !='\0') ptr++; ! if (*ptr == '`') { ! ptr++; ! s = ptr; ! while (*ptr != '\'' && *ptr !=' ' && *ptr !='\0') ptr++; ! *ptr = '\0'; ! binary = g_strdup(s); ! } ! } ! } ! ! status = pclose(f); ! ! if (!binary) { ! GtkWidget *d; ! 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); ! gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); ! gtk_dialog_run (GTK_DIALOG (d)); ! gtk_widget_destroy (d); ! return; ! } ! ! if (!popt_data.app_file) { ! d(g_message ("Setting binary: %s", binary)); ! popt_data.app_file = g_strdup (binary); ! } ! ! get_trace_from_pair (binary, core_file); ! g_free (binary); } + + #endif /* HAVE_AND_USE_DBX */