From patchwork Sat Jan 6 21:32:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 856465 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-88904-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="wMs7TBNq"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zDZWn70RJz9s7F for ; Sun, 7 Jan 2018 08:32:53 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=IkWKP/0Nkn/t9PuNyrH/LFP0bYttI7eKm2zubtd+PttPSRmcnC3gP wpq/8OvivEs2P4HFRbKbW4C6VQaOHgCwati7ah4glvQ4KXiw8MZV8i1+aNnH9//V FcDXDNOBI/AQsEXMCkuFacHRL8gIO+o8JCK7FwuKCUx9IrL75lZh2A= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=Ri67lC2xdCg2R/k4N83xLVbCbR8=; b=wMs7TBNqpCdBhaVIsRhqVcsdTcrs sfzTskDOMwkFPppQTO0Vf04rNe8uHYNpuZwQL9mi/v6S3A4dnKrVzY2AP43YYqAe pOCFuSfVtKxUcNsymVcj+SLBE/nG1XdEiC3y+7uRM872PrZ6+kx4MNacQHPRF757 NRvgo2WEQH8P06M= Received: (qmail 103360 invoked by alias); 6 Jan 2018 21:32:47 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 103332 invoked by uid 89); 6 Jan 2018 21:32:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] hurd: Fix glob64 compatibility symbols Date: Sat, 6 Jan 2018 22:32:39 +0100 Message-Id: <20180106213239.32724-1-samuel.thibault@ens-lyon.org> This follows ccf970c7a ('posix: Add compat glob symbol to not follow dangling symbols') by adding to gnu/ the same compatibility as for Linux. * sysdeps/gnu/glob64.c (__glob): Define macro instead of glob macro. (__glob64): Define GLIBC_2_27 versioned symbol instead of glob64. * sysdeps/gnu/glob-lstat-compat.c: New file. * sysdeps/gnu/glob64-lstat-compat.c: New file. --- ChangeLog | 4 ++++ sysdeps/gnu/glob-lstat-compat.c | 38 +++++++++++++++++++++++++++++++ sysdeps/gnu/glob64-lstat-compat.c | 48 +++++++++++++++++++++++++++++++++++++++ sysdeps/gnu/glob64.c | 7 +++--- 4 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 sysdeps/gnu/glob-lstat-compat.c create mode 100644 sysdeps/gnu/glob64-lstat-compat.c diff --git a/ChangeLog b/ChangeLog index 8bc25a4f87..6d87f71649 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,10 @@ * sysdeps/i386/fpu/libm-test-ulps: Regenerated for GCC 7 with "-O2 -march=i686". * posix/tst-glob_symlinks.c [!PATH_MAX]: Define PATH_MAX macro. + * sysdeps/gnu/glob64.c (__glob): Define macro instead of glob macro. + (__glob64): Define GLIBC_2_27 versioned symbol instead of glob64. + * sysdeps/gnu/glob-lstat-compat.c: New file. + * sysdeps/gnu/glob64-lstat-compat.c: New file. 2018-01-05 Tulio Magno Quites Machado Filho diff --git a/sysdeps/gnu/glob-lstat-compat.c b/sysdeps/gnu/glob-lstat-compat.c new file mode 100644 index 0000000000..7cb52d4fee --- /dev/null +++ b/sysdeps/gnu/glob-lstat-compat.c @@ -0,0 +1,38 @@ +/* Compat glob which does not use gl_lstat for GLOB_ALTDIRFUNC. + GNU version + Copyright (C) 2017-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +#define glob64 __no_glob64_decl +#include +#undef glob64 + +#define __glob __glob_lstat_compat + +#define GLOB_ATTRIBUTE attribute_compat_text_section + +/* Avoid calling gl_lstat with GLOB_ALTDIRFUNC. */ +#define GLOB_NO_LSTAT + +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_27) +compat_symbol (libc, __glob_lstat_compat, glob, GLIBC_2_0); +#endif diff --git a/sysdeps/gnu/glob64-lstat-compat.c b/sysdeps/gnu/glob64-lstat-compat.c new file mode 100644 index 0000000000..e237407e0b --- /dev/null +++ b/sysdeps/gnu/glob64-lstat-compat.c @@ -0,0 +1,48 @@ +/* Compat glob which does not use gl_lstat for GLOB_ALTDIRFUNC. + GNU version + Copyright (C) 2017-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include + +#define dirent dirent64 +#define __readdir(dirp) __readdir64 (dirp) + +#define glob_t glob64_t +#define __glob __glob64_lstat_compat +#define globfree globfree64 + +#undef stat +#define stat stat64 +#undef __stat +#define __stat(file, buf) __xstat64 (_STAT_VER, file, buf) + +#define COMPILE_GLOB64 1 + +#define GLOB_ATTRIBUTE attribute_compat_text_section + +/* Avoid calling gl_lstat with GLOB_ALTDIRFUNC. */ +#define GLOB_NO_LSTAT + +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_27) +compat_symbol (libc, __glob64_lstat_compat, glob64, GLIBC_2_1); +#endif diff --git a/sysdeps/gnu/glob64.c b/sysdeps/gnu/glob64.c index 52e97e2f6a..42b5b225ca 100644 --- a/sysdeps/gnu/glob64.c +++ b/sysdeps/gnu/glob64.c @@ -6,8 +6,7 @@ #define __readdir(dirp) __readdir64 (dirp) #define glob_t glob64_t -#define glob(pattern, flags, errfunc, pglob) \ - glob64 (pattern, flags, errfunc, pglob) +#define __glob __glob64 #define globfree(pglob) globfree64 (pglob) #undef stat @@ -19,4 +18,6 @@ #include -libc_hidden_def (glob64) +libc_hidden_def (__glob64) +versioned_symbol (libc, __glob64, glob64, GLIBC_2_27); +libc_hidden_ver (__glob64, glob64)