From 5fbef188648f5150617e0a14f1011e600f1b3a0f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 16 Jun 1996 03:49:40 +0000 Subject: * hurd/Makefile (routines): Add get-host, set-host. (distribute): Add hurdhost.h. * hurd/hurdhost.h: New file. * sysdeps/mach/hurd/gethostname.c: Use _hurd_get_host_config. * sysdeps/mach/hurd/gethostid.c: Likewise. * sysdeps/mach/hurd/sethostname.c: Use _hurd_set_host_config. * sysdeps/mach/hurd/sethostid.c: Likewise. * hurd/get-host.c: New file. * hurd/set-host.c: New file. * math/Makefile (headers): Add fpu_control.h. (aux): New variable, list fpu_control and setfpucw. * sysdeps/generic/fpu_control.c: New file. * sysdeps/stub/fpu_control.h: New file. * sysdeps/unix/sysv/linux/m68k/fpu_control.h: Moved to ... * sysdeps/m68k/fpu_control.h: here. * sysdeps/unix/sysv/linux/i386/fpu_control.h: Moved to ... * sysdeps/i386/fpu_control.h: here. * sysdeps/unix/sysv/linux/alpha/fpu_control.h: Moved to ... * sysdeps/alpha/fpu/fpu_control.h: here. Fixed copyright. * sysdeps/unix/sysv/linux/alpha/Makefile (sysdep_routines): Remove setfpucw, fpu_control. * sysdeps/unix/sysv/linux/alpha/fpu_control.c: File removed. * sysdeps/unix/sysv/linux/setfpucw.c: Moved to ... * sysdeps/generic/setfpucw.c: here. (__fpu_control): Variable removed. (__setfpucw): Use SET even if zero. --- hurd/Makefile | 4 +++- hurd/get-host.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hurd/hurdhost.h | 28 ++++++++++++++++++++++++++++ hurd/set-host.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 hurd/get-host.c create mode 100644 hurd/hurdhost.h create mode 100644 hurd/set-host.c (limited to 'hurd') diff --git a/hurd/Makefile b/hurd/Makefile index 4f1f22c7c8..1484ad5a06 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -40,6 +40,7 @@ server-interfaces := hurd/msg faultexc routines = hurdstartup hurdinit \ hurdid hurdlookup hurdpid hurdrlimit hurdprio hurdexec \ + get-host set-host \ path-lookup \ setauth \ pid2task task2pid \ @@ -57,7 +58,8 @@ sig = hurdsig hurdfault siginfo hurd-raise preempt-sig \ dtable = dtable port2fd new-fd alloc-fd intern-fd \ getdport openport \ fd-close fd-read fd-write hurdioctl ctty-input ctty-output -distribute = hurdstartup.h hurdfault.h faultexc.defs intr-rpc.defs intr-rpc.h +distribute = hurdstartup.h hurdfault.h hurdhost.h \ + faultexc.defs intr-rpc.defs intr-rpc.h # XXX this is a temporary hack; see hurdmalloc.h routines += hurdmalloc diff --git a/hurd/get-host.c b/hurd/get-host.c new file mode 100644 index 0000000000..231ee59d88 --- /dev/null +++ b/hurd/get-host.c @@ -0,0 +1,57 @@ +/* Get a host configuration item kept as the whole contents of a file. +Copyright (C) 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 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. */ + +#include +#include "hurdhost.h" + +ssize_t +_hurd_get_host_config (const char *item, char *buf, size_t buflen) +{ + error_t err; + char *data; + mach_msg_type_number_t nread, more; + file_t config = __file_name_lookup (item, O_RDONLY, 0); + if (config == MACH_PORT_NULL) + return -1; + + data = buf; + err = __io_read (config, &data, &nread, -1, buflen); + if (! err) + /* Check if there is more in the file we didn't read. */ + err = __io_readable (config, &more); + __mach_port_deallocate (__mach_task_self (), config); + if (err) + return __hurd_fail (err); + if (data != buf) + { + memcpy (buf, data, nread); + __vm_deallocate (__mach_task_self (), (vm_address_t) data, nread); + } + + /* Remove newlines in case someone wrote the file by hand. */ + while (buf[nread - 1] == '\n') + buf[--nread] = '\0'; + + if (more) + /* If we didn't read the whole file, tell the caller to use a bigger + buffer next time. */ + return __hurd_fail (ENAMETOOLONG); + + return nread; +} diff --git a/hurd/hurdhost.h b/hurd/hurdhost.h new file mode 100644 index 0000000000..7a826ebbbd --- /dev/null +++ b/hurd/hurdhost.h @@ -0,0 +1,28 @@ +/* Host configuration items kept as the whole contents of a file. +Copyright (C) 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 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. */ + +/* Fetch and atomically store the contents of the file ITEM. + Returns the size read or written, or -1 for errors. + If BUFLEN is not big enough to contain the whole contents, + BUFLEN bytes of BUF are filled in and we fail with ENAMETOOLONG. */ + +ssize_t _hurd_get_host_config (const char *item, + char *buf, size_t buflen); +ssize_t _hurd_set_host_config (const char *item, + const char *value, size_t valuelen); diff --git a/hurd/set-host.c b/hurd/set-host.c new file mode 100644 index 0000000000..e9af697226 --- /dev/null +++ b/hurd/set-host.c @@ -0,0 +1,48 @@ +/* Set a host configuration item kept as the whole contents of a file. +Copyright (C) 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 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. */ + +#include +#include "hurdhost.h" + +ssize_t +_hurd_set_host_config (const char *item, const char *value, size_t valuelen) +{ + error_t err; + mach_msg_type_number_t nwrote; + file_t new, dir; + + dir = __file_name_split (item, &item); + if (dir == MACH_PORT_NULL) + return -1; + + /* Create a new node. */ + err = __dir_mkfile (dir, O_CREAT|O_TRUNC, 0600, &new); + if (! err) + { + /* Write the contents. */ + err = __io_write (new, value, valuelen, 0, &nwrote); + if (! err) + /* Atomically link the new node onto the name. */ + err = __dir_link (dir, item, 0); + __mach_port_deallocate (__mach_task_self (), new); + } + __mach_port_deallocate (__mach_task_self (), dir); + + return nread; +} -- cgit v1.2.3