Skip to content
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

Jump to bottom

Implement runProgram for Windows #10769

Merged
merged 7 commits into from
Jun 23, 2024
Merged

Implement runProgram for Windows #10769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a58ca34
Initial runProgram implementation for Windows
poweredbypie Jun 17, 2024
b11cf81
Format runProgram declaration
poweredbypie Jun 17, 2024
4662e7d
Implement windowsEscape
poweredbypie Jun 17, 2024
d7537f6
Implement initial spawn tests (just testing windowsEscape for now)
poweredbypie Jun 17, 2024
4f6e3b9
Implement tests for lookupPathForProgram and fix bugs caught by tests
poweredbypie Jun 18, 2024
fcb92b4
Fix DWORD vs. int comparison warning
poweredbypie Jun 18, 2024
8b81d08
Remove lookupPathForProgram and implement initial runProgram test
poweredbypie Jun 18, 2024
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
17 changes: 14 additions & 3 deletions src/libutil/processes.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "types.hh"
#include "error.hh"
#include "file-descriptor.hh"
#include "logging.hh"
#include "ansicolor.hh"

Expand All @@ -23,26 +24,36 @@ namespace nix {
struct Sink;
struct Source;

#ifndef _WIN32
class Pid
{
#ifndef _WIN32
pid_t pid = -1;
bool separatePG = false;
int killSignal = SIGKILL;
#else
AutoCloseFD pid = INVALID_DESCRIPTOR;
#endif
public:
Pid();
#ifndef _WIN32
Pid(pid_t pid);
~Pid();
void operator =(pid_t pid);
operator pid_t();
#else
Pid(AutoCloseFD pid);
void operator =(AutoCloseFD pid);
#endif
~Pid();
int kill();
int wait();

// TODO: Implement for Windows
#ifndef _WIN32
void setSeparatePG(bool separatePG);
void setKillSignal(int signal);
pid_t release();
};
#endif
};


#ifndef _WIN32
Expand Down
Loading
Loading