CamelCase
This commit is contained in:
parent
ab2f7b14a1
commit
6fe1d5a511
@ -318,10 +318,10 @@ Maybe Tool_exec(Tool* tool){
|
|||||||
Autoarr_freeWithoutMembers(args_ar, true);
|
Autoarr_freeWithoutMembers(args_ar, true);
|
||||||
|
|
||||||
Process tool_proc;
|
Process tool_proc;
|
||||||
try(process_start(&tool_proc, tool->exe_file, args, argc, true), _m5512, Autoarr_freeWithoutMembers(sources, true))
|
try(Process_start(&tool_proc, tool->exe_file, args, argc, true), _m5512, Autoarr_freeWithoutMembers(sources, true))
|
||||||
|
|
||||||
// TODO wrap tool_proc->io
|
// TODO wrap tool_proc->io
|
||||||
process_waitForExit(&tool_proc);
|
Process_waitForExit(&tool_proc);
|
||||||
|
|
||||||
Autoarr_freeWithoutMembers(sources, true);
|
Autoarr_freeWithoutMembers(sources, true);
|
||||||
return MaybeNull;
|
return MaybeNull;
|
||||||
|
|||||||
@ -22,10 +22,10 @@ kt_declare(Process);
|
|||||||
|
|
||||||
///@param search_in_PATH if true and file_path doesn't contain path separator characters, will search in PATH for the file_path
|
///@param search_in_PATH if true and file_path doesn't contain path separator characters, will search in PATH for the file_path
|
||||||
///@return Maybe<void>
|
///@return Maybe<void>
|
||||||
Maybe process_start(Process* ptr, const char* file_path, const char** args, int argc, bool search_in_PATH);
|
Maybe Process_start(Process* ptr, const char* file_path, const char** args, int argc, bool search_in_PATH);
|
||||||
|
|
||||||
///@return Maybe<void>
|
///@return Maybe<void>
|
||||||
Maybe process_waitForExit(Process* p);
|
Maybe Process_waitForExit(Process* p);
|
||||||
|
|
||||||
///@return Maybe<void>
|
///@return Maybe<void>
|
||||||
Maybe Process_stop(Process* p);
|
Maybe Process_stop(Process* p);
|
||||||
|
|||||||
@ -12,7 +12,7 @@ extern void * memset(void * __dst, int __val, size_t __n);
|
|||||||
#define throw_if_negative(expr) if(expr < 0) throw(cptr_concat(#expr " exited with error ", toString_i64(errno)));
|
#define throw_if_negative(expr) if(expr < 0) throw(cptr_concat(#expr " exited with error ", toString_i64(errno)));
|
||||||
#define safethrow_if_negative(expr) if(expr < 0) safethrow(cptr_concat(#expr " exited with error ", toString_i64(errno)), ;);
|
#define safethrow_if_negative(expr) if(expr < 0) safethrow(cptr_concat(#expr " exited with error ", toString_i64(errno)), ;);
|
||||||
|
|
||||||
Maybe process_start(Process* p, const char* file_path, const char** args, int argc, bool search_in_PATH){
|
Maybe Process_start(Process* p, const char* file_path, const char** args, int argc, bool search_in_PATH){
|
||||||
memset(p, 0, sizeof(Process));
|
memset(p, 0, sizeof(Process));
|
||||||
int input_pipe[2];
|
int input_pipe[2];
|
||||||
int output_pipe[2];
|
int output_pipe[2];
|
||||||
@ -71,7 +71,7 @@ Maybe Process_closeHandles(Process* p){
|
|||||||
return MaybeNull;
|
return MaybeNull;
|
||||||
}
|
}
|
||||||
|
|
||||||
Maybe process_waitForExit(Process* p){
|
Maybe Process_waitForExit(Process* p){
|
||||||
int wstatus=0;
|
int wstatus=0;
|
||||||
if(waitpid(p->id, &wstatus, 0) == -1)
|
if(waitpid(p->id, &wstatus, 0) == -1)
|
||||||
safethrow("waitpid() error", ;);
|
safethrow("waitpid() error", ;);
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
#define safethrow_if_false(expr) if(!expr) safethrow(cptr_concat(#expr " exited with error ", toString_i64(GetLastError())), ;);
|
#define safethrow_if_false(expr) if(!expr) safethrow(cptr_concat(#expr " exited with error ", toString_i64(GetLastError())), ;);
|
||||||
|
|
||||||
Maybe process_start(Process* p, const char* file_path, const char** args, int argc, bool search_in_PATH){
|
Maybe Process_start(Process* p, const char* file_path, const char** args, int argc, bool search_in_PATH){
|
||||||
memset(p, 0, sizeof(Process));
|
memset(p, 0, sizeof(Process));
|
||||||
if(search_in_PATH && !cptr_contains(file_path, "\\")){
|
if(search_in_PATH && !cptr_contains(file_path, "\\")){
|
||||||
LPSTR lpFilePart;
|
LPSTR lpFilePart;
|
||||||
@ -112,7 +112,7 @@ Maybe Process_closeHandles(Process* p){
|
|||||||
return MaybeNull;
|
return MaybeNull;
|
||||||
}
|
}
|
||||||
|
|
||||||
Maybe process_waitForExit(Process* p){
|
Maybe Process_waitForExit(Process* p){
|
||||||
if(WaitForSingleObject(p->_winProcHandle, INFINITE) != 0)
|
if(WaitForSingleObject(p->_winProcHandle, INFINITE) != 0)
|
||||||
safethrow("WaitForSingleObject() failed", ;);
|
safethrow("WaitForSingleObject() failed", ;);
|
||||||
DWORD exitCode = 0;
|
DWORD exitCode = 0;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user