doylet/DN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc fixes

Browse Source
This commit is contained in:
doylet
2026-07-21 17:10:33 +10:00
parent 3f8261fa0d
commit 56c765e944
3 changed files with 60 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Single-Header/dn_single_header.cpp
+30 -13
View File
@@ -1,4 +1,4 @@
// Generated by the DN single header generator 2026-07-19 16:12:36 // Generated by the DN single header generator 2026-07-19 17:56:21
// DN: Single header generator commented out => #if defined(_CLANGD) // DN: Single header generator commented out => #if defined(_CLANGD)
// #define DN_WITH_TESTS 1 // #define DN_WITH_TESTS 1
@@ -15506,8 +15506,10 @@ DN_API DN_OSExecAsyncHandle DN_OS_ExecAsync(DN_Str8Slice cmd_line, DN_OSExecArgs
if (it.index) if (it.index)
count_req += cmd_separator.count; count_req += cmd_separator.count;
if (DN_Str8Find(*it.data, DN_Str8FindFlag_Whitespace).found) if (!DN_Str8StartsWithSensitive(*it.data, DN_Str8Lit("\""))) {
count_req += 2; // If there's whitespace, we'll quote the string for the user if (DN_Str8Find(*it.data, DN_Str8FindFlag_Whitespace).found)
count_req += 2; // If there's whitespace, we'll quote the string for the user
}
count_req += it.data->count; count_req += it.data->count;
} }
@@ -15522,8 +15524,11 @@ DN_API DN_OSExecAsyncHandle DN_OS_ExecAsync(DN_Str8Slice cmd_line, DN_OSExecArgs
} }
// NOTE: Quote the string if needed // NOTE: Quote the string if needed
DN_Str8 str8 = *it.data; DN_Str8 str8 = *it.data;
bool needs_quotes = DN_Str8Find(str8, DN_Str8FindFlag_Whitespace).found; bool needs_quotes = false;
if (!DN_Str8StartsWithSensitive(*it.data, DN_Str8Lit("\"")))
needs_quotes = DN_Str8Find(str8, DN_Str8FindFlag_Whitespace).found;
if (needs_quotes) if (needs_quotes)
cmd.data[write_index++] = '\"'; cmd.data[write_index++] = '\"';
@@ -15571,7 +15576,7 @@ DN_API DN_OSExecAsyncHandle DN_OS_ExecAsync(DN_Str8Slice cmd_line, DN_OSExecArgs
if (DN_BitIsSet(args.flags, DN_OSExecFlags_SaveStdout)) { if (DN_BitIsSet(args.flags, DN_OSExecFlags_SaveStdout)) {
if (!CreatePipe(&stdout_read, &stdout_write, &save_std_security_attribs, /*nSize*/ 0)) { if (!CreatePipe(&stdout_read, &stdout_write, &save_std_security_attribs, /*nSize*/ 0)) {
DN_OSW32Error win_error = DN_OS_W32LastError(&scratch.arena); DN_OSW32Error win_error = DN_OS_W32LastError(&scratch.arena);
result.os_error_code = win_error.code; result.os_error_code = win_error.code;
DN_ErrSinkAppendF( DN_ErrSinkAppendF(
err, err,
result.os_error_code, result.os_error_code,
@@ -15640,14 +15645,23 @@ DN_API DN_OSExecAsyncHandle DN_OS_ExecAsync(DN_Str8Slice cmd_line, DN_OSExecArgs
} }
} }
// NOTE: Create a null stdin pipe so child gets EOF on read
// TODO: Eventually we should let the caller optionally write to stdin
HANDLE stdin_read = {};
if (DN_BitIsSet(args.flags, DN_OSExecFlags_SaveStdout) || DN_BitIsSet(args.flags, DN_OSExecFlags_SaveStderr)) {
HANDLE stdin_write = {};
if (CreatePipe(&stdin_read, &stdin_write, &save_std_security_attribs, 0))
CloseHandle(stdin_write);
}
// NOTE: Execute command // NOTE: Execute command
PROCESS_INFORMATION proc_info = {}; PROCESS_INFORMATION proc_info = {};
STARTUPINFOW startup_info = {}; STARTUPINFOW startup_info = {};
startup_info.cb = sizeof(STARTUPINFOW); startup_info.cb = sizeof(STARTUPINFOW);
startup_info.hStdError = stderr_write ? stderr_write : GetStdHandle(STD_ERROR_HANDLE); startup_info.hStdError = stderr_write ? stderr_write : GetStdHandle(STD_ERROR_HANDLE);
startup_info.hStdOutput = stdout_write ? stdout_write : GetStdHandle(STD_OUTPUT_HANDLE); startup_info.hStdOutput = stdout_write ? stdout_write : GetStdHandle(STD_OUTPUT_HANDLE);
startup_info.hStdInput = GetStdHandle(STD_INPUT_HANDLE); startup_info.hStdInput = stdin_read ? stdin_read : GetStdHandle(STD_INPUT_HANDLE);
startup_info.dwFlags |= STARTF_USESTDHANDLES; startup_info.dwFlags |= STARTF_USESTDHANDLES;
BOOL create_result = CreateProcessW(nullptr, BOOL create_result = CreateProcessW(nullptr,
cmd16.data, cmd16.data,
nullptr, nullptr,
@@ -15658,6 +15672,9 @@ DN_API DN_OSExecAsyncHandle DN_OS_ExecAsync(DN_Str8Slice cmd_line, DN_OSExecArgs
working_dir16.data, working_dir16.data,
&startup_info, &startup_info,
&proc_info); &proc_info);
if (stdin_read)
CloseHandle(stdin_read);
if (!create_result) { if (!create_result) {
DN_OSW32Error win_error = DN_OS_W32LastError(&scratch.arena); DN_OSW32Error win_error = DN_OS_W32LastError(&scratch.arena);
result.os_error_code = win_error.code; result.os_error_code = win_error.code;
Single-Header/dn_single_header.h
+1 -1
View File
@@ -1,4 +1,4 @@
// Generated by the DN single header generator 2026-07-19 16:12:36 // Generated by the DN single header generator 2026-07-19 17:56:21
#if !defined(DN_H) #if !defined(DN_H)
#define DN_H #define DN_H
Source/OS/dn_os_w32.cpp
+29 -12
View File
@@ -867,8 +867,10 @@ DN_API DN_OSExecAsyncHandle DN_OS_ExecAsync(DN_Str8Slice cmd_line, DN_OSExecArgs
if (it.index) if (it.index)
count_req += cmd_separator.count; count_req += cmd_separator.count;
if (DN_Str8Find(*it.data, DN_Str8FindFlag_Whitespace).found) if (!DN_Str8StartsWithSensitive(*it.data, DN_Str8Lit("\""))) {
count_req += 2; // If there's whitespace, we'll quote the string for the user if (DN_Str8Find(*it.data, DN_Str8FindFlag_Whitespace).found)
count_req += 2; // If there's whitespace, we'll quote the string for the user
}
count_req += it.data->count; count_req += it.data->count;
} }
@@ -883,8 +885,11 @@ DN_API DN_OSExecAsyncHandle DN_OS_ExecAsync(DN_Str8Slice cmd_line, DN_OSExecArgs
} }
// NOTE: Quote the string if needed // NOTE: Quote the string if needed
DN_Str8 str8 = *it.data; DN_Str8 str8 = *it.data;
bool needs_quotes = DN_Str8Find(str8, DN_Str8FindFlag_Whitespace).found; bool needs_quotes = false;
if (!DN_Str8StartsWithSensitive(*it.data, DN_Str8Lit("\"")))
needs_quotes = DN_Str8Find(str8, DN_Str8FindFlag_Whitespace).found;
if (needs_quotes) if (needs_quotes)
cmd.data[write_index++] = '\"'; cmd.data[write_index++] = '\"';
@@ -932,7 +937,7 @@ DN_API DN_OSExecAsyncHandle DN_OS_ExecAsync(DN_Str8Slice cmd_line, DN_OSExecArgs
if (DN_BitIsSet(args.flags, DN_OSExecFlags_SaveStdout)) { if (DN_BitIsSet(args.flags, DN_OSExecFlags_SaveStdout)) {
if (!CreatePipe(&stdout_read, &stdout_write, &save_std_security_attribs, /*nSize*/ 0)) { if (!CreatePipe(&stdout_read, &stdout_write, &save_std_security_attribs, /*nSize*/ 0)) {
DN_OSW32Error win_error = DN_OS_W32LastError(&scratch.arena); DN_OSW32Error win_error = DN_OS_W32LastError(&scratch.arena);
result.os_error_code = win_error.code; result.os_error_code = win_error.code;
DN_ErrSinkAppendF( DN_ErrSinkAppendF(
err, err,
result.os_error_code, result.os_error_code,
@@ -1001,14 +1006,23 @@ DN_API DN_OSExecAsyncHandle DN_OS_ExecAsync(DN_Str8Slice cmd_line, DN_OSExecArgs
} }
} }
// NOTE: Create a null stdin pipe so child gets EOF on read
// TODO: Eventually we should let the caller optionally write to stdin
HANDLE stdin_read = {};
if (DN_BitIsSet(args.flags, DN_OSExecFlags_SaveStdout) || DN_BitIsSet(args.flags, DN_OSExecFlags_SaveStderr)) {
HANDLE stdin_write = {};
if (CreatePipe(&stdin_read, &stdin_write, &save_std_security_attribs, 0))
CloseHandle(stdin_write);
}
// NOTE: Execute command // NOTE: Execute command
PROCESS_INFORMATION proc_info = {}; PROCESS_INFORMATION proc_info = {};
STARTUPINFOW startup_info = {}; STARTUPINFOW startup_info = {};
startup_info.cb = sizeof(STARTUPINFOW); startup_info.cb = sizeof(STARTUPINFOW);
startup_info.hStdError = stderr_write ? stderr_write : GetStdHandle(STD_ERROR_HANDLE); startup_info.hStdError = stderr_write ? stderr_write : GetStdHandle(STD_ERROR_HANDLE);
startup_info.hStdOutput = stdout_write ? stdout_write : GetStdHandle(STD_OUTPUT_HANDLE); startup_info.hStdOutput = stdout_write ? stdout_write : GetStdHandle(STD_OUTPUT_HANDLE);
startup_info.hStdInput = GetStdHandle(STD_INPUT_HANDLE); startup_info.hStdInput = stdin_read ? stdin_read : GetStdHandle(STD_INPUT_HANDLE);
startup_info.dwFlags |= STARTF_USESTDHANDLES; startup_info.dwFlags |= STARTF_USESTDHANDLES;
BOOL create_result = CreateProcessW(nullptr, BOOL create_result = CreateProcessW(nullptr,
cmd16.data, cmd16.data,
nullptr, nullptr,
@@ -1019,6 +1033,9 @@ DN_API DN_OSExecAsyncHandle DN_OS_ExecAsync(DN_Str8Slice cmd_line, DN_OSExecArgs
working_dir16.data, working_dir16.data,
&startup_info, &startup_info,
&proc_info); &proc_info);
if (stdin_read)
CloseHandle(stdin_read);
if (!create_result) { if (!create_result) {
DN_OSW32Error win_error = DN_OS_W32LastError(&scratch.arena); DN_OSW32Error win_error = DN_OS_W32LastError(&scratch.arena);
result.os_error_code = win_error.code; result.os_error_code = win_error.code;