From patchwork Mon Apr 25 17:01:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guillermo E. Martinez" X-Patchwork-Id: 53209 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 8D8563858406 for ; Mon, 25 Apr 2022 17:01:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D8563858406 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1650906104; bh=SIVDQis3GlLfTvcCOo9ytM5WKIq2YDlsRJuU7WX8VlM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=BJsGoiVF8/Xkt45hPlH8dKWGYyR8eRrSx8f2wCU/lY3XXcWTA4egoVbq4+yjxsH76 OV2K80XvqqIxfxwyGkAkd6hs60O5njh99SaqzhzT+21tKgf2sy1wtOqJ2hKx/Va1x6 hbSY8bZYp94Rc+pikAESRpM1pNfwVlET8IgXhB78= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id BD3B43858C83 for ; Mon, 25 Apr 2022 17:01:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BD3B43858C83 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 23PEaDjO031281 for ; Mon, 25 Apr 2022 17:01:39 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3fmbb4krp1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 25 Apr 2022 17:01:39 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 23PH164e037050 for ; Mon, 25 Apr 2022 17:01:38 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2109.outbound.protection.outlook.com [104.47.58.109]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fm7w2hv0g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 25 Apr 2022 17:01:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NUX9hJjGk/HNhB35N0sWmzbx5v81dCsZ2smSIU7gWVUdq59A9pioyy1kfrIXzd7aa4otmMzp50V5k0g/KgwoIKgfKrs0dAoFs3+sWl1U2H8wesnTFjWq/95ToDkZ24+bltvYUScby0rS7rVik2tmBMpRffoMwKma56HgvF2QiGwAJ6gLSB15tY0RXknwxCW3MnTT37IVrtqu0oIKIMxQIizF3s0U0Ed/iF6jjjTVo9LQTbkozVXM3F9DFjJxKS6EUJX2W8QjnmKftUXioS3TJulb3BT4WNzzQKdiI6pRYSXZnwBTXO6V8127RA8P4QmViGpWngIdMgN3AmAsuoQuhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SIVDQis3GlLfTvcCOo9ytM5WKIq2YDlsRJuU7WX8VlM=; b=fbX9yvzk4NfacLcOd44qG0aDwsLA4tAR+tRKHFtl2NrYIkL8Q+zdYEBmOVcABJSlqweixoTGvz8F1c8YkAUO8A0cK2mm0NiP/ZF0ZkoCyxt9DMH/kqCfjCV2IZie9+NlVg3X00uFc5k/JEQpkeWaaxlzjBv9TXwKc9G8aCV1pM8WuPGQP70B5BtvVlVKGIs+LU/fF30byn11sPxU2vCyY/6OAZvyghLvdrHSQcG+k9JSUcin/l918GdEIapM3Rp5/VP0hVG0Cdii1Rg7ZBZIA61G//P9asCvXVgTbGAsQ9SRPjzxhHU/r2pV8wjIwp5JC0Xkb9IKf3cqGdZk8KLo6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from MWHPR10MB1407.namprd10.prod.outlook.com (2603:10b6:300:23::20) by DM5PR10MB1721.namprd10.prod.outlook.com (2603:10b6:4:5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.21; Mon, 25 Apr 2022 17:01:36 +0000 Received: from MWHPR10MB1407.namprd10.prod.outlook.com ([fe80::107d:de35:fa5f:3cc0]) by MWHPR10MB1407.namprd10.prod.outlook.com ([fe80::107d:de35:fa5f:3cc0%7]) with mapi id 15.20.5186.021; Mon, 25 Apr 2022 17:01:36 +0000 To: libabigail@sourceware.org Subject: [PATCH] Using `entry_of_file_with_name' returns incorrect result Date: Mon, 25 Apr 2022 12:01:23 -0500 Message-Id: <20220425170123.1971444-1-guillermo.e.martinez@oracle.com> X-Mailer: git-send-email 2.35.1 X-ClientProxiedBy: SN6PR05CA0036.namprd05.prod.outlook.com (2603:10b6:805:de::49) To MWHPR10MB1407.namprd10.prod.outlook.com (2603:10b6:300:23::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 32930889-ea61-4b30-7179-08da26dd41e9 X-MS-TrafficTypeDiagnostic: DM5PR10MB1721:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6Ve+ZhdwaFNLkMoF6bOrFWOthygRVoK6ChLrplq4ZbLGJHdZBKXXxL4KF+W2mlvR+SlKQBKc8cPFRQgX5AZ/TgFHp0QDOPbCgpOFHz82YfmLJuJg0/I0Kq1rr8uQVsQkbfVp4j1jR3CoawAQIEfc7lOy+p5Op8coD8HgOa0y4EieBR9VDHy0uzcS0Oz5TdHGbahUr7+51HrkepNeyG8csn5u4HOJL0+Gm5Oo900qOqFSAm+khpuScjeDumKlG2jN7QXDJ27+fvm6XXZPu1OMCVBD/hNjX6yFd1rqsZ71P0coF6kHUV4LOitJ8w0rpMP/TgItlhH9RCPq1EHcz0J8Cf/mVFypvNgNFKaE/hTQcsDeDkmgKQEiUaKwA0pnZpvxTvuDIozSGh2gHV7P+U6MZTJynz/QpCGv8eR/nB12qtJoeWEqomplVE9yzIdRpPifPx3d5RnLuyYaJ0wsN6tYdqGRgfmnRU9TydcprrHQwzroPNfJIjcbHfx7lbyAq85zMWi+ahB+6USx8eeUeZQlUQwB9+yqdsfhLpcpe8V8r44f2H4+Grj5AGHFhICfmylxJAruOJAcMYSCqQvuDXRwLpoZA0N0vsx9IhlWm1DkAz36KfkDgxl5wCauYkSMfNJMJ1+PballeWd1ReD0xGnWzJvPJKEAjhAxiyyv+IwoFKJa7jfzi9kOFZbmjY+r9OLh32QgU6x0GWpA/GfmZXJx8w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR10MB1407.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(4326008)(66476007)(8676002)(186003)(86362001)(1076003)(36756003)(316002)(66556008)(66946007)(2616005)(103116003)(5660300002)(8936002)(6512007)(83380400001)(6916009)(6486002)(508600001)(6506007)(107886003)(38100700002)(2906002)(6666004)(52116002)(81973001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: HKWGH+haXidTM6XYN2o552DxdMHmkJe7Nh8EM1p9YWFNVcADAvupoEM952vV2TH5NynG/wivYGqcwW8hCBh0VDreYExpT7LVURC7jJNMoVUlT980S3CKoHv+ToatzkrGAwPLSMXpDb/wirmbhUeHsFDxrSDZ9wtQES8ZUhMjzD9yUM8qoVV74u09Vj2+I69r1e4lR56Jx4YDN8uYuHyXN6mHQcdNstt9SlSdMB69u09gb3wWS29EQkAcD7RW5OxN4LYapQNz8jF5Zui/R5gXlipudvXRt6R07mkmhdDE7Bef1yMlBfRJYsYnvx0XRYA28MrGdVfCh60mQQYbTf4nBAqOyE3TrJkOUkx45+MPl9AMS//QRLw3NAOoFxXOnxzg/y060C0g32E9iIrNdjv+mr9ASWDTFv6Q06LkuMO6WmpirqH7wuUJBW1ARIRA9tyGxSBIcu7Hfe4rsDX897LCS51Z+fb8egAhaVyheXj5PJppFimClNyIQrGvPLg3kuAO0oURMI24S505mrrkkE60Cz/N7Td1D6yonhdO/9BsnV4A2BjtEL7sX1b6QwiMBSbhkBGbEYiVoOr6uOthbzKFsj4rlZ7tW1JD7fGCo74roeabqAUmDzm1/65PXQOyK2h1g2lBBzXnhjXEuBSuyk4MDgi+3X+zuE+JBRfbXlrw3HEMFQMvwgqqLAQwVWkDuxKwhDqC2oekN26Gg0iNA/Z6nUnmVYkiBhT6wJ63Dh4ufJ07egdtRw8pMrY3HPs2MZXchOsZECKxJjZKn+KY0FHHxD3zHpuccVeW/bTOmK5zhpWnAM9zFl4gHDcjKhBWNm3DbkdEj/dJ59PEiLLGI+CzhPphn1+vUtnsDwywMC/miQeotdVOjs+yvlGMS7CZR64HAKqcqSzGQ4/1lKRjeC+QhSdsQ46FPYYg4SwbI15xreQ2IloraNZ45dFDfk/hj3RaYcHGIGdYwTRNIgqRuXybKrd5tgPxavf6EPrg4b4qFNEVlCQV6EL7vhyP3Y18o/B7+dse6gY41ljPUJB62UhRea+TykHDMzXrtfAMy/6A7TO+4JyRT1LxATVnH4OX9bL/4uzxQ8t95OLeOI3lTsnNb5etS8tIUWFu+Rd+Ibmmt6Oz9rcEhxIBPhgZe1DusZFhU9zi5U0BzC+wMD3E3yTLxKgKYpA6l0mEAek0baCEqK64dsRsL2emN0zVZ+laNNwDFt8g1Sy4qPsKUyTJT/+jKdXWkPJDAXhy8IyINK+TGDt1WDlDUvqSqtnJdDvqj247n5Njs26c2TOeL6JQ5rJ9lr30i6RcOLUb+zEJ3MCfby/8StGEKDEFfXpq0l/eDkYO3fWbEtvPzhB8Z/RUtjlYcfZWShtUHXFHgS01di5R2/50TRhYbxMc8EoBi4qmBumBvh21MDjc7HEEhyhpXLNGGRKbAJCOCQobLMmTYFzPZyFvX/7VkgnX2ufn5143mKtCsmlf1gZaur0ae9+uIysmYH2jwtMDfGtVpJkYejZT2BBS9VLoSbRkZrxf3vW9tg8LjVeImCNDXtN3xP/YgaKzNcWaSi8kSZHD8nOj+SBD9Geruos+cbjDrdnK8hontJk4tSrxD+2UgT1uf4ZHqr15fNiv35/FpAKpVViVgvgESNr5E2uCuberZIW0K5fLRgF+wGkEqhjLn8EcLz8lMfPuySZqij89c+jt0r4ydZPdXtW2qx9qWvtYoHNzSAB5s7WeXTYAe7Ra7WGkodMk3dIQyc6dGxKtdbellnuH+b2Am89sYGRp/9HVS15tCCb0I/jPZBNxVafe X-MS-Exchange-AntiSpam-MessageData-1: hNgy9giYQe41Lw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32930889-ea61-4b30-7179-08da26dd41e9 X-MS-Exchange-CrossTenant-AuthSource: MWHPR10MB1407.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2022 17:01:36.4292 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Dga1ztDsSOFy83FsVOgBT7tyyvfG/ZdzUFjcmkdbXpMFzoH/UdbPuI22QqliRsFBiuTzK0RrTX+Ii7nu0fS/Q+RzQyrujxL6T2OEw2ohANk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR10MB1721 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486, 18.0.858 definitions=2022-04-25_07:2022-04-25, 2022-04-25 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 adultscore=0 mlxscore=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204250076 X-Proofpoint-ORIG-GUID: CY6Ly8SFL8UGzMohOsnunqcwInuHYFxx X-Proofpoint-GUID: CY6Ly8SFL8UGzMohOsnunqcwInuHYFxx X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: "Guillermo E. Martinez via Libabigail" From: "Guillermo E. Martinez" Reply-To: "Guillermo E. Martinez" Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Hello libabigail team, This patch corrects the returning value for `entry_of_file_with_name' function when more than one file in a given directory has a same suffix, Comments will be appreciated. Kind Regards, Guillermo Function `entry_of_file_with_name' uses `string_ends_with' to test if a given `fts_path' member of `FTSENT' structure match with `fname' argument, this result is not correct when in the current directory there are file with names: "./rmdir-xyx", "./dir-xyz" it returns true for both files, this patch fixes this ambiguity using `basename' instead. * src/abg-tools-utils.cc (entry_of_file_with_name): Replace call `string_ends_with' by `basename'. --- src/abg-tools-utils.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/abg-tools-utils.cc b/src/abg-tools-utils.cc index e94c3003..1f0f6fa8 100644 --- a/src/abg-tools-utils.cc +++ b/src/abg-tools-utils.cc @@ -2141,8 +2141,8 @@ entry_of_file_with_name(const FTSENT *entry, || entry->fts_info == FTS_NS) return false; - string fpath = entry->fts_path; - if (string_ends_with(fpath, fname)) + string fpath = ::basename(entry->fts_path); + if (fpath == fname) return true; return false; }