public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Simon Marchi <simark@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdbsupport: make gdb_realpath_keepfile return an std::string Date: Mon, 18 Apr 2022 20:12:44 +0000 (GMT) [thread overview] Message-ID: <20220418201244.78E613858427@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5f2491c300636a2091a2ca3db7773d52d04bf566 commit 5f2491c300636a2091a2ca3db7773d52d04bf566 Author: Simon Marchi <simon.marchi@efficios.com> Date: Wed Apr 13 17:39:06 2022 -0400 gdbsupport: make gdb_realpath_keepfile return an std::string I'm trying to switch these functions to use std::string instead of char arrays, as much as possible. Some callers benefit from it (can avoid doing a copy of the result), while others suffer (have to make one more copy). Change-Id: I793aab17baaef8345488f4c40b9094e2695425bc Diff: --- gdb/exec.c | 3 ++- gdbsupport/pathstuff.cc | 11 ++++------- gdbsupport/pathstuff.h | 3 +-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/gdb/exec.c b/gdb/exec.c index 84c36473abb..38540c0840b 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -467,7 +467,8 @@ exec_file_attach (const char *filename, int from_tty) (bfd_get_filename (current_program_space->exec_bfd ()))); else current_program_space->exec_filename - = gdb_realpath_keepfile (scratch_pathname); + = make_unique_xstrdup (gdb_realpath_keepfile + (scratch_pathname).c_str ()); if (!bfd_check_format_matches (current_program_space->exec_bfd (), bfd_object, &matching)) diff --git a/gdbsupport/pathstuff.cc b/gdbsupport/pathstuff.cc index dd6ffa49fb4..ac65651d449 100644 --- a/gdbsupport/pathstuff.cc +++ b/gdbsupport/pathstuff.cc @@ -86,17 +86,16 @@ gdb_realpath (const char *filename) /* See gdbsupport/pathstuff.h. */ -gdb::unique_xmalloc_ptr<char> +std::string gdb_realpath_keepfile (const char *filename) { const char *base_name = lbasename (filename); char *dir_name; - char *result; /* Extract the basename of filename, and return immediately a copy of filename if it does not contain any directory prefix. */ if (base_name == filename) - return make_unique_xstrdup (filename); + return filename; dir_name = (char *) alloca ((size_t) (base_name - filename + 2)); /* Allocate enough space to store the dir_name + plus one extra @@ -121,11 +120,9 @@ gdb_realpath_keepfile (const char *filename) gdb::unique_xmalloc_ptr<char> path_storage = gdb_realpath (dir_name); const char *real_path = path_storage.get (); if (IS_DIR_SEPARATOR (real_path[strlen (real_path) - 1])) - result = concat (real_path, base_name, (char *) NULL); + return string_printf ("%s%s", real_path, base_name); else - result = concat (real_path, SLASH_STRING, base_name, (char *) NULL); - - return gdb::unique_xmalloc_ptr<char> (result); + return string_printf ("%s/%s", real_path, base_name); } /* See gdbsupport/pathstuff.h. */ diff --git a/gdbsupport/pathstuff.h b/gdbsupport/pathstuff.h index 04d9bf9029b..f6c51e9de88 100644 --- a/gdbsupport/pathstuff.h +++ b/gdbsupport/pathstuff.h @@ -39,8 +39,7 @@ extern gdb::unique_xmalloc_ptr<char> gdb_realpath (const char *filename); /* Return a copy of FILENAME, with its directory prefix canonicalized by gdb_realpath. */ -extern gdb::unique_xmalloc_ptr<char> - gdb_realpath_keepfile (const char *filename); +extern std::string gdb_realpath_keepfile (const char *filename); /* Return PATH in absolute form, performing tilde-expansion if necessary. PATH cannot be NULL or the empty string.
reply other threads:[~2022-04-18 20:12 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220418201244.78E613858427@sourceware.org \ --to=simark@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).