diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-09-26 07:56:19 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-09-26 07:56:19 +0000 |
| commit | 316ca440b070114ba877455c3dbbcdc1b20e4f33 (patch) | |
| tree | 4224faacba4731e0b405a79552dde36c31e3eeea /sysdeps | |
| parent | e5448d7ad2c39a6784894e8e840514b0d88333bc (diff) | |
| download | glibc-316ca440b070114ba877455c3dbbcdc1b20e4f33.tar.gz glibc-316ca440b070114ba877455c3dbbcdc1b20e4f33.tar.xz glibc-316ca440b070114ba877455c3dbbcdc1b20e4f33.zip | |
Update.
* misc/daemon.c (daemon): Fail if !noclose and we cannot open the real /dev/null device. * sysdeps/generic/check_fds.c: Include device-nrs.h. * sysdeps/generic/device-nrs.h: New file. * sysdeps/unix/sysv/linux/device-nrs.h: New file. * misc/Makefile (distribute): Add device-nrs.h. * posix/wordexp.c (exec_comm_child): Likewise. * locale/nl_langinfo.c: Allow use of file for __nl_langinfo_l definition.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/check_fds.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/device-nrs.h | 25 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/device-nrs.h (renamed from sysdeps/unix/sysv/linux/check_fds.c) | 9 |
3 files changed, 34 insertions, 2 deletions
diff --git a/sysdeps/generic/check_fds.c b/sysdeps/generic/check_fds.c index 9891b9c865..9e96937483 100644 --- a/sysdeps/generic/check_fds.c +++ b/sysdeps/generic/check_fds.c @@ -31,6 +31,8 @@ # define ABORT_INSTRUCTION #endif +#include <device-nrs.h> + /* Should other OSes (e.g., Hurd) have different versions which can be written in a better way? */ diff --git a/sysdeps/generic/device-nrs.h b/sysdeps/generic/device-nrs.h new file mode 100644 index 0000000000..e13d35f9f2 --- /dev/null +++ b/sysdeps/generic/device-nrs.h @@ -0,0 +1,25 @@ +/* Device numbers of devices used in the implementation. Generic version. + Copyright (C) 2000 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. */ + +#ifndef _DEVICE_NRS_H +#define _DEVICE_NRS_H 1 + +/* By default we know no device numbers. */ + +#endif /* device-nrs.h */ diff --git a/sysdeps/unix/sysv/linux/check_fds.c b/sysdeps/unix/sysv/linux/device-nrs.h index a36a1d8f6d..6d1be9dc0f 100644 --- a/sysdeps/unix/sysv/linux/check_fds.c +++ b/sysdeps/unix/sysv/linux/device-nrs.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Device numbers of devices used in the implementation. Linux version. + Copyright (C) 2000 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 @@ -16,7 +17,11 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _DEVICE_NRS_H +#define _DEVICE_NRS_H 1 + +/* /dev/null is (1,3). */ #define DEV_NULL_MAJOR 1 #define DEV_NULL_MINOR 3 -#include <sysdeps/generic/check_fds.c> +#endif /* device-nrs.h */ |