diff options
Diffstat (limited to 'threadproc/beos')
-rw-r--r-- | threadproc/beos/apr_proc_stub.c | 4 | ||||
-rw-r--r-- | threadproc/beos/proc.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/threadproc/beos/apr_proc_stub.c b/threadproc/beos/apr_proc_stub.c index 346f1b520..9f0c1219f 100644 --- a/threadproc/beos/apr_proc_stub.c +++ b/threadproc/beos/apr_proc_stub.c @@ -32,7 +32,7 @@ int main(int argc, char *argv[]) { size_t readbuf = 100; readbuffer = (char*)malloc(sizeof(char) * readbuf); - *newargs = (char*)malloc(sizeof(char) * (argc - 1)); + newargs = (char**)malloc(sizeof(char*) * (argc - 1)); buffer = (void*)malloc(sizeof(struct pipefd)); /* this will block until we get the data */ @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) { if (directory != NULL) chdir(directory); - execve (progname, newargs, pfd->envp); + execve (progname, newargs, NULL); return (-1); }
\ No newline at end of file diff --git a/threadproc/beos/proc.c b/threadproc/beos/proc.c index 61edc1a12..2a7c4a003 100644 --- a/threadproc/beos/proc.c +++ b/threadproc/beos/proc.c @@ -224,8 +224,7 @@ ap_status_t ap_create_process(struct proc_t **new, const char *progname, } resume_thread(newproc); send_data(newproc, 0, (void*)sp, sizeof(struct send_pipe)); - - (*new)->pid = newproc; + (*new)->tid = newproc; /* before we go charging on we need the new process to get to a * certain point. When it gets there it'll let us know and we @@ -328,7 +327,7 @@ ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc) if (proc == NULL) { return APR_ENOPROC; } - theproc = &(proc->pid); + *theproc = proc->tid; return APR_SUCCESS; } @@ -342,7 +341,7 @@ ap_status_t ap_put_os_proc(struct proc_t **proc, ap_os_proc_t *theproc, (*proc) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t)); (*proc)->cntxt = cont; } - (*proc)->pid = *theproc; + (*proc)->tid = *theproc; return APR_SUCCESS; } |