dreid 99/10/22 15:06:17
Modified: src/lib/apr/threadproc/beos apr_proc_stub.c proc.c
Log:
Fiz a small problem with the thread_id not being returned by correctly
by ap_get_os_proc.
Revision Changes Path
1.3 +2 -2 apache-2.0/src/lib/apr/threadproc/beos/apr_proc_stub.c
Index: apr_proc_stub.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/apr_proc_stub.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr_proc_stub.c 1999/10/10 17:25:31 1.2
+++ apr_proc_stub.c 1999/10/22 22:06:16 1.3
@@ -32,7 +32,7 @@
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 @@
if (directory != NULL)
chdir(directory);
- execve (progname, newargs, pfd->envp);
+ execve (progname, newargs, NULL);
return (-1);
}
1.8 +3 -4 apache-2.0/src/lib/apr/threadproc/beos/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/proc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- proc.c 1999/10/13 21:35:39 1.7
+++ proc.c 1999/10/22 22:06:16 1.8
@@ -224,8 +224,7 @@
}
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 @@
if (proc == NULL) {
return APR_ENOPROC;
}
- theproc = &(proc->pid);
+ *theproc = proc->tid;
return APR_SUCCESS;
}
@@ -342,7 +341,7 @@
(*proc) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
(*proc)->cntxt = cont;
}
- (*proc)->pid = *theproc;
+ (*proc)->tid = *theproc;
return APR_SUCCESS;
}
