From: Ken Brown <kbrown@cornell.edu>
To: "cygwin-patches@cygwin.com" <cygwin-patches@cygwin.com>
Subject: [PATCH] Cygwin: fix mknod (64-bit only)
Date: Sun, 22 May 2022 12:18:37 -0400 [thread overview]
Message-ID: <0d40096f-322f-64b5-da20-c7ac64c5c97e@cornell.edu> (raw)
[-- Attachment #1: Type: text/plain, Size: 87 bytes --]
Patch attached. I'll push it in a few days if no one sees anything wrong with it.
Ken
[-- Attachment #2: 0001-Cygwin-fix-mknod-64-bit-only.patch --]
[-- Type: text/plain, Size: 1733 bytes --]
From 54cfc70ff3a548d861cb59ac6b2084cc6b791ec2 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Sun, 22 May 2022 11:43:44 -0400
Subject: [PATCH] Cygwin: fix mknod (64-bit only)
The current definition of mknod in syscalls.cc has a third argument of
type __dev16_t instead of dev_t. Fix this on 64-bit Cygwin by
exporting mknod as an alias for mknod32. (There is no problem on
32-bit because mknod is redirected to mknod32 via NEW_FUNCTIONS in
Makefile.am.)
Addresses: https://cygwin.com/pipermail/cygwin-developers/2022-May/012589.html
---
winsup/cygwin/release/3.3.6 | 3 +++
winsup/cygwin/syscalls.cc | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/winsup/cygwin/release/3.3.6 b/winsup/cygwin/release/3.3.6
index 6d722433f..135f33155 100644
--- a/winsup/cygwin/release/3.3.6
+++ b/winsup/cygwin/release/3.3.6
@@ -7,3 +7,6 @@ Bug Fixes
- Fix killpg failing because the exec'ing as well as the exec'ed
process are not in the pidlist for a brief moment.
Addresses: https://cygwin.com/pipermail/cygwin/2022-May/251479.html
+
+- Fix mknod (64-bit only), whose definition didn't match its prototype.
+ Addresses: https://cygwin.com/pipermail/cygwin-developers/2022-May/012589.html
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 3a652c4f4..344d1d329 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -3490,11 +3490,15 @@ mknod32 (const char *path, mode_t mode, dev_t dev)
return -1;
}
+#ifdef __i386__
extern "C" int
mknod (const char *_path, mode_t mode, __dev16_t dev)
{
return mknod32 (_path, mode, (dev_t) dev);
}
+#else
+EXPORT_ALIAS (mknod32, mknod)
+#endif
extern "C" int
mkfifo (const char *path, mode_t mode)
--
2.36.1
reply other threads:[~2022-05-22 16:18 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=0d40096f-322f-64b5-da20-c7ac64c5c97e@cornell.edu \
--to=kbrown@cornell.edu \
--cc=cygwin-patches@cygwin.com \
/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).