Skip to content

libsystemd: relocate the stream redirection keys through .got #7

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
JohnAmadis merged 1 commit into from
Sep 29, 2026
Merged

libsystemd: relocate the stream redirection keys through .got #7

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
15 changes: 11 additions & 4 deletions app/libsystemd/src/serviceapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,13 @@ static bool libsystemd_build_argv(libsystemd_service_t service, const char* exec
return true;
}

// Relocated by the module loader (.got) - a pointer initialized with a
// string literal elsewhere keeps its link-time address on target.
static const char* libsystemd_key_stdin DMOD_GLOBAL_POINTER = "stdin";
static const char* libsystemd_key_stdout DMOD_GLOBAL_POINTER = "stdout";
static const char* libsystemd_key_stderr DMOD_GLOBAL_POINTER = "stderr";
static const char* libsystemd_key_stdlog DMOD_GLOBAL_POINTER = "stdlog";

/**
* @brief Build a service's stream redirection table from its "stdin"/"stdout"/"stderr"/"stdlog" ini keys
*
Expand Down Expand Up @@ -1614,10 +1621,10 @@ static bool libsystemd_build_streams(dmini_context_t ctx, libsystemd_service_t s
void* handle;
const char* key;
} candidates[4] = {
{ DMOD_STDIN, "stdin" },
{ DMOD_STDOUT, "stdout" },
{ DMOD_STDERR, "stderr" },
{ DMOD_STDLOG, "stdlog" },
{ DMOD_STDIN, libsystemd_key_stdin },
{ DMOD_STDOUT, libsystemd_key_stdout },
{ DMOD_STDERR, libsystemd_key_stderr },
{ DMOD_STDLOG, libsystemd_key_stdlog },
};

Dmod_StreamRedirection_t* entries = Dmod_Malloc(sizeof(Dmod_StreamRedirection_t) * 4);
Expand Down
Loading