From patchwork Thu Jun 22 00:03:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "David C. Manuelda" X-Patchwork-Id: 13288077 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43586EB64D8 for ; Thu, 22 Jun 2023 00:05:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230267AbjFVAFg (ORCPT ); Wed, 21 Jun 2023 20:05:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231284AbjFVAFV (ORCPT ); Wed, 21 Jun 2023 20:05:21 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BD111FF6 for ; Wed, 21 Jun 2023 17:04:52 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3129c55e1d1so19281f8f.0 for ; Wed, 21 Jun 2023 17:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687392217; x=1689984217; h=autocrypt:subject:from:to:content-language:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=IhNywDV9X2n8iEOdHi0Od9BqO5JN/SHtopjAtx8syYw=; b=qUq70+z0gUr12P0BgI2jvolrq8MzcshytkIkzTu1TvUj+yKT3mYs93FDUuslAqKfI6 uwRF93MBjKKqcOrFWHxjIVzLFf7dvxTa4A87BBrmTdecrjmGX1ZGtUNrDLey6o71+KGF tF91xbpgVBNiy59tIjL30bINJb0wCQVCe8fUdwbdSz+0AznA+n2PU8Cx2rGo9B24Qz9z twrf5tu41ufJ6Rv08RWN61APzBI+f+8XGN/yEz54Yxq3v0OGa6fWUuPMQVKUxQAwCZsN 3vyilYUUKO9ATZGiTZc3Y/KidkT+fHkER4HZR7AvNS8+5V6eJX+xwGxqpPSsvz6BRWm5 tBjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687392217; x=1689984217; h=autocrypt:subject:from:to:content-language:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IhNywDV9X2n8iEOdHi0Od9BqO5JN/SHtopjAtx8syYw=; b=JVll+gajmWu1ACLso6SD1QPJTZHDrO73Ufpq5MFUUZCPBXce/TxpDEl5xNRTjZ8JIo 3uupvLKSPkjB+ygsn9l99eedLDN5Ck9UBtAjpg9//NdjGOcVGttTy48yyuQNCdEtBVE0 KTVPNo5EVl3V0PY11hRItMGriudc7vkzwXgk/Ug6MGKcx+3XY6f/1nTFgitRmfIpnyGn bCpuV8GRjqmwdwQOqkQWRkjz96ZmRRHUDZ+VcBg6Ft8/GPiqMraDIsG+U5jPRmL6I3kP UbNAClyTvNsV7mfek/8D5UzsGLi8+xci105dEVnJs5cv/KQKwFRpYwEa+1gT5YMWlGcj 8REg== X-Gm-Message-State: AC+VfDw89DkzFlFw0l2okIifGLHhLfygUUOsSvKpJqfOIXigRtsQR8/L dV2OxO/vau7LJe2VavfPIY4Zf+HNdKY= X-Google-Smtp-Source: ACHHUZ5OcgBNzSE1f+7tXVTTlGPMrBK2Be/HoyTkr7lNKziW94CuzHJw50Qq2tIDbMYLYVTP8LKJGA== X-Received: by 2002:a5d:4149:0:b0:311:1b83:e1e4 with SMTP id c9-20020a5d4149000000b003111b83e1e4mr15906044wrq.5.1687392217206; Wed, 21 Jun 2023 17:03:37 -0700 (PDT) Received: from [10.55.2.20] (178.pool95-22-72.dynamic.orange.es. [95.22.72.178]) by smtp.gmail.com with ESMTPSA id f20-20020a7bcc14000000b003f8044b3436sm17170377wmh.23.2023.06.21.17.03.36 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 21 Jun 2023 17:03:36 -0700 (PDT) Message-ID: Date: Thu, 22 Jun 2023 02:03:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.2 Content-Language: en-US, es To: linux-nfs@vger.kernel.org From: "David C. Manuelda" Subject: [PATCH] Fix building with musl as libc Autocrypt: addr=stormbyte@gmail.com; keydata= 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 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From 14aee98255845c89100c40e45430445ea738d5b4 Mon Sep 17 00:00:00 2001 From: David Carlos Manuelda Date: Thu, 22 Jun 2023 01:58:01 +0200 Subject: [PATCH] Fix musl+clang compile: * Replace __attribute_malloc__ with __attribute__((__malloc__)) * The ALLPERMS define is not specified in POSIX so define them as expected ---  support/include/junction.h   |  2 +-  support/junction/junction.c  |  3 +++  support/junction/locations.c |  2 +-  support/junction/nfs.c       |  3 +++  support/junction/path.c      | 10 +++++++++-  5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/support/include/junction.h b/support/include/junction.h index 7257d80..43105aa 100644 --- a/support/include/junction.h +++ b/support/include/junction.h @@ -125,7 +125,7 @@ void          nfs_free_location(struct nfs_fsloc *location);  void          nfs_free_locations(struct nfs_fsloc *locations);  struct nfs_fsloc *nfs_new_location(void); -__attribute_malloc__ +__attribute__((__malloc__))  char        **nfs_dup_string_array(char **array);  void          nfs_free_string_array(char **array); diff --git a/support/junction/junction.c b/support/junction/junction.c index 0628bb0..4c43667 100644 --- a/support/junction/junction.c +++ b/support/junction/junction.c @@ -29,6 +29,9 @@  #include  #include +#ifndef ALLPERMS +#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) +#endif  #include  #include diff --git a/support/junction/locations.c b/support/junction/locations.c index c577981..e7bc21d 100644 --- a/support/junction/locations.c +++ b/support/junction/locations.c @@ -63,7 +63,7 @@ nfs_free_string_array(char **array)   *   * Caller must free the returned array with nfs_free_string_array()   */ -__attribute_malloc__ char ** +__attribute__((__malloc__)) char **  nfs_dup_string_array(char **array)  {      unsigned int size, i; diff --git a/support/junction/nfs.c b/support/junction/nfs.c index 73e3533..06960ee 100644 --- a/support/junction/nfs.c +++ b/support/junction/nfs.c @@ -70,6 +70,9 @@  #include  #include +#ifndef ALLPERMS +#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) +#endif  #include  #include diff --git a/support/junction/path.c b/support/junction/path.c index 13a1438..2aad915 100644 --- a/support/junction/path.c +++ b/support/junction/path.c @@ -23,6 +23,14 @@   *    http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt   */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef HAVE_LIMITS_H +#include +#endif +  #include  #include @@ -99,7 +107,7 @@ nsdb_alloc_zero_component_pathname(char ***path_array)   * Remove multiple sequential slashes and any trailing slashes,   * but leave "/" by itself alone.   */ -static __attribute_malloc__ char * +static __attribute__((__malloc__)) char *  nsdb_normalize_path(const char *pathname)  {      size_t i, j, len;