Skip to content

Fix #18567 - quote spaced linker argv0 paths #23339

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

Merged
thewilsonator merged 1 commit into from
Jun 29, 2026
Merged

Fix #18567 - quote spaced linker argv0 paths #23339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions compiler/src/dmd/link.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,13 @@ version (Windows)
assert(test(`"/LIBPATH:dir with spaces"`) == `"/LIBPATH:dir with spaces"`);
assert(test(`/LIBPATH:"dir with spaces"`) == `/LIBPATH:"dir with spaces"`);
}

private const(char)* quotedArgIfNeeded(ref OutBuffer buffer, const(char)* arg)
{
buffer.reset();
buffer.writeQuotedArgIfNeeded(arg);
return buffer.peekChars();
}
}

enum STATUS_FAILED = -1;
Expand Down Expand Up @@ -809,7 +816,8 @@ version (Windows)
status = executearg0(cmd, args);
if (status == -1)
{
status = spawnlp(0, cmd, cmd, args, null);
OutBuffer quotedCmd;
status = spawnlp(0, cmd, quotedArgIfNeeded(quotedCmd, cmd), args, null);
}
}
if (status)
Expand Down Expand Up @@ -844,8 +852,9 @@ version (Windows)
return -1;
const file = FileName.replaceName(argv0, cmd.toDString);
//printf("spawning '%s'\n",file);
OutBuffer quotedFile;
// spawnlp returns intptr_t in some systems, not int
return spawnl(0, file.ptr, file.ptr, args, null);
return spawnl(0, file.ptr, quotedArgIfNeeded(quotedFile, file.ptr), args, null);
}
}

Expand Down
Loading