From: Paul Eggert <eggert@cs.ucla.edu>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: [PATCH 1/9] posix: Sync glob with gnulib [BZ #1062]
Date: Wed, 06 Sep 2017 02:01:00 -0000 [thread overview]
Message-ID: <c8e463b3-72e1-93b3-29b1-742da1a3eddf@cs.ucla.edu> (raw)
In-Reply-To: <1504643122-14874-2-git-send-email-adhemerval.zanella@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]
Adhemerval Zanella wrote:
> +/* Any distinct values will do here.
> + Undef any existing macros out of the way. */
> +#ifndef DT_UNKNOWN
> +# define DT_UNKNOWN 0
> +#endif
> +#ifndef DT_DIR
> +# define DT_DIR 1
> +#endif
> +#ifndef DT_LNK
> +# define DT_LNK 2
> +#endif
The comment here does not match the code, as nothing is being undeffed. Instead
of this change, how about the following?
#if !defined _LIBC && !defined HAVE_STRUCT_DIRENT_D_TYPE
/* Any distinct values will do here.
Undef any existing macros out of the way. */
# undef DT_UNKNOWN
# undef DT_DIR
# undef DT_LNK
# define DT_UNKNOWN 0
# define DT_DIR 1
# define DT_LNK 2
#endif
This makes it more clear to the casual reader that this code is for use only
outside glibc. Also, it's more robust for hopefully only-hypothetical non-glibc
platforms that define some DT_ symbols but not others, because it guarantees
their uniqueness in that case. I installed the attached patch into Gnulib, along
these lines.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-glob-fix-for-use-in-glibc.patch --]
[-- Type: text/x-patch; name="0001-glob-fix-for-use-in-glibc.patch", Size: 1416 bytes --]
From e73addd2704d4eb68b126210f5b41b428d5d4956 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 5 Sep 2017 18:58:50 -0700
Subject: [PATCH] glob: fix for use in glibc
Problem reported by Adhemerval Zanella in:
https://sourceware.org/ml/libc-alpha/2017-09/msg00213.html
* lib/glob.c (DT_UNKNOWN, DT_DIR, DT_LINK):
Do not redefine if _LIBC.
---
ChangeLog | 8 ++++++++
lib/glob.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 351495b..61e3e8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-09-05 Paul Eggert <eggert@cs.ucla.edu>
+
+ glob: fix for use in glibc
+ Problem reported by Adhemerval Zanella in:
+ https://sourceware.org/ml/libc-alpha/2017-09/msg00213.html
+ * lib/glob.c (DT_UNKNOWN, DT_DIR, DT_LINK):
+ Do not redefine if _LIBC.
+
2017-09-02 Paul Eggert <eggert@cs.ucla.edu>
glob: fix bugs with long login names
diff --git a/lib/glob.c b/lib/glob.c
index 8eb2b97..ddab535 100644
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -80,7 +80,7 @@ static const char *next_brace_sub (const char *begin, int flags) __THROWNL;
typedef uint_fast8_t dirent_type;
-#ifndef HAVE_STRUCT_DIRENT_D_TYPE
+#if !defined _LIBC && !defined HAVE_STRUCT_DIRENT_D_TYPE
/* Any distinct values will do here.
Undef any existing macros out of the way. */
# undef DT_UNKNOWN
--
2.7.4
next prev parent reply other threads:[~2017-09-06 2:01 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-05 20:25 [PATCH 0/9] posix: glob fixes and refactor Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 6/9] posix: fix glob bugs with long login names Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 3/9] posix: Allow glob to match dangling symlinks [BZ #866] Adhemerval Zanella
2017-09-06 1:27 ` Paul Eggert
2017-09-06 12:57 ` Adhemerval Zanella
2017-09-09 9:50 ` Andreas Schwab
2017-09-09 11:56 ` Adhemerval Zanella
2017-09-09 17:02 ` Paul Eggert
2017-09-09 17:11 ` Zack Weinberg
2017-09-09 17:26 ` Andreas Schwab
2017-09-09 17:33 ` Zack Weinberg
2017-09-10 8:19 ` Adhemerval Zanella
2017-09-10 17:13 ` Paul Eggert
2017-09-11 14:34 ` Joseph Myers
2017-09-11 14:38 ` Zack Weinberg
2017-09-11 16:53 ` Paul Eggert
2017-09-11 17:25 ` Zack Weinberg
2017-09-11 17:38 ` Paul Eggert
2017-09-11 17:56 ` Zack Weinberg
2017-09-11 18:03 ` Paul Eggert
2017-09-11 20:09 ` Adhemerval Zanella
2017-09-13 9:14 ` Paul Eggert
2017-09-13 12:22 ` Adhemerval Zanella
2017-09-14 10:05 ` Szabolcs Nagy
2017-09-14 13:43 ` Adhemerval Zanella
2017-09-15 20:18 ` Florian Weimer
2017-09-15 20:27 ` Adhemerval Zanella
2017-09-17 7:16 ` Paul Eggert
2017-09-17 7:48 ` Florian Weimer
2017-09-17 14:18 ` Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 5/9] posix: Fix getpwnam_r usage (BZ #1062) Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 8/9] posix: Use enum for __glob_pattern_type result Adhemerval Zanella
2017-09-06 1:30 ` Paul Eggert
2017-09-06 4:18 ` Paul Eggert
2017-09-06 13:04 ` Adhemerval Zanella
2017-09-06 16:18 ` Paul Eggert
2017-09-06 16:54 ` Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 2/9] posix: accept inode 0 is a valid inode number (BZ #19971) Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 7/9] posix: Consolidate glob implementation Adhemerval Zanella
2017-09-12 7:35 ` Andreas Schwab
2017-09-12 14:08 ` Adhemerval Zanella
2017-09-12 14:17 ` Andreas Schwab
2017-09-12 14:29 ` Joseph Myers
2017-09-12 14:39 ` Andreas Schwab
2017-09-12 14:50 ` Joseph Myers
2017-09-12 12:56 ` Andreas Schwab
2017-09-12 14:22 ` Adhemerval Zanella
2017-09-12 14:34 ` Andreas Schwab
2017-09-13 12:26 ` Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 1/9] posix: Sync glob with gnulib [BZ #1062] Adhemerval Zanella
2017-09-06 2:01 ` Paul Eggert [this message]
2017-09-06 12:52 ` Adhemerval Zanella
2017-09-12 14:20 ` Andreas Schwab
2017-09-12 17:06 ` Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 4/9] Sync scratch_buffer with gnulib Adhemerval Zanella
2017-09-18 6:09 ` Florian Weimer
2017-09-18 11:43 ` Adhemerval Zanella
2017-09-18 11:57 ` Florian Weimer
2017-09-18 12:25 ` Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 9/9] posix: Fix glob with GLOB_NOCHECK returning modified patterns (BZ#10246) Adhemerval Zanella
2017-09-07 22:14 ` Paul Eggert
2017-09-08 9:16 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c8e463b3-72e1-93b3-29b1-742da1a3eddf@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).