From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 78E613858427; Mon, 18 Apr 2022 20:12:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 78E613858427 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdbsupport: make gdb_realpath_keepfile return an std::string X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: 7ab2607f97e5deaeae91018edf3ef5b4255a842c X-Git-Newrev: 5f2491c300636a2091a2ca3db7773d52d04bf566 Message-Id: <20220418201244.78E613858427@sourceware.org> Date: Mon, 18 Apr 2022 20:12:44 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2022 20:12:44 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D5f2491c30063= 6a2091a2ca3db7773d52d04bf566 commit 5f2491c300636a2091a2ca3db7773d52d04bf566 Author: Simon Marchi Date: Wed Apr 13 17:39:06 2022 -0400 gdbsupport: make gdb_realpath_keepfile return an std::string =20 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). =20 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 - =3D gdb_realpath_keepfile (scratch_pathname); + =3D make_unique_xstrdup (gdb_realpath_keepfile + (scratch_pathname).c_str ()); =20 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) =20 /* See gdbsupport/pathstuff.h. */ =20 -gdb::unique_xmalloc_ptr +std::string gdb_realpath_keepfile (const char *filename) { const char *base_name =3D lbasename (filename); char *dir_name; - char *result; =20 /* Extract the basename of filename, and return immediately a copy of filename if it does not contain any directory prefix. */ if (base_name =3D=3D filename) - return make_unique_xstrdup (filename); + return filename; =20 dir_name =3D (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 path_storage =3D gdb_realpath (dir_name); const char *real_path =3D path_storage.get (); if (IS_DIR_SEPARATOR (real_path[strlen (real_path) - 1])) - result =3D concat (real_path, base_name, (char *) NULL); + return string_printf ("%s%s", real_path, base_name); else - result =3D concat (real_path, SLASH_STRING, base_name, (char *) NULL); - - return gdb::unique_xmalloc_ptr (result); + return string_printf ("%s/%s", real_path, base_name); } =20 /* 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 gdb_realpath (const = char *filename); /* Return a copy of FILENAME, with its directory prefix canonicalized by gdb_realpath. */ =20 -extern gdb::unique_xmalloc_ptr - gdb_realpath_keepfile (const char *filename); +extern std::string gdb_realpath_keepfile (const char *filename); =20 /* Return PATH in absolute form, performing tilde-expansion if necessary. PATH cannot be NULL or the empty string.