From cc377e6b36d4c3239980bed893dec833a3a2793c Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Wed, 11 Aug 2004 06:55:15 +0000 Subject: [PATCH] * procfs.c (procfs_detach): Cleanup. Print process ID, not LWP ID. Use comma in output. Use gdb_flush on gdb_stdout instead of fflush on stdout. --- gdb/ChangeLog | 6 ++++++ gdb/procfs.c | 31 ++++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d79ae86012..794c78f15c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2004-08-10 Mark Kettenis + + * procfs.c (procfs_detach): Cleanup. Print process ID, not LWP + ID. Use comma in output. Use gdb_flush on gdb_stdout instead of + fflush on stdout. + 2004-08-10 Joel Brobecker * xcoff_symfile_finish: Replace last call to xmfree by call diff --git a/gdb/procfs.c b/gdb/procfs.c index b94e03710a..3ac9702402 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -3545,24 +3545,29 @@ procfs_attach (char *args, int from_tty) static void procfs_detach (char *args, int from_tty) { - char *exec_file; - int signo = 0; + int sig = 0; + + if (args) + sig = atoi (args); if (from_tty) { - exec_file = get_exec_file (0); - if (exec_file == 0) - exec_file = ""; - printf_filtered ("Detaching from program: %s %s\n", - exec_file, target_pid_to_str (inferior_ptid)); - fflush (stdout); - } - if (args) - signo = atoi (args); + int pid = PIDGET (inferior_ptid); + char *exec_file; + + exec_file = get_exec_file (0); + if (exec_file == NULL) + exec_file = ""; + + printf_filtered ("Detaching from program: %s, %s\n", exec_file, + target_pid_to_str (pid_to_ptid (pid))); + gdb_flush (gdb_stdout); + } + + do_detach (sig); - do_detach (signo); inferior_ptid = null_ptid; - unpush_target (&procfs_ops); /* Pop out of handling an inferior */ + unpush_target (&procfs_ops); } static ptid_t