Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83CDDC4363A for ; Tue, 27 Oct 2020 22:51:34 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DEC0820728 for ; Tue, 27 Oct 2020 22:51:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DEC0820728 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-342-ulHUPMadM_Kw_Ve_OSmUlg-1; Tue, 27 Oct 2020 18:51:30 -0400 X-MC-Unique: ulHUPMadM_Kw_Ve_OSmUlg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 51E491009E23; Tue, 27 Oct 2020 22:51:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C9C565D9DD; Tue, 27 Oct 2020 22:51:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3BD77CF52; Tue, 27 Oct 2020 22:51:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09RMk2t4008959 for ; Tue, 27 Oct 2020 18:46:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 01632AB595; Tue, 27 Oct 2020 22:46:02 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ED037AB5B5 for ; Tue, 27 Oct 2020 22:46:01 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7240D1021E15 for ; Tue, 27 Oct 2020 22:46:01 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-37-3372PKC-PZ-rtlrEnEJCzg-1; Tue, 27 Oct 2020 18:45:56 -0400 X-MC-Unique: 3372PKC-PZ-rtlrEnEJCzg-1 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 0A791B266; Tue, 27 Oct 2020 22:45:55 +0000 (UTC) From: mwilck@suse.com To: Christophe Varoqui , Benjamin Marzinski , Xose Vazquez Perez Date: Tue, 27 Oct 2020 23:45:34 +0100 Message-Id: <20201027224536.11662-4-mwilck@suse.com> In-Reply-To: <20201027224536.11662-1-mwilck@suse.com> References: <20201027224536.11662-1-mwilck@suse.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 09RMk2t4008959 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, Martin Wilck , Leonardo Arena Subject: [dm-devel] [PATCH 3/5] libmultipath: always use glibc basename() X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Martin Wilck Our code relies on the non-destructive behavior of glibc's basename(). Fortunately that function is very simple, and our unit test makes it easy to verify its functionality. Signed-off-by: Martin Wilck --- libmultipath/util.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libmultipath/util.c b/libmultipath/util.c index 39ccace..1748eaf 100644 --- a/libmultipath/util.c +++ b/libmultipath/util.c @@ -34,6 +34,19 @@ strchop(char *str) return i; } +#ifndef __GLIBC__ +/* + * glibc's non-destructive version of basename() + * License: LGPL-2.1-or-later + */ +static const char *__basename(const char *filename) +{ + char *p = strrchr(filename, '/'); + return p ? p + 1 : filename; +} +#define basename(x) __basename(x) +#endif + int basenamecpy (const char *src, char *dst, size_t size) { -- 2.29.0 -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel