about summary refs log tree commit diff
path: root/hurd
diff options
context:
space:
mode:
Diffstat (limited to 'hurd')
-rw-r--r--hurd/fopenport.c23
-rw-r--r--hurd/get-host.c3
-rw-r--r--hurd/hurd/ioctl.h4
-rw-r--r--hurd/hurd/threadvar.h4
-rw-r--r--hurd/hurdchdir.c3
-rw-r--r--hurd/hurdmalloc.c26
-rw-r--r--hurd/vpprintf.c4
7 files changed, 47 insertions, 20 deletions
diff --git a/hurd/fopenport.c b/hurd/fopenport.c
index 7d017d8766..c123d1939d 100644
--- a/hurd/fopenport.c
+++ b/hurd/fopenport.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994,95,97,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1994,95,97,2000,01 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
@@ -62,10 +62,27 @@ writeio (void *cookie, const char *buf, size_t n)
    The current file position is stored in *POS.
    Returns zero if successful, nonzero if not.  */
 static int
-seekio (void *cookie, off_t *pos, int whence)
+seekio (void *cookie,
+#ifdef USE_IN_LIBIO
+	_IO_off64_t *pos,
+#else
+	fpos_t *pos,
+#endif
+	int whence)
 {
   off_t res;
-  error_t error = __io_seek ((file_t) cookie, *pos, whence, &res);
+  error_t error;
+
+  /* XXX We don't really support large files on the Hurd.  So if POS
+     doesn't fit in an `off_t', we'll return `-1' and set errno.  EOVERFLOW
+     probably isn't the right error value, but seems appropriate here.  */
+  if ((off_t) *pos != *pos)
+    {
+      __set_errno (EOVERFLOW);
+      return -1;
+    }
+
+  error = __io_seek ((file_t) cookie, *pos, whence, &res);
   if (error)
     return __hurd_fail (error);
   *pos = res;
diff --git a/hurd/get-host.c b/hurd/get-host.c
index 2794eec3cb..1a3516aa69 100644
--- a/hurd/get-host.c
+++ b/hurd/get-host.c
@@ -1,5 +1,5 @@
 /* Get a host configuration item kept as the whole contents of a file.
-   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996,97,99,2000,2001 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
@@ -21,6 +21,7 @@
 #include <hurd.h>
 #include <hurd/lookup.h>
 #include "hurdhost.h"
+#include <string.h>
 
 ssize_t
 _hurd_get_host_config (const char *item, char *buf, size_t buflen)
diff --git a/hurd/hurd/ioctl.h b/hurd/hurd/ioctl.h
index 1d42dcdae8..90f4d0c6e7 100644
--- a/hurd/hurd/ioctl.h
+++ b/hurd/hurd/ioctl.h
@@ -1,5 +1,5 @@
 /* User-registered handlers for specific `ioctl' requests.
-   Copyright (C) 1993,94,95,96,97,2000 Free Software Foundation, Inc.
+   Copyright (C) 1993,94,95,96,97,2000,01 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
@@ -59,7 +59,7 @@ extern int hurd_register_ioctl_handler (int first_request, int last_request,
     { _IOC_NOTYPE (first), _IOC_NOTYPE (last),				      \
 	(int (*) (int, int, void *)) (handler), NULL };	      		      \
   text_set_element (_hurd_ioctl_handler_lists,				      \
-                    ##handler##_ioctl_handler##moniker)
+                    handler##_ioctl_handler##moniker)
 #define	_HURD_HANDLE_IOCTLS(handler, first, last)			      \
   _HURD_HANDLE_IOCTLS_1 (handler, first, last, first##_to_##last)
 
diff --git a/hurd/hurd/threadvar.h b/hurd/hurd/threadvar.h
index be69f32f25..2de619c229 100644
--- a/hurd/hurd/threadvar.h
+++ b/hurd/hurd/threadvar.h
@@ -1,5 +1,5 @@
 /* Internal per-thread variables for the Hurd.
-   Copyright (C) 1994, 95, 97, 98, 99, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1994,95,97,98,99,2001 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
@@ -74,6 +74,8 @@ enum __hurd_threadvar_index
 /* Return the location of the value for the per-thread variable with index
    INDEX used by the thread whose stack pointer is SP.  */
 
+extern unsigned long int *__hurd_threadvar_location_from_sp
+  (enum __hurd_threadvar_index __index, void *__sp);
 _HURD_THREADVAR_H_EXTERN_INLINE unsigned long int *
 __hurd_threadvar_location_from_sp (enum __hurd_threadvar_index __index,
 				   void *__sp)
diff --git a/hurd/hurdchdir.c b/hurd/hurdchdir.c
index ce839a102f..9cb7aa2d3a 100644
--- a/hurd/hurdchdir.c
+++ b/hurd/hurdchdir.c
@@ -1,5 +1,5 @@
 /* Change a port cell to a directory by looking up a name.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 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
@@ -23,6 +23,7 @@
 #include <hurd/port.h>
 #include <hurd/fd.h>
 #include <fcntl.h>
+#include <string.h>
 
 int
 _hurd_change_directory_port_from_name (struct hurd_port *portcell,
diff --git a/hurd/hurdmalloc.c b/hurd/hurdmalloc.c
index cabcdcf0da..25bf876aa2 100644
--- a/hurd/hurdmalloc.c
+++ b/hurd/hurdmalloc.c
@@ -9,34 +9,40 @@
 #define vm_allocate __vm_allocate
 #define vm_page_size __vm_page_size
 
-/* 
+/*
  * 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 "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.14  2001/04/01 05:03:14  roland
+ * 2001-03-11  Roland McGrath  <roland@frob.com>
+ *
+ * 	* mach/mach_error.h: Fix ancient #endif syntax.
+ * 	* hurd/hurdmalloc.c: Likewise.
+ *
  * Revision 1.13  1996/12/20 01:32:01  drepper
  * Update from main archive 961219
  *
@@ -178,7 +184,7 @@ typedef struct free_list {
 	header_t head;		/* head of free list for this size */
 #ifdef	DEBUG
 	int in_use;		/* # mallocs - # frees */
-#endif	DEBUG
+#endif	/* DEBUG */
 } *free_list_t;
 
 /*
@@ -301,7 +307,7 @@ malloc(size)
 
 #ifdef	DEBUG
 	fl->in_use += 1;
-#endif	DEBUG
+#endif	/* DEBUG */
 	spin_unlock(&fl->lock);
 	/*
 	 * Store free list pointer in block header
@@ -359,7 +365,7 @@ free(base)
 	fl->head = h;
 #ifdef	DEBUG
 	fl->in_use -= 1;
-#endif	DEBUG
+#endif	/* DEBUG */
 	spin_unlock(&fl->lock);
 	return;
 }
@@ -455,7 +461,7 @@ print_malloc_free_list()
   	fprintf(stderr, " all sizes %10d %10d %10d\n",
 		total_used, total_free, total_used + total_free);
 }
-#endif	DEBUG
+#endif	/* DEBUG */
 
 static void
 malloc_fork_prepare(void)
diff --git a/hurd/vpprintf.c b/hurd/vpprintf.c
index 6a138a783c..a523a89cde 100644
--- a/hurd/vpprintf.c
+++ b/hurd/vpprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,94,97,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,94,97,2000,01 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
@@ -58,7 +58,7 @@ vpprintf (io_t port, const char *format, va_list arg)
   _IO_cookie_init (&temp_f.cfile, _IO_NO_READS,
 		   (void *) port, (cookie_io_functions_t) { write: do_write });
 
-  done = _IO_vfprintf (&temp_f.cfile.__fp, format, arg);
+  done = _IO_vfprintf (&temp_f.cfile.__fp.file, format, arg);
 
 #else
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-18 08:37:30 +0000