Fix typo in recent resolver change which causes segvs

[glibc.git] / hurd / hurdstartup.c

diff --git a/hurd/hurdstartup.c b/hurd/hurdstartup.c
index 17a7705847289281f318fef0d45fc0b7b62c05d8..0c607ba3fb0950496ae88bf5070cd4cba52ba071 100644 (file)
--- a/hurd/hurdstartup.c
+++ b/hurd/hurdstartup.c
@@ -1,21 +1,21 @@
 /* Initial program startup for running under the GNU Hurd.
-Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1991,92,93,94,95,96,97,98,2002 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser 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 Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #include <errno.h>
 #include <stdlib.h>
@@ -27,23 +27,13 @@ Cambridge, MA 02139, USA.  */
 #include <hurd/threadvar.h>
 #include <unistd.h>
 #include <elf.h>
-#include "set-hooks.h"
-#include "hurdmalloc.h"                /* XXX */
+#include <set-hooks.h>
 #include "hurdstartup.h"
 #include <argz.h>
 
 mach_port_t *_hurd_init_dtable;
 mach_msg_type_number_t _hurd_init_dtablesize;
 
-unsigned int __hurd_threadvar_max;
-unsigned long int __hurd_threadvar_stack_mask;
-unsigned long int __hurd_threadvar_stack_offset;
-
-/* These are set up by _hurdsig_init.  */
-unsigned long int __hurd_sigthread_stack_base;
-unsigned long int __hurd_sigthread_stack_end;
-unsigned long int *__hurd_sigthread_variables;
-
 extern void __mach_init (void);
 
 /* Entry point.  This is the first thing in the text segment.
@@ -65,7 +55,7 @@ extern void __mach_init (void);
 
 
 void
-_hurd_startup (void **argptr, void (*main) (int *data))
+_hurd_startup (void **argptr, void (*main) (intptr_t *data))
 {
   error_t err;
   mach_port_t in_bootstrap;
@@ -74,7 +64,15 @@ _hurd_startup (void **argptr, void (*main) (int *data))
   struct hurd_startup_data data;
   char **argv, **envp;
   int argc, envc;
-  int *argcptr;
+  intptr_t *argcptr;
+  vm_address_t addr;
+
+  /* Attempt to map page zero redzoned before we receive any RPC
+     data that might get allocated there.  We can ignore errors.  */
+  addr = 0;
+  __vm_map (__mach_task_self (),
+           &addr, __vm_page_size, 0, 0, MACH_PORT_NULL, 0, 1,
+           VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
 
   if (err = __task_get_special_port (__mach_task_self (), TASK_BOOTSTRAP_PORT,
                                     &in_bootstrap))
@@ -109,7 +107,7 @@ _hurd_startup (void **argptr, void (*main) (int *data))
         Hopefully either they will be on the stack as expected, or the
         stack will be zeros so we don't crash.  */
 
-      argcptr = (int *) argptr;
+      argcptr = (intptr_t *) argptr;
       argc = argcptr[0];
       argv = (char **) &argcptr[1];
       envp = &argv[argc + 1];
@@ -131,7 +129,7 @@ _hurd_startup (void **argptr, void (*main) (int *data))
         pointers and fill them in.  We allocate the space for the
         environment pointers immediately after the argv pointers because
         the ELF ABI will expect it.  */
-      argcptr = __alloca (sizeof (int) +
+      argcptr = __alloca (sizeof (intptr_t) +
                          (argc + 1 + envc + 1) * sizeof (char *) +
                          sizeof (struct hurd_startup_data));
       *argcptr = argc;
@@ -165,7 +163,7 @@ _hurd_startup (void **argptr, void (*main) (int *data))
         hurd_startup_data'.  Move them.  */
       struct
        {
-         int count;
+         intptr_t count;
          char *argv[argc + 1];
          char *envp[envc + 1];
          struct hurd_startup_data data;