From patchwork Wed Sep 9 02:12:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1360302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=phvPYOEQ; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BmQWw3K1Pz9sTR for ; Wed, 9 Sep 2020 12:12:26 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 50B363959C87; Wed, 9 Sep 2020 02:12:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 50B363959C87 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1599617543; bh=wpBw27xmht9KRZzjTYLWD4ewX9DXMhq6ohsJDJiu1Qc=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=phvPYOEQKNv9VzrO+2UqRdOlm+XVnZCgYkm42UKkCLvM8oUnRW/1NzyfAByWkcylC EKLAWZ4wN3CnREkT2+xPP0c4x/Nc8YXdZtAk5Pmgv3tpNeTvpe5gYQtjCD88gKv3dj U3g4yaQGhNlLS609LlqhAQn59G1hoIlXplfKkFSM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by sourceware.org (Postfix) with ESMTPS id 531D83851C06 for ; Wed, 9 Sep 2020 02:12:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 531D83851C06 Received: by mail-ej1-x629.google.com with SMTP id i22so1233459eja.5 for ; Tue, 08 Sep 2020 19:12:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=wpBw27xmht9KRZzjTYLWD4ewX9DXMhq6ohsJDJiu1Qc=; b=FApnjMKvkNy/K7iGoOtAPzSBWLOd0k04Esp99aDqOfu/q6PzDIAzl5srU9vjHQiwia BYH9pk/3zJG4HadJpT/ANlV71cyKtbj94VAgN2Na2vmWWrx4Yb/BO3T38j3nQDKKs5uI 8O72A96fs8/57MkN8XjrepozCMHIr7C5P7S+hw7Jq64UfksVupwbd1iR6AY5XrWxrC41 Zn4/R2FHGryEajd7+bFVLbfC0h+MSS8uh4SC6qj0liMvoQO4CDfScBXFvjw1q7DqcdsM PCN5bORL17iTEVKt0SX76vcGWXpwpyHS2vJSII+SqNXhJ5LMe83e4KJ8YSs3UQmyaNEf 9Ubw== X-Gm-Message-State: AOAM533GoTgyh7ISMITUGbJRdx273DaUQmRAa/Br8eTjGz9xEp8xzqT2 ztTPencmIZuGmVTupuIMGHJgWgrpMiNIpumDrRr6z+3tdO18yA== X-Google-Smtp-Source: ABdhPJzzDWj4HLm0UMaiPNfbHjZJ4jjo1NyYnvcNrXPZ5DrEuqBU6Z/MUWJ1B2ZMOMlfHku7CVSjZVyAQLdB8NcwXfs= X-Received: by 2002:a17:906:9353:: with SMTP id p19mr1363232ejw.403.1599617539945; Tue, 08 Sep 2020 19:12:19 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 8 Sep 2020 19:12:08 -0700 Message-ID: Subject: libbacktrace patch committed: Get executable name on macOS To: gcc-patches X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ian Lance Taylor via Gcc-patches From: Ian Lance Taylor Reply-To: Ian Lance Taylor Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This patch to libbacktrace gets the executable name on macOS using _NSGetExecutablePath. This is another aspect of PR 96973. Tested basic functionality on macOS. Bootstrapped and ran libbacktrace tests on x86_64-pc-linux-gnu. Committed to mainline. Ian * fileline.c (macho_get_executable_path): New static function. (fileline_initialize): Call macho_get_executable_path. diff --git a/libbacktrace/fileline.c b/libbacktrace/fileline.c index cc1011e8b5d..be62b9899c5 100644 --- a/libbacktrace/fileline.c +++ b/libbacktrace/fileline.c @@ -43,6 +43,10 @@ POSSIBILITY OF SUCH DAMAGE. */ #include #endif +#ifdef HAVE_MACH_O_DYLD_H +#include +#endif + #include "backtrace.h" #include "internal.h" @@ -122,6 +126,35 @@ sysctl_exec_name2 (struct backtrace_state *state, #endif /* defined (HAVE_KERN_PROC_ARGS) || |defined (HAVE_KERN_PROC) */ +#ifdef HAVE_MACH_O_DYLD_H + +static char * +macho_get_executable_path (struct backtrace_state *state, + backtrace_error_callback error_callback, void *data) +{ + uint32_t len; + char *name; + + len = 0; + if (_NSGetExecutablePath (NULL, &len) == 0) + return NULL; + name = (char *) backtrace_alloc (state, len, error_callback, data); + if (name == NULL) + return NULL; + if (_NSGetExecutablePath (name, &len) != 0) + { + backtrace_free (state, name, len, error_callback, data); + return NULL; + } + return name; +} + +#else /* !defined (HAVE_MACH_O_DYLD_H) */ + +#define macho_get_executable_path(state, error_callback, data) NULL + +#endif /* !defined (HAVE_MACH_O_DYLD_H) */ + /* Initialize the fileline information from the executable. Returns 1 on success, 0 on failure. */ @@ -159,7 +192,7 @@ fileline_initialize (struct backtrace_state *state, descriptor = -1; called_error_callback = 0; - for (pass = 0; pass < 7; ++pass) + for (pass = 0; pass < 8; ++pass) { int does_not_exist; @@ -188,6 +221,9 @@ fileline_initialize (struct backtrace_state *state, case 6: filename = sysctl_exec_name2 (state, error_callback, data); break; + case 7: + filename = macho_get_executable_path (state, error_callback, data); + break; default: abort (); }