diff options
Diffstat (limited to 'mach')
| -rw-r--r-- | mach/Makefile | 2 | ||||
| -rw-r--r-- | mach/err_kern.sub | 32 | ||||
| -rw-r--r-- | mach/mach/error.h | 40 | ||||
| -rw-r--r-- | mach/mach/mach_traps.h | 34 | ||||
| -rw-r--r-- | mach/msgserver.c | 38 |
5 files changed, 82 insertions, 64 deletions
diff --git a/mach/Makefile b/mach/Makefile index f7f0c09420..986c2dad51 100644 --- a/mach/Makefile +++ b/mach/Makefile @@ -130,7 +130,7 @@ $(objpfx)mach-shortcuts.h: $(objpfx)mach/mach_interface.h \ $(objpfx)mach/mach_port.h # The first line gets us one paragraph per line, with @s separating real lines. # The second line selects paragraphs for the shortcutted functions. -# The third line removes `_rpc' from the names and rerealifies the lines. +# The third line removes `_rpc' from the names and reconstitutes the lines. cat $^ | tr \\012 @ | sed s/@@/@%/g | tr % \\012 \ | grep '^/\* Routine [a-z0-9_]*_rpc \*/' \ | sed 's/_rpc//g' | tr @ \\012 > $@-new diff --git a/mach/err_kern.sub b/mach/err_kern.sub index d5290b4e9b..e2e498d2b7 100644 --- a/mach/err_kern.sub +++ b/mach/err_kern.sub @@ -1,48 +1,54 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ /* * HISTORY * $Log$ + * Revision 1.5 1996/12/20 01:32:34 drepper + * Update from main archive 961219 + * + * Revision 1.5 1996/12/19 20:23:39 drepper + * Spelling corrections. + * * Revision 1.4 1993/12/17 06:14:52 mib * entered into RCS * * Revision 2.3 92/04/01 19:38:02 rpd * Added err_codes_device. * [92/03/09 rpd] - * + * * Revision 2.2 92/01/16 00:08:50 rpd * Moved from user collection to mk collection. - * + * * Revision 2.3 91/08/29 15:51:22 rpd * Updated err_codes_kern. * [91/08/15 rpd] - * + * * Revision 2.2 91/03/27 16:05:27 mrt * First checkin - * + * */ /* * File: err_kern.sub @@ -130,12 +136,12 @@ static char * err_codes_unix[] = { "(os/unix) result is out of range", "(os/unix) operation on device would block", "(os/unix) operation is now in progress", - "(os/unix) operation is already in progress", + "(os/unix) operation is already in progress", "(os/unix) socket operation attempted on non-socket object", "(os/unix) destination address is required", "(os/unix) message is too long", "(os/unix) protocol type is incorrect for socket", - "(os/unix) protocol type is not availaible", + "(os/unix) protocol type is not available", "(os/unix) protocol type is not supported", "(os/unix) socket type is not supported", "(os/unix) operation is not supported on sockets", diff --git a/mach/mach/error.h b/mach/mach/error.h index e75ccf3f66..83cf61ef8f 100644 --- a/mach/mach/error.h +++ b/mach/mach/error.h @@ -3,71 +3,77 @@ * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ /* * HISTORY * $Log$ + * Revision 1.2 1996/12/20 01:32:36 drepper + * Update from main archive 961219 + * + * Revision 1.2 1996/12/19 20:23:56 drepper + * Spelling corrections. + * * Revision 1.1 1993/12/17 21:40:28 roland * entered into RCS * * Revision 2.6 93/01/14 17:41:31 danner * Standardized include symbol name. * [92/06/10 pds] - * + * * Revision 2.5 92/03/31 15:18:11 rpd * Added err_bootstrap for bootstrap errors. * [92/03/09 rpd] - * + * * Revision 2.4 91/05/14 16:51:24 mrt * Correcting copyright - * + * * Revision 2.3 91/02/05 17:31:48 mrt * Changed to new Mach copyright * [91/02/01 17:16:50 mrt] - * + * * Revision 2.2 90/06/02 14:57:47 rpd * Added err_mach_ipc for new IPC. * [90/03/26 22:28:42 rpd] - * + * * Revision 2.1 89/08/03 16:02:07 rwd * Created. - * + * * Revision 2.4 89/02/25 18:13:18 gm0w * Changes for cleanup. - * + * * Revision 2.3 89/02/07 00:51:57 mwyoung * Relocated from sys/error.h - * + * * Revision 2.2 88/10/18 00:37:31 mwyoung - * Added {system,sub and code}_emask + * Added {system,sub and code}_emask * [88/10/17 17:06:58 mrt] - * - * Added {system,sub and code}_emask + * + * Added {system,sub and code}_emask * * 12-May-88 Mary Thompson (mrt) at Carnegie Mellon * Changed mach_error_t from unsigned int to kern_return_t * which is a 32 bit integer regardless of machine type. - * insigned int was incompatible with old usages of mach_error. + * unsigned int was incompatible with old usages of mach_error. * * 10-May-88 Douglas Orr (dorr) at Carnegie-Mellon University * Missing endif replaced diff --git a/mach/mach/mach_traps.h b/mach/mach/mach_traps.h index e741e16996..17fee75fae 100644 --- a/mach/mach/mach_traps.h +++ b/mach/mach/mach_traps.h @@ -1,20 +1,20 @@ -/* Copyright (C) 1994 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1994, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* Declare the few Mach system calls (except mach_msg, in <mach/message.h>). This does not include the kernel RPC shortcut calls (in <mach-shortcuts.h>). @@ -52,12 +52,12 @@ extern boolean_t __swtch (void); /* Attempt to context switch the current thread off the processor. Lower the thread's priority as much as possible. The thread's priority will - be restored when it runs again. PRIORITY is currently unused. Return + be restored when it runs again. PRIORITY is currently unused. Return true if there are other threads that can be run and false if not. */ extern boolean_t swtch_pri (int priority); extern boolean_t __swtch_pri (int priority); -/* Attempt to context switch the current thread of the rpocessor. Try +/* Attempt to context switch the current thread of the processor. Try to run NEW_THREAD next, ignoring normal scheduling policies. The OPTION value comes from <mach/thread_switch.h>. If OPTION is SWITCH_OPTION_WAIT, then block the current thread for TIME @@ -67,7 +67,7 @@ extern boolean_t __swtch_pri (int priority); kern_return_t thread_switch (mach_port_t new_thread, int option, int time); kern_return_t __thread_switch (mach_port_t new_thread, int option, int time); -/* Block the current thread until the kernel (or device) event +/* Block the current thread until the kernel (or device) event identified by EVENT occurs. */ kern_return_t evc_wait (unsigned int event); kern_return_t __evc_wait (unsigned int event); diff --git a/mach/msgserver.c b/mach/msgserver.c index da64b89c94..c11ea9a699 100644 --- a/mach/msgserver.c +++ b/mach/msgserver.c @@ -1,20 +1,20 @@ -/* Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* Based on CMU's mach_msg_server.c revision 2.4 of 91/05/14, and thus under the following copyright. Rewritten by Roland McGrath (FSF) @@ -49,6 +49,12 @@ Cambridge, MA 02139, USA. */ /* * HISTORY * $Log$ + * Revision 1.5 1996/12/20 01:32:35 drepper + * Update from main archive 961219 + * + * Revision 1.5 1996/12/19 20:23:45 drepper + * Spelling corrections. + * * Revision 1.4 1996/01/29 15:44:23 roland * Declare DEMUX arg with prototype. * @@ -162,7 +168,7 @@ __mach_msg_server_timeout (boolean_t (*demux) (mach_msg_header_t *request, { case MACH_RCV_TOO_LARGE: /* The request message is larger than MAX_SIZE, and has not - been dequued. The message header has the actual size of + been dequeued. The message header has the actual size of the message. We recurse here in hopes that the compiler will optimize the tail-call and allocate some more stack space instead of way too much. */ @@ -171,7 +177,7 @@ __mach_msg_server_timeout (boolean_t (*demux) (mach_msg_header_t *request, case MACH_SEND_INVALID_DEST: /* The reply can't be delivered, so destroy it. This error - indicates only that the requestor went away, so we + indicates only that the requester went away, so we continue and get the next request. */ __mach_msg_destroy (&request->Head); break; |