From: Pedro Alves <palves@redhat.com>
Date: Fri, 9 Aug 2013 15:33:09 +0000 (+0000)
Subject: save breakpoints: Make tilde-expanded filename visible.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c718be4726f8cfaf28c3eb086d5880f0320c1c25;p=binutils-gdb.git

save breakpoints: Make tilde-expanded filename visible.

Most commands in GDB show the tilde-expanded filename in user visible
output.  This makes "save breakpoints" behave the same.

Before:

  (gdb) save breakpoints ~/a/b
  Unable to open file '~/a/b' for saving (No such file or directory)

After:

  (gdb) save breakpoints ~/a/b
  Unable to open file '/home/pedro/a/b' for saving (No such file or directory)

Tested on x86_64 Fedora 17.

gdb/
2013-08-09  Pedro Alves  <palves@redhat.com>

        * breakpoint.c (save_breakpoints): Show tilde-expanded filename in
	error message.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 65781db350b..d49a4db8d2d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-09  Pedro Alves  <palves@redhat.com>
+
+        * breakpoint.c (save_breakpoints): Show tilde-expanded filename in
+	error message.
+
 2013-08-09  Pedro Alves  <palves@redhat.com>
 
 	* gcore.c (create_gcore_bfd): Don't use tilde_expand here.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index eec7b7c5499..3b75bc49846 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -15460,7 +15460,6 @@ save_breakpoints (char *filename, int from_tty,
 {
   struct breakpoint *tp;
   int any = 0;
-  char *pathname;
   struct cleanup *cleanup;
   struct ui_file *fp;
   int extra_trace_bits = 0;
@@ -15496,9 +15495,9 @@ save_breakpoints (char *filename, int from_tty,
       return;
     }
 
-  pathname = tilde_expand (filename);
-  cleanup = make_cleanup (xfree, pathname);
-  fp = gdb_fopen (pathname, "w");
+  filename = tilde_expand (filename);
+  cleanup = make_cleanup (xfree, filename);
+  fp = gdb_fopen (filename, "w");
   if (!fp)
     error (_("Unable to open file '%s' for saving (%s)"),
 	   filename, safe_strerror (errno));
@@ -15568,9 +15567,9 @@ save_breakpoints (char *filename, int from_tty,
   if (extra_trace_bits && *default_collect)
     fprintf_unfiltered (fp, "set default-collect %s\n", default_collect);
 
-  do_cleanups (cleanup);
   if (from_tty)
     printf_filtered (_("Saved to file '%s'.\n"), filename);
+  do_cleanups (cleanup);
 }
 
 /* The `save breakpoints' command.  */