From: Paul Eggert Date: Thu, 24 Dec 2020 22:47:31 +0000 (-0800) Subject: canonicalize-lgpl: merge proposed libc changes X-Git-Tag: v1.0~3309 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=1013adf6bf48627f84a9043cf2631ff13d2a452f;p=gnulib.git canonicalize-lgpl: merge proposed libc changes This merges the changes proposed for glibc in: https://sourceware.org/pipermail/libc-alpha/2020-December/121085.html https://sourceware.org/pipermail/libc-alpha/2020-December/121086.html * lib/canonicalize-lgpl.c: Include idx.h and filename.h unconditionally. (idx_t, IDX_MAX, FILE_SYSTEM_PREFIX_LEN, IS_ABSOLUTE_FILE_NAME) (ISSLASH) [_LIBC]: Remove. --- diff --git a/ChangeLog b/ChangeLog index 531c4166df..30be929b52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2020-12-24 Paul Eggert + + canonicalize-lgpl: merge proposed libc changes + This merges the changes proposed for glibc in: + https://sourceware.org/pipermail/libc-alpha/2020-December/121085.html + https://sourceware.org/pipermail/libc-alpha/2020-December/121086.html + * lib/canonicalize-lgpl.c: Include idx.h and filename.h + unconditionally. + (idx_t, IDX_MAX, FILE_SYSTEM_PREFIX_LEN, IS_ABSOLUTE_FILE_NAME) + (ISSLASH) [_LIBC]: Remove. + 2020-12-24 Bruno Haible posix_spawn-internal: Implement for native Windows. diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index d6dd18dcff..8c8f98abc4 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -38,15 +38,12 @@ #include #include +#include +#include #include #ifdef _LIBC # include -typedef ptrdiff_t idx_t; -# define IDX_MAX PTRDIFF_MAX -# define FILE_SYSTEM_PREFIX_LEN(name) 0 -# define IS_ABSOLUTE_FILE_NAME(name) ISSLASH (*(name)) -# define ISSLASH(c) ((c) == '/') # include # ifdef __ASSUME_FACCESSAT2 # define FACCESSAT_NEVER_EOVERFLOWS __ASSUME_FACCESSAT2 @@ -56,9 +53,7 @@ typedef ptrdiff_t idx_t; #else # define __canonicalize_file_name canonicalize_file_name # define __realpath realpath -# include "idx.h" # include "pathmax.h" -# include "filename.h" # define __faccessat faccessat # if defined _WIN32 && !defined __CYGWIN__ # define __getcwd _getcwd