diff options
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/Makefile | 6 | ||||
| -rw-r--r-- | sysdeps/generic/_strerror.c | 10 | ||||
| -rw-r--r-- | sysdeps/generic/paths.h | 71 |
3 files changed, 82 insertions, 5 deletions
diff --git a/sysdeps/generic/Makefile b/sysdeps/generic/Makefile index f160dc8892..5e0f03abcc 100644 --- a/sysdeps/generic/Makefile +++ b/sysdeps/generic/Makefile @@ -32,8 +32,8 @@ common-generated := $(common-generated) bytesex.h det_endian endif ifeq ($(subdir),stdio-common) - -ifeq "$(filter $(objpfx)siglist.c,$(before-compile))" "" +ifneq ($(inhibit-siglist),yes) +ifeq "$(filter %siglist.c,$(before-compile))" "" before-compile := $(before-compile) $(objpfx)siglist.c $(objpfx)siglist.c: $(objpfx)make_siglist @rm -f $@ @@ -49,5 +49,5 @@ $(objpfx)make_siglist: $(sysdep_dir)/generic/make_siglist.c generated := $(generated) make_siglist siglist.c endif - +endif endif diff --git a/sysdeps/generic/_strerror.c b/sysdeps/generic/_strerror.c index 8067f3fd06..45fc8cab59 100644 --- a/sysdeps/generic/_strerror.c +++ b/sysdeps/generic/_strerror.c @@ -16,6 +16,7 @@ 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 <libintl.h> #include <stdio.h> #include <string.h> #include "../stdio-common/_itoa.h" @@ -25,6 +26,9 @@ Cambridge, MA 02139, USA. */ #define _sys_nerr sys_nerr #endif +/* Set if startup process finished. */ +extern int _dl_starting_up; + /* Return a string describing the errno code in ERRNUM. */ char * _strerror_internal (int errnum, @@ -33,7 +37,8 @@ _strerror_internal (int errnum, { if (errnum < 0 || errnum >= _sys_nerr) { - const char *unk = _("Unknown error "); + static const char unk_orig[] = N_("Unknown error "); + const char *unk = _dl_starting_up ? unk_orig : _(unk_orig); const size_t unklen = strlen (unk); char *p = buf + buflen; *--p = '\0'; @@ -41,5 +46,6 @@ _strerror_internal (int errnum, return memcpy (p - unklen, unk, unklen); } - return (char *) _(_sys_errlist[errnum]); + return (char *) (_dl_starting_up ? _sys_errlist[errnum] + : _(_sys_errlist[errnum])); } diff --git a/sysdeps/generic/paths.h b/sysdeps/generic/paths.h new file mode 100644 index 0000000000..760ae7cfe0 --- /dev/null +++ b/sysdeps/generic/paths.h @@ -0,0 +1,71 @@ +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)paths.h 8.1 (Berkeley) 6/2/93 + */ + +#ifndef _PATHS_H_ +#define _PATHS_H_ + +/* Default search path. */ +#define _PATH_DEFPATH "/usr/bin:/bin" +/* All standard utilities path. */ +#define _PATH_STDPATH \ + "/usr/bin:/bin:/usr/sbin:/sbin:/usr/contrib/bin:/usr/old/bin" + +#define _PATH_BSHELL "/bin/sh" +#define _PATH_CONSOLE "/dev/console" +#define _PATH_CSHELL "/bin/csh" +#define _PATH_DEVDB "/var/run/dev.db" +#define _PATH_DEVNULL "/dev/null" +#define _PATH_DRUM "/dev/drum" +#define _PATH_KMEM "/dev/kmem" +#define _PATH_MAILDIR "/var/mail" +#define _PATH_MAN "/usr/man" +#define _PATH_MEM "/dev/mem" +#define _PATH_MNTTAB "/etc/fstab" +#define _PATH_MOUNTED "/var/run/mtab" +#define _PATH_NOLOGIN "/etc/nologin" +#define _PATH_SENDMAIL "/usr/sbin/sendmail" +#define _PATH_SHELLS "/etc/shells" +#define _PATH_TTY "/dev/tty" +#define _PATH_UNIX "/vmunix" +#define _PATH_VI "/usr/bin/vi" + +/* Provide trailing slash, since mostly used for building pathnames. */ +#define _PATH_DEV "/dev/" +#define _PATH_TMP "/tmp/" +#define _PATH_VARDB "/var/db/" +#define _PATH_VARRUN "/var/run/" +#define _PATH_VARTMP "/var/tmp/" + +#endif /* !_PATHS_H_ */ |