Skip to content

Msys2 3.6.9 patches reorder #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lygstate wants to merge 9 commits into
base: msys2-3.6.9
Choose a base branch
from
Open

Msys2 3.6.9 patches reorder #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2dcb3a3
Revert "strace.cc: Don't set MSYS=noglob"
lygstate Jan 16, 2026
544891d
Revert "Rename dll from cygwin to msys"
lygstate Jan 16, 2026
a02e946
Revert "uname: allow setting the system name to CYGWIN"
lygstate Jan 16, 2026
b3d00ae
Revert "Add functionality for changing OS name via MSYSTEM environmen…
lygstate Jan 16, 2026
f6c0235
Add functionality for changing OS name via MSYSTEM environment variab…
Alexpux Apr 14, 2019
9835c20
Add support for MSYS environment variable instead of CYGWIN
Alexpux Apr 14, 2019
39536f0
strace.cc: Don't set CYGWIN=noglob
lygstate Jan 16, 2026
339b0df
Convert to use msys'style named pipe
lygstate Jan 16, 2026
607456c
Rename dll from cygwin to msys
Alexpux Apr 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion winsup/utils/mingw/cygcheck.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ static const char *known_env_vars[] = {
"c_include_path",
"compiler_path",
"cxx_include_path",
"msys",
"dejagnu",
"expect",
"gcc_default_options",
Expand All @@ -107,6 +106,7 @@ static const char *known_env_vars[] = {
"lpath",
"make_mode",
"makeflags",
"msys",
"path",
"pwd",
"strace",
Expand Down
31 changes: 8 additions & 23 deletions winsup/utils/mingw/strace.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,36 +356,21 @@ create_child (char **argv)
printf ("create_child: %s\n", one_line.buf);

SetConsoleCtrlHandler (NULL, 0);
/* Commit message for this code was:
"* strace.cc (create_child): Set CYGWIN=noglob when starting new process so that

Cygwin will leave already-parsed the command line alonw."

I can see no reason for it and it badly breaks the ability to use
strace.exe to investigate calling a Cygwin program from a Windows
program, for example:
strace mingw32-make.exe
.. where mingw32-make.exe finds sh.exe and uses it as the shell.
The reason it badly breaks this use-case is because dcrt0.cc depends
on globbing to happen to parse commandlines from Windows programs;
irrespective of whether they contain any glob patterns or not.

See quoted () comment:
"This must have been run from a Windows shell, so preserve
quotes for globify to play with later."

const char *cygwin_env = getenv ("MSYS");

#if 0
const char *cygwin_env = getenv ("CYGWIN");
const char *space;

if (cygwin_env && strlen (cygwin_env) <= 256) // sanity check
if (cygwin_env && strlen (cygwin_env) <= 256) /* sanity check */
space = " ";
else
space = cygwin_env = "";
char *newenv = (char *) malloc (sizeof ("MSYS=noglob")
char *newenv = (char *) malloc (sizeof ("CYGWIN=noglob")
+ strlen (space) + strlen (cygwin_env));
sprintf (newenv, "MSYS=noglob%s%s", space, cygwin_env);
sprintf (newenv, "CYGWIN=noglob%s%s", space, cygwin_env);
_putenv (newenv);
*/
#endif

ret = CreateProcess (0, one_line.buf, /* command line */
NULL, /* Security */
NULL, /* thread */
Expand Down
Loading