8a0746ae74
options after $(build-module), which is no longer a single command.
(LDFLAGS-link-rpcuserlibs): New variable to hold those options.
(LDFLAGS-libmachuser-link.so, LDFLAGS-libhurduser-link.so): New
variables using it. Reported by Mark Kettenis <kettenis@gnu.org>.
2001-03-11 Roland McGrath <roland@frob.com>
* elf/rtld.c (dl_main): Add cast to quiet warning.
* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
* iconv/gconv_conf.c (__gconv_get_path): Likewise.
(__gconv_read_conf): Likewise.
* iconv/gconv_db.c (gen_steps): Likewise.
(__gconv_find_transform): Likewise.
* locale/programs/charmap-dir.c (fopen_uncompressed): Likewise.
(fopen_uncompressed): Use const in second argument's type.
2001-03-11 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/dl-sysdep.c (__writev): New function.
* mach/mach_error.h: Fix ancient #endif syntax.
* hurd/hurdmalloc.c: Likewise.
* sysdeps/generic/atomicity.h (exchange_and_add, atomic_add,
compare_and_swap): Add volatile qualifier to first arg, to bring
these prototypes in line with all the other implementations.
Add a #warning to remind the builder that these are not atomic.
2001-03-04 Roland McGrath <roland@frob.com>
* hurd/vpprintf.c (vpprintf) [USE_IN_LIBIO]: Use innermore first
member of TEMP_F so its type is _IO_FILE * as expected.
* hurd/fopenport.c (seekio): Conditionalize type of POS argument
on [USE_IN_LIBIO]. Check the value for overflow, since for libio
it might exceed off_t's range.
2001-02-25 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/sysd-stdio.c (__stdio_reopen): Use prototype.
* sysdeps/unix/bsd/getpt.c (__posix_openpt): Likewise.
* sysdeps/mach/hurd/i386/intr-msg.h (SYSCALL_EXAMINE): Make this a
macro instead of an inline function,
(MSG_EXAMINE): Likewise.
* hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS_1): Remove extraneous ##.
* hurd/get-host.c: Include <string.h> for decls of built-ins.
* hurd/hurdchdir.c: Likewise.
* sysdeps/mach/hurd/i386/sigreturn.c: Likweise.
* sysdeps/mach/hurd/opendir.c: Likewise.
* mach/mach_init.c: Include <unistd.h> for _exit decl.
* mach/errsystems.awk: Give output file a trailing newline.
* mach/Machrules (MIG): Prepend CC='${CC}' to the mig command, so that
the script will use our compiler for the cpp stage.
With --enable-all-warnings we get a whole bunch of warnings,
and these are just a few fixes; there are more needed to silence it.
* mach/mach/mig_support.h (__mig_strncpy, mig_strncpy): Add extern
decls before extern inline defns to quiet gcc warning.
* hurd/hurd/threadvar.h (__hurd_threadvar_location_from_sp): Likewise.
* sysdeps/mach/i386/machine-sp.h (__thread_stack_pointer): Likewise.
93 lines
2.7 KiB
C
93 lines
2.7 KiB
C
/* Get a host configuration item kept as the whole contents of a file.
|
|
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
|
|
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., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <fcntl.h>
|
|
#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)
|
|
{
|
|
error_t err;
|
|
char *data;
|
|
mach_msg_type_number_t nread, more;
|
|
file_t config;
|
|
|
|
err = __hurd_file_name_lookup (&_hurd_ports_use, &__getdport, 0,
|
|
item, O_RDONLY, 0, &config);
|
|
switch (err)
|
|
{
|
|
case 0: /* Success; read file contents below. */
|
|
break;
|
|
|
|
case ENOENT: /* ? Others? All errors? */
|
|
/* The file does not exist, so no value has been set. Rather than
|
|
causing gethostname et al to fail with ENOENT, give an empty value
|
|
as other systems do before sethostname has been called. */
|
|
if (buflen != 0)
|
|
*buf = '\0';
|
|
return 0;
|
|
|
|
default:
|
|
return __hurd_fail (err);
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
/* If the file is empty, give an empty value. */
|
|
if (nread == 0)
|
|
{
|
|
if (buflen != 0)
|
|
*buf = '\0';
|
|
return 0;
|
|
}
|
|
|
|
/* Remove newlines in case someone wrote the file by hand. */
|
|
while (nread > 0 && buf[nread - 1] == '\n')
|
|
buf[--nread] = '\0';
|
|
|
|
/* Null-terminate the result if there is enough space. */
|
|
if (nread < buflen)
|
|
buf[nread] = '\0';
|
|
else
|
|
if (buf[nread - 1] != '\0')
|
|
more = 1;
|
|
|
|
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;
|
|
}
|