about summary refs log tree commit diff
path: root/sysdeps/mach/hurd
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-07-16 06:38:54 +0000
committerRoland McGrath <roland@gnu.org>1996-07-16 06:38:54 +0000
commitec42724d6970b2d3e9007de0841394856e84d287 (patch)
tree764952d3965d32f0d4e6fda3f97b40dcb1e6ef61 /sysdeps/mach/hurd
parented36809a9c00966422a003d239a6ce64e5f08caa (diff)
downloadglibc-ec42724d6970b2d3e9007de0841394856e84d287.tar.gz
glibc-ec42724d6970b2d3e9007de0841394856e84d287.tar.xz
glibc-ec42724d6970b2d3e9007de0841394856e84d287.zip
Tue Jul 16 00:31:31 1996 Richard Henderson <rth@tamu.edu> cvs/libc-960716
	* sysdeps/alpha/dl-machine.h: Mirror Roland's changes to
	i386/dl-machine.h of 960713.

	* sysdeps/generic/dl-sysdep.c:  Include <sys/mman.h>.
	(_dl_sysdep_read_whole_file): Fix result variable declaration.

Tue Jul 16 00:53:57 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

	* sysdeps/mach/hurd/uname.c: Call __gethostname to fill in the
	`nodename' member.

Mon Jul 15 17:23:53 1996  Ulrich Drepper  <drepper@cygnus.com>

	* stdio-common/vfprintf.c (vfprintf): Call parse_one_spec
	with pointer to local variable instead of NULL.

1996-07-15  Paul Eggert  <eggert@twinsun.com>

	* time/strftime.c (strftime): Don't pass empty macro argument to `add'.

Sat Jul 13 09:53:39 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Remove names
	that are already added by other means.

	* sysdeps/unix/sysv/linux/syscalls.list: Add more EXTRA's in the
	caller column to get those syscalls added automagically.

	* elf/rtld.c (dl_main) [ELF_MACHINE_DEBUG_SETUP]: Use this macro
	instead of setting the DT_DEBUG pointer.

	* csu/initfini.c (_init, _fini): Generate .end directives after
	standalone prologues and filter them out from epilogues.
Diffstat (limited to 'sysdeps/mach/hurd')
-rw-r--r--sysdeps/mach/hurd/uname.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/uname.c b/sysdeps/mach/hurd/uname.c
index 74d9d3799f..5fac305522 100644
--- a/sysdeps/mach/hurd/uname.c
+++ b/sysdeps/mach/hurd/uname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1993, 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
@@ -25,7 +25,20 @@ uname (struct utsname *uname)
 {
   error_t err;
 
-  err = __USEPORT (PROC, __proc_uname (port, uname));
+  if (err = __USEPORT (PROC, __proc_uname (port, uname)))
+    return __hurd_fail (err);
 
-  return err ? __hurd_fail (err) : 0;
+  /* Fill in the hostname, which the proc server doesn't know.  */
+  err = errno;
+  if (__gethostname (uname.nodename, sizeof uname.nodename) < 0)
+    {
+      if (errno == ENAMETOOLONG)
+	/* Ignore the error of the buffer being too small.
+	   It is of fixed size, nothing to do about it.  */
+	errno = err;
+      else
+	return -1;
+    }
+
+  return 0;
 }