diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-11-30 17:22:25 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-12-02 17:31:14 +0100 |
| commit | a148e931c6c6a7d2a5e602f188d67e199082ae0a (patch) | |
| tree | 75b7838002fa5c6261a1e2334b82fbce36b086b8 | |
| parent | e3c983ea9d62cdd0de86a8f4c4164c692252fb74 (diff) | |
exec: improve the exec_demuxer function
Handle multiple request types as recommended by the Mach Server
Writer's Guide section 4, subsection "Handling Multiple Request
Types". This avoids initializing the reply message in every X_server
function. The reply message has already been properly initialized in
libports, so there is no need to call mig_reply_setup.
Furthermore, move the exec_startup_server_routine to the end of the
chain, as the startup related functions are only needed at system
bootstrap time.
* exec/main.c (exec_demuxer): Improve the demuxer function.
| -rw-r--r-- | exec/main.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/exec/main.c b/exec/main.c index d23cc12c..41b1db49 100644 --- a/exec/main.c +++ b/exec/main.c @@ -1,6 +1,6 @@ /* GNU Hurd standard exec server, main program and server mechanics. - Copyright (C) 1992,93,94,95,96,97,98,99,2000,01,02 + Copyright (C) 1992,93,94,95,96,97,98,99,2000,01,02,13 Free Software Foundation, Inc. Written by Roland McGrath. This file is part of the GNU Hurd. @@ -49,11 +49,20 @@ char **save_argv; static int exec_demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp) { - extern int exec_server (mach_msg_header_t *inp, mach_msg_header_t *outp); - extern int exec_startup_server (mach_msg_header_t *, mach_msg_header_t *); - return (exec_startup_server (inp, outp) || - exec_server (inp, outp) || - trivfs_demuxer (inp, outp)); + mig_routine_t exec_server_routine (mach_msg_header_t *); + mig_routine_t exec_startup_server_routine (mach_msg_header_t *); + + mig_routine_t routine; + if ((routine = exec_server_routine (inp)) || + (routine = NULL, trivfs_demuxer (inp, outp)) || + (routine = exec_startup_server_routine (inp))) + { + if (routine) + (*routine) (inp, outp); + return TRUE; + } + else + return FALSE; } |