From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 45715 invoked by alias); 20 Aug 2019 22:18:00 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 45622 invoked by uid 89); 20 Aug 2019 22:18:00 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.5 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy=U*cbiesinger, sk:cbiesin, HX-Received:3203, cbiesinger@google.com X-HELO: mail-pf1-f202.google.com Received: from mail-pf1-f202.google.com (HELO mail-pf1-f202.google.com) (209.85.210.202) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 20 Aug 2019 22:17:58 +0000 Received: by mail-pf1-f202.google.com with SMTP id v134so139448pfc.18 for ; Tue, 20 Aug 2019 15:17:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=UDkrvks0B7nE5w+u+IDFxe0Pu3XSWrCgk8l4t3yqHjo=; b=mqWngDHpRN0Bg4UT82fKyaotNoU567ABh1XPL6gPnyp2++/yy6qIDLP76Ywp3MIpMF N9FPOqQYWsZfXhoDP5lSI1zK7CfhtA2iu8zHpPb09Q7ke3nqVMRDdhF4jU9AGciXT8eD tevE6VrCSL2WkMlz1lQ7I0Clvp3k+P3i0OUpRSwnTbdrkt3SZYYHBjsy1trWaooH/oey uueLMLpkGlZUkmj5UgazrWECuwDfDUDGkZCk0hDWlpN3YLsXeX4/6awomWgJ6dq5erRN wBb68bKGw3aEfy0YsroUmZsdtx1ulc45OzgQoBFW8rsoPlK5xjXBIMRwdwBRoMHj696y D8TA== Date: Tue, 20 Aug 2019 22:18:00 -0000 In-Reply-To: <20190820221745.147370-1-cbiesinger@google.com> Message-Id: <20190820221745.147370-3-cbiesinger@google.com> Mime-Version: 1.0 References: <20190820221745.147370-1-cbiesinger@google.com> Subject: [PATCH 2/3] Factor out the code to do the datadir-relocation for gdbinit From: "Christian Biesinger via gdb-patches" Reply-To: Christian Biesinger To: gdb-patches@sourceware.org Cc: Christian Biesinger Content-Type: text/plain; charset="UTF-8" X-IsSubscribed: yes X-SW-Source: 2019-08/txt/msg00439.txt.bz2 gdb/ChangeLog: 2019-08-20 Christian Biesinger * main.c (relocate_gdbinit_path_maybe_in_datadir): New function. (get_init_files): Update. --- gdb/main.c | 68 +++++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/gdb/main.c b/gdb/main.c index b9e12589ab..a1d1904c9b 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -191,6 +191,41 @@ relocate_gdb_directory (const char *initial, int flag) return dir; } +static std::string relocate_gdbinit_path_maybe_in_datadir (std::string file) +{ + int datadir_len = strlen (GDB_DATADIR); + + /* If SYSTEM_GDBINIT lives in data-directory, and data-directory + has been provided, search for SYSTEM_GDBINIT there. */ + if (gdb_datadir_provided + && datadir_len < file.length () + && filename_ncmp (file.c_str (), GDB_DATADIR, datadir_len) == 0 + && IS_DIR_SEPARATOR (file[datadir_len])) + { + /* Append the part of SYSTEM_GDBINIT that follows GDB_DATADIR + to gdb_datadir. */ + + size_t start = datadir_len; + for (; IS_DIR_SEPARATOR (file[start]); ++start) + continue; + return std::string (gdb_datadir) + SLASH_STRING + + file.substr(start); + } + else + { + char *relocated = relocate_path (gdb_program_name, + file.c_str(), + SYSTEM_GDBINIT_RELOCATABLE); + if (relocated != nullptr) + { + std::string retval(relocated); + xfree (relocated); + return retval; + } + } + return ""; +} + /* Compute the locations of init files that GDB should source and return them in SYSTEM_GDBINIT, HOME_GDBINIT, LOCAL_GDBINIT. If there is no system gdbinit (resp. home gdbinit and local gdbinit) @@ -212,37 +247,8 @@ get_init_files (std::string *system_gdbinit, if (SYSTEM_GDBINIT[0]) { - int datadir_len = strlen (GDB_DATADIR); - int sys_gdbinit_len = strlen (SYSTEM_GDBINIT); - std::string relocated_sysgdbinit; - - /* If SYSTEM_GDBINIT lives in data-directory, and data-directory - has been provided, search for SYSTEM_GDBINIT there. */ - if (gdb_datadir_provided - && datadir_len < sys_gdbinit_len - && filename_ncmp (SYSTEM_GDBINIT, GDB_DATADIR, datadir_len) == 0 - && IS_DIR_SEPARATOR (SYSTEM_GDBINIT[datadir_len])) - { - /* Append the part of SYSTEM_GDBINIT that follows GDB_DATADIR - to gdb_datadir. */ - - size_t start = datadir_len; - for (; IS_DIR_SEPARATOR (SYSTEM_GDBINIT[start]); ++start) - continue; - relocated_sysgdbinit = std::string (gdb_datadir) + SLASH_STRING + - &SYSTEM_GDBINIT[start]; - } - else - { - char *relocated = relocate_path (gdb_program_name, - SYSTEM_GDBINIT, - SYSTEM_GDBINIT_RELOCATABLE); - if (relocated != nullptr) - { - relocated_sysgdbinit = relocated; - xfree (relocated); - } - } + std::string relocated_sysgdbinit = + relocate_gdbinit_path_maybe_in_datadir (SYSTEM_GDBINIT); if (!relocated_sysgdbinit.empty () && stat (relocated_sysgdbinit.c_str (), &s) == 0) sysgdbinit = relocated_sysgdbinit; -- 2.23.0.rc1.153.gdeed80330f-goog