From patchwork Mon Dec 30 18:56:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 103787 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C06163858D34 for ; Mon, 30 Dec 2024 18:57:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C06163858D34 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1735585033; bh=6CZj2tUhVs6cFqD2FpAI+XHpAYCIyi++kxkYjZaJ5Pg=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=Z1ayOwGbsu1snLltjwO7KZGiHHWgaCguMq+sbpXcRIjAAoc9R7hyDkhxiq5RiwVIW B7k3iiWIxvxrdvbCLO5CuXDh1Dqa3OYIUuzO7aYSEbxHIRrOGsvdlKnPZzJRcFB5Cf NgDKUaZsQjqaSvUVLxG4aX1o5hEptqqw/cJsJX5E= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by sourceware.org (Postfix) with ESMTPS id 8D9AA3858D1E; Mon, 30 Dec 2024 18:56:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8D9AA3858D1E Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=sourceware.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8D9AA3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735584995; cv=none; b=tqDX/o6OjvCicYcWyn+6U4fcKPnF60uMmhFg7YXiaTosKNBlB8bZJ+chGLcgg/MtzYdfXB2jXAb3t2MDjCYoZpJku6uu18/riNLvwe7sjnD2X/qKed8dwSSzgntVry8S3rTSQchFcMPUJDYWZAbnQTMVzagsz1LGaNpD/1XMr6A= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735584995; c=relaxed/simple; bh=ttQK4ljdIu4BkYaHs+cqmg9zyYLMRe5iZlHbfXNZAI8=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=W1cAyiEesknfPjCZyp1r+jhP5eIJZQNajCP40SF3hlN9c70gnsYL1OliktGAydSjBuXFPe2+fC70kf15RaIQSqXMMeS8IPpnTkmnkLwzpPy+l/Rfg6r/Kx+VWUeg2V2YeWgnqfyo/QjYL4WtMaMCD2y5Vr8Ohj2VNCNTNPMVKbE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D9AA3858D1E Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-216401de828so117315625ad.3; Mon, 30 Dec 2024 10:56:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735584994; x=1736189794; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6CZj2tUhVs6cFqD2FpAI+XHpAYCIyi++kxkYjZaJ5Pg=; b=aq2NCI1ty3ArpV6LYMazW++vIA5EVVi+RxmQdciomitAf/RIR8olTyeGMWHLe8khxZ Fzvv7wMlzF1+k6NX6hZsYxWJ60f0hQ9r46GaqLfsWfhQGrCSlKaQ9vZBGcUz2co1RLaM LEFeZ8X2sw6KEvaJGAvSeJLFCi7o35erHYAp7riQuHId+7sqJsphKEaKZHGkVJzFPIx1 kllElnm9JvW78E3dYzPbd6xSJENfng5KJWpg2AJwm7kNAi3rsfTOhpYwNDOWuk5EdEqr rswBH2mdBqi4XQvlI7gZNItjrJ/mRcLQ6FJEN5aJe/3EmwBZ8dPO/M8TClQweccNPuHm Ec9A== X-Forwarded-Encrypted: i=1; AJvYcCWlMbUB+B7/3ZsWTanZUbiqBSzYVAD4ibz5v4Ipb2prXWfZ9QiRDjBJqiYv3qG13rvwqPY+rXdH@sourceware.org X-Gm-Message-State: AOJu0YwsU7SD9du54lYRqiEeyT69TZot99geQUD/EduHmxLnPNDi5kpk 673HU+ylxYYT1DCzryxufQ6b+q0pe5QkK8UcAX8yWixNdsYzN9HkS7K1mQ== X-Gm-Gg: ASbGncujZdjvfJPSnyI5tQBuebaH0jJL0xJh4UlkF/S/LKSIA8qxUzuCHOENUUiXUBh IMwo713hIQRi1q03qLd4ZFwXX2CvgIoXtvY+TIZ4lzRMXIOtBq44nj6KFanSEhPWw4CHqOTiEU8 VB9DWMwhJuQ2fZtNUtJRy+5jW5V6F5QbCa3SATThaMPlf1zrPlwrVeLkHeUx7N97uPT1y348J9a vtBQNlq9LygHruiNebhowDmifFcMAcJ/EZNAw1Mog== X-Google-Smtp-Source: AGHT+IEXLlImVUDSiLAWn2cTD583Sdzdf8w2xxn7MrC5V9Y0/CsrQKTx+xNEyKJ/QE2AJjztLKY+/g== X-Received: by 2002:a05:6a20:8412:b0:1e2:2e4:6b2a with SMTP id adf61e73a8af0-1e5e044af7bmr57497534637.5.1735584994149; Mon, 30 Dec 2024 10:56:34 -0800 (PST) Received: from localhost ([2601:647:4700:79e0::319f]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-842e36ca001sm14998597a12.77.2024.12.30.10.56.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 10:56:33 -0800 (PST) From: Fangrui Song To: gdb-patches@sourceware.org Cc: Eli Zaretskii , Doug Evans , Justin Lebar , Fangrui Song Subject: [PATCH v2] skip -gfile: call fnmatch without FNM_FILE_NAME Date: Mon, 30 Dec 2024 10:56:39 -0800 Message-ID: <20241230185639.370189-1-maskray@sourceware.org> MIME-Version: 1.0 X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, LOCAL_AUTHENTICATION_FAIL_DMARC, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org fnmatch is called with the FNM_FILE_NAME flag so that `skip -gfi /usr/*` doesn't match /usr/include/*. This makes the file matching feature not useful for STL headers that reside in multiple directories. In addition, the user cannot use a single `*` to match multiple leading path components. Let's drop the FNM_FILE_NAME flag and remove the assertion from gdb_filename_fnmatch (originally for the auto-load feature). Reviewed-By: Eli Zaretskii --- Changes from v1 (https://sourceware.org/pipermail/gdb-patches/2024-December/214406.html) * Adjust the comment of gdb_filename_fnmatch * Remove compare_glob_filenames_for_search * Update doc per Eli --- gdb/doc/gdb.texinfo | 4 +++- gdb/skip.c | 6 +++--- gdb/symtab.c | 34 ---------------------------------- gdb/utils.c | 6 ++---- 4 files changed, 8 insertions(+), 42 deletions(-) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index b985399cf34..c77ac7f30c2 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -6737,7 +6737,9 @@ Functions in @var{file} will be skipped over when stepping. @itemx -gfi @var{file-glob-pattern} @cindex skipping over files via glob-style patterns Functions in files matching @var{file-glob-pattern} will be skipped -over when stepping. +over when stepping. The directory separator character @file{/} is treated as a +regular character, so it can be matched by wildcard characters @file{*} and +@file{?}. @smallexample (@value{GDBP}) skip -gfi utils/*.c diff --git a/gdb/skip.c b/gdb/skip.c index 3791c29b1e0..aaa07859625 100644 --- a/gdb/skip.c +++ b/gdb/skip.c @@ -531,7 +531,7 @@ skiplist_entry::do_skip_gfile_p (const symtab_and_line &function_sal) const /* Check first sole SYMTAB->FILENAME. It may not be a substring of symtab_to_fullname as it may contain "./" etc. */ if (gdb_filename_fnmatch (m_file.c_str (), function_sal.symtab->filename, - FNM_FILE_NAME | FNM_NOESCAPE) == 0) + FNM_NOESCAPE) == 0) result = true; /* Before we invoke symtab_to_fullname, which is expensive, do a quick @@ -542,14 +542,14 @@ skiplist_entry::do_skip_gfile_p (const symtab_and_line &function_sal) const else if (!basenames_may_differ && gdb_filename_fnmatch (lbasename (m_file.c_str ()), lbasename (function_sal.symtab->filename), - FNM_FILE_NAME | FNM_NOESCAPE) != 0) + FNM_NOESCAPE) != 0) result = false; else { /* Note: symtab_to_fullname caches its result, thus we don't have to. */ const char *fullname = symtab_to_fullname (function_sal.symtab); - result = compare_glob_filenames_for_search (fullname, m_file.c_str ()); + result = gdb_filename_fnmatch (m_file.c_str (), fullname, FNM_NOESCAPE); } if (debug_skip) diff --git a/gdb/symtab.c b/gdb/symtab.c index 106e540ca48..ba421267b9a 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -588,40 +588,6 @@ compare_filenames_for_search (const char *filename, const char *search_name) && STRIP_DRIVE_SPEC (filename) == &filename[len - search_len])); } -/* Same as compare_filenames_for_search, but for glob-style patterns. - Heads up on the order of the arguments. They match the order of - compare_filenames_for_search, but it's the opposite of the order of - arguments to gdb_filename_fnmatch. */ - -bool -compare_glob_filenames_for_search (const char *filename, - const char *search_name) -{ - /* We rely on the property of glob-style patterns with FNM_FILE_NAME that - all /s have to be explicitly specified. */ - int file_path_elements = count_path_elements (filename); - int search_path_elements = count_path_elements (search_name); - - if (search_path_elements > file_path_elements) - return false; - - if (IS_ABSOLUTE_PATH (search_name)) - { - return (search_path_elements == file_path_elements - && gdb_filename_fnmatch (search_name, filename, - FNM_FILE_NAME | FNM_NOESCAPE) == 0); - } - - { - const char *file_to_compare - = strip_leading_path_elements (filename, - file_path_elements - search_path_elements); - - return gdb_filename_fnmatch (search_name, file_to_compare, - FNM_FILE_NAME | FNM_NOESCAPE) == 0; - } -} - /* Check for a symtab of a specific name by searching some symtabs. This is a helper function for callbacks of iterate_over_symtabs. diff --git a/gdb/utils.c b/gdb/utils.c index 6f2055e299d..4027d4f26c3 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3491,8 +3491,8 @@ wait_to_die_with_timeout (pid_t pid, int *status, int timeout) #endif /* HAVE_WAITPID */ -/* Provide fnmatch compatible function for FNM_FILE_NAME matching of host files. - Both FNM_FILE_NAME and FNM_NOESCAPE must be set in FLAGS. +/* Provide fnmatch compatible function for matching of host files. + FNM_NOESCAPE must be set in FLAGS. It handles correctly HAVE_DOS_BASED_FILE_SYSTEM and HAVE_CASE_INSENSITIVE_FILE_SYSTEM. */ @@ -3500,8 +3500,6 @@ wait_to_die_with_timeout (pid_t pid, int *status, int timeout) int gdb_filename_fnmatch (const char *pattern, const char *string, int flags) { - gdb_assert ((flags & FNM_FILE_NAME) != 0); - /* It is unclear how '\' escaping vs. directory separator should coexist. */ gdb_assert ((flags & FNM_NOESCAPE) != 0);