From patchwork Mon Jun 12 17:08:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Rudo X-Patchwork-Id: 20964 Received: (qmail 64256 invoked by alias); 12 Jun 2017 17:08:45 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 64103 invoked by uid 89); 12 Jun 2017 17:08:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KHOP_DYNAMIC, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy= X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0b-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.158.5) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 12 Jun 2017 17:08:41 +0000 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5CH8iN5174924 for ; Mon, 12 Jun 2017 13:08:44 -0400 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0b-001b2d01.pphosted.com with ESMTP id 2b1vx0ehtj-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 12 Jun 2017 13:08:43 -0400 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 12 Jun 2017 18:08:41 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 12 Jun 2017 18:08:39 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v5CH8cOT11207114; Mon, 12 Jun 2017 17:08:38 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8C98B4C046; Mon, 12 Jun 2017 18:06:53 +0100 (BST) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5ECC54C044; Mon, 12 Jun 2017 18:06:53 +0100 (BST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 12 Jun 2017 18:06:53 +0100 (BST) From: Philipp Rudo To: gdb-patches@sourceware.org Cc: omair.javaid@linaro.org, yao.qi@linaro.org, peter.griffin@linaro.org, arnez@linux.vnet.ibm.com Subject: [RFC v4 1/9] Convert substitute_path_component to C++ Date: Mon, 12 Jun 2017 19:08:28 +0200 In-Reply-To: <20170612170836.25174-1-prudo@linux.vnet.ibm.com> References: <20170612170836.25174-1-prudo@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17061217-0040-0000-0000-000003A803F2 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17061217-0041-0000-0000-000025A0AE33 Message-Id: <20170612170836.25174-2-prudo@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-06-12_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1706120298 X-IsSubscribed: yes Simplify the code of utils.c:substiute_path_component by converting it to C++. gdb/ChangeLog: * utils.c (substitute_path_component): Convert to C++. * utils.h (substitute_path_componetn): Adjust declatation. * auto-load.c (auto_load_expand_dir_vars): Adjust. --- gdb/auto-load.c | 18 +++++++++--------- gdb/utils.c | 49 ++++++++++++++----------------------------------- gdb/utils.h | 9 +++++++-- 3 files changed, 30 insertions(+), 46 deletions(-) diff --git a/gdb/auto-load.c b/gdb/auto-load.c index 37bf94286d..be950ac1bf 100644 --- a/gdb/auto-load.c +++ b/gdb/auto-load.c @@ -40,6 +40,7 @@ #include "filestuff.h" #include "extension.h" #include "gdb/section-scripts.h" +#include /* The section to look in for auto-loaded scripts (in file formats that support sections). @@ -175,21 +176,20 @@ static VEC (char_ptr) *auto_load_safe_path_vec; this vector must be freed by free_char_ptr_vec by the caller. */ static VEC (char_ptr) * -auto_load_expand_dir_vars (const char *string) +auto_load_expand_dir_vars (std::string orig) { VEC (char_ptr) *dir_vec; - char *s; + std::string str = orig; - s = xstrdup (string); - substitute_path_component (&s, "$datadir", gdb_datadir); - substitute_path_component (&s, "$debugdir", debug_file_directory); + substitute_path_component (str, "$datadir", gdb_datadir); + substitute_path_component (str, "$debugdir", debug_file_directory); - if (debug_auto_load && strcmp (s, string) != 0) + if (debug_auto_load && str.compare (orig) != 0) fprintf_unfiltered (gdb_stdlog, - _("auto-load: Expanded $-variables to \"%s\".\n"), s); + _("auto-load: Expanded $-variables to \"%s\".\n"), + str.c_str ()); - dir_vec = dirnames_to_char_ptr_vec (s); - xfree(s); + dir_vec = dirnames_to_char_ptr_vec (str.c_str ()); return dir_vec; } diff --git a/gdb/utils.c b/gdb/utils.c index 3d50ea4cc2..2a7d39801e 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -67,6 +67,8 @@ #include "gdb_regex.h" #include "job-control.h" +#include + #if !HAVE_DECL_MALLOC extern PTR malloc (); /* ARI: PTR */ #endif @@ -3102,49 +3104,26 @@ make_cleanup_free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec) return make_cleanup (do_free_char_ptr_vec, char_ptr_vec); } -/* Substitute all occurences of string FROM by string TO in *STRINGP. *STRINGP - must come from xrealloc-compatible allocator and it may be updated. FROM - needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be - located at the start or end of *STRINGP. */ +/* See utils.h. */ void -substitute_path_component (char **stringp, const char *from, const char *to) +substitute_path_component (std::string &str, const std::string &from, + const std::string &to) { - char *string = *stringp, *s; - const size_t from_len = strlen (from); - const size_t to_len = strlen (to); - - for (s = string;;) + for (size_t pos = str.find (from); pos != std::string::npos; + pos = str.find (from, pos + 1)) { - s = strstr (s, from); - if (s == NULL) - break; + char start, end; - if ((s == string || IS_DIR_SEPARATOR (s[-1]) - || s[-1] == DIRNAME_SEPARATOR) - && (s[from_len] == '\0' || IS_DIR_SEPARATOR (s[from_len]) - || s[from_len] == DIRNAME_SEPARATOR)) + start = str[pos - 1]; + end = str[pos + from.length ()]; + if ((pos == 0 || IS_DIR_SEPARATOR (start) || start == DIRNAME_SEPARATOR) + && (end == '\0' || IS_DIR_SEPARATOR (end) + || end == DIRNAME_SEPARATOR)) { - char *string_new; - - string_new - = (char *) xrealloc (string, (strlen (string) + to_len + 1)); - - /* Relocate the current S pointer. */ - s = s - string + string_new; - string = string_new; - - /* Replace from by to. */ - memmove (&s[to_len], &s[from_len], strlen (&s[from_len]) + 1); - memcpy (s, to, to_len); - - s += to_len; + str.replace (pos, from.length (), to); } - else - s++; } - - *stringp = string; } #ifdef HAVE_WAITPID diff --git a/gdb/utils.h b/gdb/utils.h index f3e800743c..9726025c12 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -132,8 +132,13 @@ extern char *gdb_abspath (const char *); extern int gdb_filename_fnmatch (const char *pattern, const char *string, int flags); -extern void substitute_path_component (char **stringp, const char *from, - const char *to); +/* Substitute all occurences of string FROM by string TO in STR. FROM + needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be + located at the start or end of STR). */ + +extern void substitute_path_component (std::string &str, + const std::string &from, + const std::string &to); std::string ldirname (const char *filename);