public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: dirent.h: make definition of struct __DIR opaque Date: Thu, 1 Feb 2024 11:39:18 +0000 (GMT) [thread overview] Message-ID: <20240201113918.E29DD3857C52@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=5353cb8ef8a5cf411ee3c3518edfd6f472abbe58 commit 5353cb8ef8a5cf411ee3c3518edfd6f472abbe58 Author: Corinna Vinschen <corinna@vinschen.de> AuthorDate: Tue Jan 23 16:09:02 2024 +0100 Commit: Corinna Vinschen <corinna@vinschen.de> CommitDate: Wed Jan 31 20:11:57 2024 +0100 Cygwin: dirent.h: make definition of struct __DIR opaque The content of DIR should never have been exposed into userspace. Move struct __DIR to local dirent.h and only keep forward declaration in exported dirent.h. This allows to tweak the structure in future, for instance, to add thread-safety. Signed-off-by: Corinna Vinschen <corinna@vinschen.de> Diff: --- winsup/cygwin/include/sys/dirent.h | 18 ++---------------- winsup/cygwin/local_includes/dirent.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h index 668c870295b4..dae324a7f6f6 100644 --- a/winsup/cygwin/include/sys/dirent.h +++ b/winsup/cygwin/include/sys/dirent.h @@ -1,4 +1,4 @@ -/* Posix dirent.h for WIN32. +/* Posix dirent.h This software is a copyrighted work licensed under the terms of the Cygwin license. Please consult the file "CYGWIN_LICENSE" for @@ -41,21 +41,7 @@ struct dirent #define d_fileno d_ino /* BSD compatible definition */ -#define __DIRENT_COOKIE 0xcdcd8484 - -typedef struct __DIR -{ - /* This is first to set alignment in non _LIBC case. */ - unsigned long __d_cookie; - struct dirent *__d_dirent; - char *__d_dirname; /* directory name with trailing '*' */ - __int32_t __d_position; /* used by telldir/seekdir */ - int __d_fd; - uintptr_t __d_internal; - void *__handle; - void *__fh; - unsigned __flags; -} DIR; +typedef struct __DIR DIR; #if __BSD_VISIBLE #ifdef _DIRENT_HAVE_D_TYPE diff --git a/winsup/cygwin/local_includes/dirent.h b/winsup/cygwin/local_includes/dirent.h new file mode 100644 index 000000000000..075b762ce922 --- /dev/null +++ b/winsup/cygwin/local_includes/dirent.h @@ -0,0 +1,30 @@ +/* dirent.h: define struct __DIR + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ + +#ifndef _CYGWIN_DIRENT_H +#define _CYGWIN_DIRENT_H + +#include_next <dirent.h> + +#define __DIRENT_COOKIE 0xcdcd8484 + +struct __DIR +{ + /* This is first to set alignment in non _LIBC case. */ + unsigned long __d_cookie; + struct dirent *__d_dirent; + char *__d_dirname; /* directory name with trailing '*' */ + __int32_t __d_position; /* used by telldir/seekdir */ + int __d_fd; + uintptr_t __d_internal; + void *__handle; + void *__fh; + unsigned __flags; +}; + +#endif /* _CYGWIN_DIRENT_H */
reply other threads:[~2024-02-01 11:39 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240201113918.E29DD3857C52@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@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: linkBe 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).