summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog61
-rw-r--r--elf/dl-open.c4
-rw-r--r--elf/dl-profile.c2
-rw-r--r--elf/sprof.c22
-rw-r--r--iconvdata/Makefile5
-rw-r--r--iconvdata/gconv-modules14
-rw-r--r--iconvdata/ibm1160.c29
-rw-r--r--iconvdata/ibm1160.h145
-rw-r--r--iconvdata/ibm1161.c29
-rw-r--r--iconvdata/ibm1161.h134
-rw-r--r--include/dlfcn.h1
-rw-r--r--nss/getent.c186
-rw-r--r--nss/nss_files/files-network.c32
-rw-r--r--sysdeps/alpha/dl-machine.h16
-rw-r--r--sysdeps/s390/s390-32/bits/setjmp.h2
-rw-r--r--sysdeps/s390/s390-64/bits/setjmp.h2
-rw-r--r--sysdeps/unix/sysv/aix/libc-start.c297
17 files changed, 861 insertions, 120 deletions
diff --git a/ChangeLog b/ChangeLog
index f9d76a9c97..bf3bc784e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+2001-09-20 H.J. Lu <hjl@gnu.org>
+
+ * include/dlfcn.h (__RTLD_SPROF): New definiton.
+ * elf/dl-open.c (dl_open_worker): Return immediately after loading
+ for __RTLD_SPROF.
+ * elf/sprof.c (main): Default to the filename if soname doesn't exist.
+ (load_shobj): Call dlopen with `RTLD_LAZY | __RTLD_SPROF.
+
+2001-09-20 H.J. Lu <hjl@gnu.org>
+
+ * elf/dl-profile.c (_dl_mcount): Use old *narcsp value for newarc,
+ don't add 1.
+
+2001-09-22 Ulrich Drepper <drepper@redhat.com>
+
+ * nss/getent.c: Accept -s parameter to overwrite rules in
+ nsswitch.conf. Patch by Nalin Dahyabhai <nalin@redhat.com>.
+
+ * nss/nss_files/files-network.c (LINE_PARSER): Pad addr string
+ with as many ".0" as necessary to form a complete address
+ inet_network understands.
+
+ * nss/getent.c: Various cleanups. Use simpler and fewer function
+ calls.
+
+2001-09-20 Martin Schwidefsky <schwidefsky@de.ibm.com>
+
+ * sysdeps/s390/s390-32/bits/setjmp.h: Correct pointer comparison in
+ _JMPBUF_UNWINDS.
+ * sysdeps/s390/s390-64/bits/setjmp.h: Likewise.
+
+2001-09-22 Ulrich Drepper <drepper@redhat.com>
+
+ * iconvdata/Makefile: Add rules to build and distribute IBM1160 and
+ IBM1161.
+ * iconvdata/gconv-modules: Add entries for IBM1160 and IBM1161.
+ * iconvdata/ibm1160.c: New file.
+ * iconvdata/ibm1160.h: New file.
+ * iconvdata/ibm1161.c: New file.
+ * iconvdata/ibm1161.h: New file.
+
+2001-09-19 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/alpha/dl-machine.h (elf_machine_load_address): Compute the
+ difference between base address and first PT_LOAD's virtual address,
+ not the base address.
+
+2001-09-11 Tom Rix <trix@redhat.com>
+
+ * sysdeps/unix/sysv/aix/init-first.c (init): Use USE_NONONPTION_FLAG
+ ifdef for __getopt_clean_environment.
+ * sysdeps/unix/sysv/aix/libc-start.c: Add real implementation.
+
2001-09-22 Andreas Jaeger <aj@suse.de>
* elf/reldep4.c (main): Add proper prototype to fix warning.
@@ -8,11 +61,9 @@
2001-09-21 Andreas Jaeger <aj@suse.de>
- * sysdeps/unix/sysv/linux/x86_64/Dist: New.
-
- * sysdeps/x86_64/Dist: New.
-
- * sysdeps/x86_64/soft-fp/Dist: New.
+ * sysdeps/unix/sysv/linux/x86_64/Dist: New file.
+ * sysdeps/x86_64/Dist: New file.
+ * sysdeps/x86_64/soft-fp/Dist: New file.
* sysdeps/gnu/Dist: Remove eval.c.
diff --git a/elf/dl-open.c b/elf/dl-open.c
index d10ab8ac65..6d07e445d9 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -225,6 +225,10 @@ dl_open_worker (void *a)
return;
}
+ if (__builtin_expect (mode & __RTLD_SPROF, 0))
+ /* This happens only if we load a DSO for 'sprof'. */
+ return;
+
/* It was already open. */
if (new->l_searchlist.r_list != NULL)
{
diff --git a/elf/dl-profile.c b/elf/dl-profile.c
index a29347a369..3165517914 100644
--- a/elf/dl-profile.c
+++ b/elf/dl-profile.c
@@ -507,7 +507,7 @@ _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
/* If we still have no entry stop searching and insert. */
if (*topcindex == 0)
{
- uint_fast32_t newarc = 1 + exchange_and_add (narcsp, 1);
+ uint_fast32_t newarc = exchange_and_add (narcsp, 1);
/* In rare cases it could happen that all entries in FROMS are
occupied. So we cannot count this anymore. */
diff --git a/elf/sprof.c b/elf/sprof.c
index 37472ab516..ea334f3472 100644
--- a/elf/sprof.c
+++ b/elf/sprof.c
@@ -264,19 +264,13 @@ main (int argc, char *argv[])
if (profdata == NULL)
{
char *newp;
+ const char *soname;
+ size_t soname_len;
- if (shobj_handle->soname == NULL)
- {
- unload_shobj (shobj_handle);
-
- error (EXIT_FAILURE, 0, _("\
-no filename for profiling data given and shared object `%s' has no soname"),
- shobj);
- }
-
- newp = (char *) alloca (strlen (shobj_handle->soname)
- + sizeof ".profile");
- stpcpy (stpcpy (newp, shobj_handle->soname), ".profile");
+ soname = shobj_handle->soname ?: basename (shobj);
+ soname_len = strlen (soname);
+ newp = (char *) alloca (soname_len + sizeof ".profile");
+ stpcpy (mempcpy (newp, soname, soname_len), ".profile");
profdata = newp;
}
@@ -394,11 +388,11 @@ load_shobj (const char *name)
char *load_name = (char *) alloca (strlen (name) + 3);
stpcpy (stpcpy (load_name, "./"), name);
- map = (struct link_map *) dlopen (load_name, RTLD_LAZY);
+ map = (struct link_map *) dlopen (load_name, RTLD_LAZY | __RTLD_SPROF);
}
if (map == NULL)
{
- map = (struct link_map *) dlopen (name, RTLD_LAZY);
+ map = (struct link_map *) dlopen (name, RTLD_LAZY | __RTLD_SPROF);
if (map == NULL)
{
error (0, errno, _("failed to load shared object `%s'"), name);
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index fe4a7508fa..86441df1b9 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -48,7 +48,8 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
SAMI-WS2 ISO-IR-197 TIS-620 KOI8-U GBK ISIRI-3342 GBGBK \
ISO-2022-CN libISOIR165 UTF-16 UNICODE UTF-32 UTF-7 BIG5HKSCS \
GB18030 ISO-2022-CN-EXT VISCII GBBIG5 CP10007 KOI8-T \
- GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI
+ GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI IBM1160 \
+ IBM1161
modules.so := $(addsuffix .so, $(modules))
@@ -140,7 +141,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk \
iso-ir-165.c iso-ir-165.h gb18030.c iso-2022-cn-ext.c \
ibm932.c ibm932.h ibm943.c ibm943.h gbbig5.c cp10007.c \
koi8-t.c georgian-ps.c georgian-academy.c iso-ir-209.c \
- mac-sami.c
+ mac-sami.c ibm1160.c ibm1160.h ibm1161.c ibm1161.h
# We build the transformation modules only when we build shared libs.
ifeq (yes,$(build-shared))
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 5951574c1d..fbc565e4e8 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1010,6 +1010,20 @@ module IBM1129// INTERNAL IBM1129 1
module INTERNAL IBM1129// IBM1129 1
# from to module cost
+alias IBM-1160// IBM1160//
+alias CP1160// IBM1160//
+alias CSIBM1160// IBM1160//
+module IBM1160// INTERNAL IBM1160 1
+module INTERNAL IBM1160// IBM1160 1
+
+# from to module cost
+alias IBM-1161// IBM1161//
+alias CP1161// IBM1161//
+alias CSIBM1161// IBM1161//
+module IBM1161// INTERNAL IBM1161 1
+module INTERNAL IBM1161// IBM1161 1
+
+# from to module cost
alias EUCKR// EUC-KR//
alias CSEUCKR// EUC-KR//
alias OSF0004000a// EUC-KR//
diff --git a/iconvdata/ibm1160.c b/iconvdata/ibm1160.c
new file mode 100644
index 0000000000..4ca73cccfe
--- /dev/null
+++ b/iconvdata/ibm1160.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1160.
+ Copyright (C) 2001 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <stdint.h>
+
+/* Get the conversion table. */
+#define TABLES <ibm1160.h>
+
+#define CHARSET_NAME "IBM1160//"
+#define HAS_HOLES 0 /* All 256 character are defined. */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1160.h b/iconvdata/ibm1160.h
new file mode 100644
index 0000000000..700ad84776
--- /dev/null
+++ b/iconvdata/ibm1160.h
@@ -0,0 +1,145 @@
+/* Mapping table for IBM1160.
+ Copyright (C) 2001 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+static const uint32_t to_ucs4[256] =
+{
+ [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+ [0x04] = 0x009c, [0x05] = 0x0009, [0x06] = 0x0086, [0x07] = 0x007f,
+ [0x08] = 0x0097, [0x09] = 0x008d, [0x0a] = 0x008e, [0x0b] = 0x000b,
+ [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+ [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+ [0x14] = 0x009d, [0x15] = 0x0085, [0x16] = 0x0008, [0x17] = 0x0087,
+ [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x0092, [0x1b] = 0x008f,
+ [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+ [0x20] = 0x0080, [0x21] = 0x0081, [0x22] = 0x0082, [0x23] = 0x0083,
+ [0x24] = 0x0084, [0x25] = 0x000a, [0x26] = 0x0017, [0x27] = 0x001b,
+ [0x28] = 0x0088, [0x29] = 0x0089, [0x2a] = 0x008a, [0x2b] = 0x008b,
+ [0x2c] = 0x008c, [0x2d] = 0x0005, [0x2e] = 0x0006, [0x2f] = 0x0007,
+ [0x30] = 0x0090, [0x31] = 0x0091, [0x32] = 0x0016, [0x33] = 0x0093,
+ [0x34] = 0x0094, [0x35] = 0x0095, [0x36] = 0x0096, [0x37] = 0x0004,
+ [0x38] = 0x0098, [0x39] = 0x0099, [0x3a] = 0x009a, [0x3b] = 0x009b,
+ [0x3c] = 0x0014, [0x3d] = 0x0015, [0x3e] = 0x009e, [0x3f] = 0x001a,
+ [0x40] = 0x0020, [0x41] = 0x00a0, [0x42] = 0x0e01, [0x43] = 0x0e02,
+ [0x44] = 0x0e03, [0x45] = 0x0e04, [0x46] = 0x0e05, [0x47] = 0x0e06,
+ [0x48] = 0x0e07, [0x49] = 0x005b, [0x4a] = 0x00a2, [0x4b] = 0x002e,
+ [0x4c] = 0x003c, [0x4d] = 0x0028, [0x4e] = 0x002b, [0x4f] = 0x007c,
+ [0x50] = 0x0026, [0x51] = 0x0e48, [0x52] = 0x0e08, [0x53] = 0x0e09,
+ [0x54] = 0x0e0a, [0x55] = 0x0e0b, [0x56] = 0x0e0c, [0x57] = 0x0e0d,
+ [0x58] = 0x0e0e, [0x59] = 0x005d, [0x5a] = 0x0021, [0x5b] = 0x0024,
+ [0x5c] = 0x002a, [0x5d] = 0x0029, [0x5e] = 0x003b, [0x5f] = 0x00ac,
+ [0x60] = 0x002d, [0x61] = 0x002f, [0x62] = 0x0e0f, [0x63] = 0x0e10,
+ [0x64] = 0x0e11, [0x65] = 0x0e12, [0x66] = 0x0e13, [0x67] = 0x0e14,
+ [0x68] = 0x0e15, [0x69] = 0x005e, [0x6a] = 0x00a6, [0x6b] = 0x002c,
+ [0x6c] = 0x0025, [0x6d] = 0x005f, [0x6e] = 0x003e, [0x6f] = 0x003f,
+ [0x70] = 0x0e3f, [0x71] = 0x0e4e, [0x72] = 0x0e16, [0x73] = 0x0e17,
+ [0x74] = 0x0e18, [0x75] = 0x0e19, [0x76] = 0x0e1a, [0x77] = 0x0e1b,
+ [0x78] = 0x0e1c, [0x79] = 0x0060, [0x7a] = 0x003a, [0x7b] = 0x0023,
+ [0x7c] = 0x0040, [0x7d] = 0x0027, [0x7e] = 0x003d, [0x7f] = 0x0022,
+ [0x80] = 0x0e4f, [0x81] = 0x0061, [0x82] = 0x0062, [0x83] = 0x0063,
+ [0x84] = 0x0064, [0x85] = 0x0065, [0x86] = 0x0066, [0x87] = 0x0067,
+ [0x88] = 0x0068, [0x89] = 0x0069, [0x8a] = 0x0e1d, [0x8b] = 0x0e1e,
+ [0x8c] = 0x0e1f, [0x8d] = 0x0e20, [0x8e] = 0x0e21, [0x8f] = 0x0e22,
+ [0x90] = 0x0e5a, [0x91] = 0x006a, [0x92] = 0x006b, [0x93] = 0x006c,
+ [0x94] = 0x006d, [0x95] = 0x006e, [0x96] = 0x006f, [0x97] = 0x0070,
+ [0x98] = 0x0071, [0x99] = 0x0072, [0x9a] = 0x0e23, [0x9b] = 0x0e24,
+ [0x9c] = 0x0e25, [0x9d] = 0x0e26, [0x9e] = 0x0e27, [0x9f] = 0x0e28,
+ [0xa0] = 0x0e5b, [0xa1] = 0x007e, [0xa2] = 0x0073, [0xa3] = 0x0074,
+ [0xa4] = 0x0075, [0xa5] = 0x0076, [0xa6] = 0x0077, [0xa7] = 0x0078,
+ [0xa8] = 0x0079, [0xa9] = 0x007a, [0xaa] = 0x0e29, [0xab] = 0x0e2a,
+ [0xac] = 0x0e2b, [0xad] = 0x0e2c, [0xae] = 0x0e2d, [0xaf] = 0x0e2e,
+ [0xb0] = 0x0e50, [0xb1] = 0x0e51, [0xb2] = 0x0e52, [0xb3] = 0x0e53,
+ [0xb4] = 0x0e54, [0xb5] = 0x0e55, [0xb6] = 0x0e56, [0xb7] = 0x0e57,
+ [0xb8] = 0x0e58, [0xb9] = 0x0e59, [0xba] = 0x0e2f, [0xbb] = 0x0e30,
+ [0xbc] = 0x0e31, [0xbd] = 0x0e32, [0xbe] = 0x0e33, [0xbf] = 0x0e34,
+ [0xc0] = 0x007b, [0xc1] = 0x0041, [0xc2] = 0x0042, [0xc3] = 0x0043,
+ [0xc4] = 0x0044, [0xc5] = 0x0045, [0xc6] = 0x0046, [0xc7] = 0x0047,
+ [0xc8] = 0x0048, [0xc9] = 0x0049, [0xca] = 0x0e49, [0xcb] = 0x0e35,
+ [0xcc] = 0x0e36, [0xcd] = 0x0e37, [0xce] = 0x0e38, [0xcf] = 0x0e39,
+ [0xd0] = 0x007d, [0xd1] = 0x004a, [0xd2] = 0x004b, [0xd3] = 0x004c,
+ [0xd4] = 0x004d, [0xd5] = 0x004e, [0xd6] = 0x004f, [0xd7] = 0x0050,
+ [0xd8] = 0x0051, [0xd9] = 0x0052, [0xda] = 0x0e3a, [0xdb] = 0x0e40,
+ [0xdc] = 0x0e41, [0xdd] = 0x0e42, [0xde] = 0x0e43, [0xdf] = 0x0e44,
+ [0xe0] = 0x005c, [0xe1] = 0x0e4a, [0xe2] = 0x0053, [0xe3] = 0x0054,
+ [0xe4] = 0x0055, [0xe5] = 0x0056, [0xe6] = 0x0057, [0xe7] = 0x0058,
+ [0xe8] = 0x0059, [0xe9] = 0x005a, [0xea] = 0x0e45, [0xeb] = 0x0e46,
+ [0xec] = 0x0e47, [0xed] = 0x0e48, [0xee] = 0x0e49, [0xef] = 0x0e4a,
+ [0xf0] = 0x0030, [0xf1] = 0x0031, [0xf2] = 0x0032, [0xf3] = 0x0033,
+ [0xf4] = 0x0034, [0xf5] = 0x0035, [0xf6] = 0x0036, [0xf7] = 0x0037,
+ [0xf8] = 0x0038, [0xf9] = 0x0039, [0xfa] = 0x0e4b, [0xfb] = 0x0e4c,
+ [0xfc] = 0x0e4d, [0xfd] = 0x0e4b, [0xfe] = 0x20ac, [0xff] = 0x009f
+};
+
+static const struct gap from_idx[] =
+{
+ { start: 0x0000, end: 0x00ac, idx: 0 },
+ { start: 0x0e01, end: 0x0e5b, idx: -3412 },
+ { start: 0x20ac, end: 0x20ac, idx: -8100 },
+ { start: 0xff01, end: 0xff5e, idx: -65016 },
+ { start: 0xffff, end: 0xffff, idx: 0 }
+};
+
+static const char from_ucs4[] =
+{
+ '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f',
+ '\x16', '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+ '\x10', '\x11', '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26',
+ '\x18', '\x19', '\x3f', '\x27', '\x1c', '\x1d', '\x1e', '\x1f',
+ '\x40', '\x5a', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+ '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+ '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+ '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+ '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+ '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+ '\xe7', '\xe8', '\xe9', '\x49', '\xe0', '\x59', '\x69', '\x6d',
+ '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+ '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+ '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+ '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', '\xa1', '\x07',
+ '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', '\x17',
+ '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b',
+ '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08',
+ '\x38', '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff',
+ '\x41', '\x00', '\x4a', '\x00', '\x00', '\x00', '\x6a', '\x00',
+ '\x00', '\x00', '\x00', '\x00', '\x5f', '\x42', '\x43', '\x44',
+ '\x45', '\x46', '\x47', '\x48', '\x52', '\x53', '\x54', '\x55',
+ '\x56', '\x57', '\x58', '\x62', '\x63', '\x64', '\x65', '\x66',
+ '\x67', '\x68', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+ '\x78', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f', '\x9a',
+ '\x9b', '\x9c', '\x9d', '\x9e', '\x9f', '\xaa', '\xab', '\xac',
+ '\xad', '\xae', '\xaf', '\xba', '\xbb', '\xbc', '\xbd', '\xbe',
+ '\xbf', '\xcb', '\xcc', '\xcd', '\xce', '\xcf', '\xda', '\x00',
+ '\x00', '\x00', '\x00', '\x70', '\xdb', '\xdc', '\xdd', '\xde',
+ '\xdf', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef', '\xfa',
+ '\xfb', '\xfc', '\x71', '\x80', '\xb0', '\xb1', '\xb2', '\xb3',
+ '\xb4', '\xb5', '\xb6', '\xb7', '\xb8', '\xb9', '\x90', '\xa0',
+ '\xfe', '\x5a', '\x7f', '\x7b', '\x5b', '\x6c', '\x50', '\x7d',
+ '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', '\x60', '\x4b', '\x61',
+ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+ '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', '\x6f',
+ '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+ '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6',
+ '\xd7', '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6',
+ '\xe7', '\xe8', '\xe9', '\x49', '\xe0', '\x59', '\x69', '\x6d',
+ '\x79', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+ '\x88', '\x89', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96',
+ '\x97', '\x98', '\x99', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6',
+ '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', '\xa1'
+};
diff --git a/iconvdata/ibm1161.c b/iconvdata/ibm1161.c
new file mode 100644
index 0000000000..b5ff9bda11
--- /dev/null
+++ b/iconvdata/ibm1161.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1161.
+ Copyright (C) 2001 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <stdint.h>
+
+/* Get the conversion table. */
+#define TABLES <ibm1161.h>
+
+#define CHARSET_NAME "IBM1161//"
+#define HAS_HOLES 1 /* Not all 256 character are defined. */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1161.h b/iconvdata/ibm1161.h
new file mode 100644
index 0000000000..ef7dfe5713
--- /dev/null
+++ b/iconvdata/ibm1161.h
@@ -0,0 +1,134 @@
+/* Mapping table for IBM1161.
+ Copyright (C) 2001 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+static const uint32_t to_ucs4[256] =
+{
+ [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+ [0x04] = 0x0004, [0x05] = 0x0005, [0x06] = 0x0006, [0x07] = 0x0007,
+ [0x08] = 0x0008, [0x09] = 0x0009, [0x0a] = 0x000a, [0x0b] = 0x000b,
+ [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+ [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+ [0x14] = 0x0014, [0x15] = 0x0015, [0x16] = 0x0016, [0x17] = 0x0017,
+ [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x001c, [0x1b] = 0x001b,
+ [0x1c] = 0x007f, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+ [0x20] = 0x0020, [0x21] = 0x0021, [0x22] = 0x0022, [0x23] = 0x0023,
+ [0x24] = 0x0024, [0x25] = 0x0025, [0x26] = 0x0026, [0x27] = 0x0027,
+ [0x28] = 0x0028, [0x29] = 0x0029, [0x2a] = 0x002a, [0x2b] = 0x002b,
+ [0x2c] = 0x002c, [0x2d] = 0x002d, [0x2e] = 0x002e, [0x2f] = 0x002f,
+ [0x30] = 0x0030, [0x31] = 0x0031, [0x32] = 0x0032, [0x33] = 0x0033,
+ [0x34] = 0x0034, [0x35] = 0x0035, [0x36] = 0x0036, [0x37] = 0x0037,
+ [0x38] = 0x0038, [0x39] = 0x0039, [0x3a] = 0x003a, [0x3b] = 0x003b,
+ [0x3c] = 0x003c, [0x3d] = 0x003d, [0x3e] = 0x003e, [0x3f] = 0x003f,
+ [0x40] = 0x0040, [0x41] = 0x0041, [0x42] = 0x0042, [0x43] = 0x0043,
+ [0x44] = 0x0044, [0x45] = 0x0045, [0x46] = 0x0046, [0x47] = 0x0047,
+ [0x48] = 0x0048, [0x49] = 0x0049, [0x4a] = 0x004a, [0x4b] = 0x004b,
+ [0x4c] = 0x004c, [0x4d] = 0x004d, [0x4e] = 0x004e, [0x4f] = 0x004f,
+ [0x50] = 0x0050, [0x51] = 0x0051, [0x52] = 0x0052, [0x53] = 0x0053,
+ [0x54] = 0x0054, [0x55] = 0x0055, [0x56] = 0x0056, [0x57] = 0x0057,
+ [0x58] = 0x0058, [0x59] = 0x0059, [0x5a] = 0x005a, [0x5b] = 0x005b,
+ [0x5c] = 0x005c, [0x5d] = 0x005d, [0x5e] = 0x005e, [0x5f] = 0x005f,
+ [0x60] = 0x0060, [0x61] = 0x0061, [0x62] = 0x0062, [0x63] = 0x0063,
+ [0x64] = 0x0064, [0x65] = 0x0065, [0x66] = 0x0066, [0x67] = 0x0067,
+ [0x68] = 0x0068, [0x69] = 0x0069, [0x6a] = 0x006a, [0x6b] = 0x006b,
+ [0x6c] = 0x006c, [0x6d] = 0x006d, [0x6e] = 0x006e, [0x6f] = 0x006f,
+ [0x70] = 0x0070, [0x71] = 0x0071, [0x72] = 0x0072, [0x73] = 0x0073,
+ [0x74] = 0x0074, [0x75] = 0x0075, [0x76] = 0x0076, [0x77] = 0x0077,
+ [0x78] = 0x0078, [0x79] = 0x0079, [0x7a] = 0x007a, [0x7b] = 0x007b,
+ [0x7c] = 0x007c, [0x7d] = 0x007d, [0x7e] = 0x007e, [0x7f] = 0x001a,
+ [0xa0] = 0x0e48, [0xa1] = 0x0e01, [0xa2] = 0x0e02, [0xa3] = 0x0e03,
+ [0xa4] = 0x0e04, [0xa5] = 0x0e05, [0xa6] = 0x0e06, [0xa7] = 0x0e07,
+ [0xa8] = 0x0e08, [0xa9] = 0x0e09, [0xaa] = 0x0e0a, [0xab] = 0x0e0b,
+ [0xac] = 0x0e0c, [0xad] = 0x0e0d, [0xae] = 0x0e0e, [0xaf] = 0x0e0f,
+ [0xb0] = 0x0e10, [0xb1] = 0x0e11, [0xb2] = 0x0e12, [0xb3] = 0x0e13,
+ [0xb4] = 0x0e14, [0xb5] = 0x0e15, [0xb6] = 0x0e16, [0xb7] = 0x0e17,
+ [0xb8] = 0x0e18, [0xb9] = 0x0e19, [0xba] = 0x0e1a, [0xbb] = 0x0e1b,
+ [0xbc] = 0x0e1c, [0xbd] = 0x0e1d, [0xbe] = 0x0e1e, [0xbf] = 0x0e1f,
+ [0xc0] = 0x0e20, [0xc1] = 0x0e21, [0xc2] = 0x0e22, [0xc3] = 0x0e23,
+ [0xc4] = 0x0e24, [0xc5] = 0x0e25, [0xc6] = 0x0e26, [0xc7] = 0x0e27,
+ [0xc8] = 0x0e28, [0xc9] = 0x0e29, [0xca] = 0x0e2a, [0xcb] = 0x0e2b,
+ [0xcc] = 0x0e2c, [0xcd] = 0x0e2d, [0xce] = 0x0e2e, [0xcf] = 0x0e2f,
+ [0xd0] = 0x0e30, [0xd1] = 0x0e31, [0xd2] = 0x0e32, [0xd3] = 0x0e33,
+ [0xd4] = 0x0e34, [0xd5] = 0x0e35, [0xd6] = 0x0e36, [0xd7] = 0x0e37,
+ [0xd8] = 0x0e38, [0xd9] = 0x0e39, [0xda] = 0x0e3a, [0xdb] = 0x0e49,
+ [0xdc] = 0x0e4a, [0xdd] = 0x0e4b, [0xde] = 0x20ac, [0xdf] = 0x0e3f,
+ [0xe0] = 0x0e40, [0xe1] = 0x0e41, [0xe2] = 0x0e42, [0xe3] = 0x0e43,
+ [0xe4] = 0x0e44, [0xe5] = 0x0e45, [0xe6] = 0x0e46, [0xe7] = 0x0e47,
+ [0xe8] = 0x0e48, [0xe9] = 0x0e49, [0xea] = 0x0e4a, [0xeb] = 0x0e4b,
+ [0xec] = 0x0e4c, [0xed] = 0x0e4d, [0xee] = 0x0e4e, [0xef] = 0x0e4f,
+ [0xf0] = 0x0e50, [0xf1] = 0x0e51, [0xf2] = 0x0e52, [0xf3] = 0x0e53,
+ [0xf4] = 0x0e54, [0xf5] = 0x0e55, [0xf6] = 0x0e56, [0xf7] = 0x0e57,
+ [0xf8] = 0x0e58, [0xf9] = 0x0e59, [0xfa] = 0x0e5a, [0xfb] = 0x0e5b,
+ [0xfc] = 0x00a2, [0xfd] = 0x00ac, [0xfe] = 0x00a6, [0xff] = 0x00a0
+};
+
+static const struct gap from_idx[] =
+{
+ { start: 0x0000, end: 0x007f, idx: 0 },
+ { start: 0x00a0, end: 0x00ac, idx: -32 },
+ { start: 0x0e01, end: 0x0e5b, idx: -3444 },
+ { start: 0x20ac, end: 0x20ac, idx: -8132 },
+ { start: 0xff01, end: 0xff5e, idx: -65048 },
+ { start: 0xffff, end: 0xffff, idx: 0 }
+};
+
+static const char from_ucs4[] =
+{
+ '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+ '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+ '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+ '\x18', '\x19', '\x7f', '\x1b', '\x1a', '\x1d', '\x1e', '\x1f',
+ '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+ '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+ '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+ '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+ '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+ '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+ '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+ '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+ '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+ '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+ '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+ '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x1c',
+ '\xff', '\x00', '\xfc', '\x00', '\x00', '\x00', '\xfe', '\x00',
+ '\x00', '\x00', '\x00', '\x00', '\xfd', '\xa1', '\xa2', '\xa3',
+ '\xa4', '\xa5', '\xa6', '\xa7', '\xa8', '\xa9', '\xaa', '\xab',
+ '\xac', '\xad', '\xae', '\xaf', '\xb0', '\xb1', '\xb2', '\xb3',
+ '\xb4', '\xb5', '\xb6', '\xb7', '\xb8', '\xb9', '\xba', '\xbb',
+ '\xbc', '\xbd', '\xbe', '\xbf', '\xc0', '\xc1', '\xc2', '\xc3',
+ '\xc4', '\xc5', '\xc6', '\xc7', '\xc8', '\xc9', '\xca', '\xcb',
+ '\xcc', '\xcd', '\xce', '\xcf', '\xd0', '\xd1', '\xd2', '\xd3',
+ '\xd4', '\xd5', '\xd6', '\xd7', '\xd8', '\xd9', '\xda', '\x00',
+ '\x00', '\x00', '\x00', '\xdf', '\xe0', '\xe1', '\xe2', '\xe3',
+ '\xe4', '\xe5', '\xe6', '\xe7', '\xe8', '\xe9', '\xea', '\xeb',
+ '\xec', '\xed', '\xee', '\xef', '\xf0', '\xf1', '\xf2', '\xf3',
+ '\xf4', '\xf5', '\xf6', '\xf7', '\xf8', '\xf9', '\xfa', '\xfb',
+ '\xde', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+ '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+ '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+ '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+ '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+ '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+ '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+ '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+ '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+ '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+ '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+ '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e'
+};
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 9f3f52fddf..feff4a1454 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -3,6 +3,7 @@
/* Internally used flag. */
#define __RTLD_DLOPEN 0x80000000
+#define __RTLD_SPROF 0x40000000
/* Now define the internal interfaces. */
extern void *__dlvsym (void *__handle, __const char *__name,
diff --git a/nss/getent.c b/nss/getent.c
index 4c8438f558..1ddd67ad23 100644
--- a/nss/getent.c
+++ b/nss/getent.c
@@ -50,10 +50,21 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
/* Short description of parameters. */
static const char args_doc[] = N_("database [key ...]");
+/* Supported options. */
+static const struct argp_option args_options[] =
+ {
+ { "service", 's', "CONFIG", 0, N_("Service configuration to be used") },
+ { NULL, 0, NULL, 0, NULL },
+ };
+
+/* Prototype for option handler. */
+static error_t parse_option (int key, char *arg, struct argp_state *state);
+
/* Data structure to communicate with argp functions. */
-static struct argp argp = {
- NULL, NULL, args_doc, NULL,
-};
+static struct argp argp =
+ {
+ args_options, parse_option, args_doc, NULL,
+ };
/* Print the version information. */
static void
@@ -76,11 +87,9 @@ print_aliases (struct aliasent *alias)
printf ("%s: ", alias->alias_name);
for (i = strlen (alias->alias_name); i < 14; ++i)
- fputs (" ", stdout);
+ fputs_unlocked (" ", stdout);
- for (i = 0;
- i < alias->alias_members_len;
- ++i)
+ for (i = 0; i < alias->alias_members_len; ++i)
printf ("%s%s",
alias->alias_members [i],
i + 1 == alias->alias_members_len ? "\n" : ", ");
@@ -93,10 +102,10 @@ aliases_keys (int number, char *key[])
int i;
struct aliasent *alias;
- if (!number)
+ if (number == 0)
{
setaliasent ();
- while ((alias = getaliasent()) != NULL)
+ while ((alias = getaliasent ()) != NULL)
print_aliases (alias);
endaliasent ();
return result;
@@ -122,7 +131,7 @@ ethers_keys (int number, char *key[])
int result = 0;
int i;
- if (!number)
+ if (number == 0)
{
fprintf (stderr, _("Enumeration not supported on %s\n"), "ethers");
return 3;
@@ -134,7 +143,7 @@ ethers_keys (int number, char *key[])
char buffer [1024], *p;
ethp = ether_aton (key[i]);
- if (ethp)
+ if (ethp != NULL)
{
if (ether_ntohost (buffer, ethp))
{
@@ -167,16 +176,16 @@ print_group (struct group *grp)
printf ("%s:%s:%ld:", grp->gr_name ? grp->gr_name : "",
grp->gr_passwd ? grp->gr_passwd : "",
- (unsigned long)grp->gr_gid);
+ (unsigned long int) grp->gr_gid);
while (grp->gr_mem[i] != NULL)
{
- fputs (grp->gr_mem[i], stdout);
+ fputs_unlocked (grp->gr_mem[i], stdout);
++i;
if (grp->gr_mem[i] != NULL)
- fputs (",", stdout);
+ putchar_unlocked (',');
}
- fputs ("\n", stdout);
+ putchar_unlocked ('\n');
}
static int
@@ -186,10 +195,10 @@ group_keys (int number, char *key[])
int i;
struct group *grp;
- if (!number)
+ if (number == 0)
{
setgrent ();
- while ((grp = getgrent()) != NULL)
+ while ((grp = getgrent ()) != NULL)
print_group (grp);
endgrent ();
return result;
@@ -220,20 +229,16 @@ print_hosts (struct hostent *host)
const char *ip = inet_ntop (host->h_addrtype, host->h_addr_list[0],
buf, sizeof (buf));
- fputs (ip, stdout);
- for (i = strlen (ip); i < 15; ++i)
- fputs (" ", stdout);
- fputs (" ", stdout);
- fputs (host->h_name, stdout);
+ printf ("%-15s %s", ip, host->h_name);
i = 0;
while (host->h_aliases[i] != NULL)
{
- fputs (" ", stdout);
- fputs (host->h_aliases[i], stdout);
+ putchar_unlocked (' ');
+ fputs_unlocked (host->h_aliases[i], stdout);
++i;
}
- fputs ("\n", stdout);
+ putchar_unlocked ('\n');
}
static int
@@ -243,10 +248,10 @@ hosts_keys (int number, char *key[])
int i;
struct hostent *host;
- if (!number)
+ if (number == 0)
{
sethostent (0);
- while ((host = gethostent()) != NULL)
+ while ((host = gethostent ()) != NULL)
print_hosts (host);
endhostent ();
return result;
@@ -285,9 +290,9 @@ static int
netgroup_keys (int number, char *key[])
{
int result = 0;
- int i, j;
+ int i;
- if (!number)
+ if (number == 0)
{
fprintf (stderr, _("Enumeration not supported on %s\n"), "netgroup");
return 3;
@@ -301,13 +306,11 @@ netgroup_keys (int number, char *key[])
{
char *p[3];
- fputs (key[i], stdout);
- for (j = strlen (key[i]); j < 21; ++j)
- fputs (" ", stdout);
+ printf ("%-21s", key[i]);
while (getnetgrent (p, p + 1, p + 2))
printf (" (%s, %s, %s)", p[0] ?: " ", p[1] ?: "", p[2] ?: "");
- fputs ("\n", stdout);
+ putchar_unlocked ('\n');
}
}
@@ -322,21 +325,18 @@ print_networks (struct netent *net)
struct in_addr ip;
ip.s_addr = htonl (net->n_net);
- printf ("%s ", net->n_name);
- for (i = strlen (net->n_name); i < 21; ++i)
- fputs (" ", stdout);
- fputs (inet_ntoa (ip), stdout);
+ printf ("%-21s %s", net->n_name, inet_ntoa (ip));
i = 0;
while (net->n_aliases[i] != NULL)
{
- fputs (" ", stdout);
- fputs (net->n_aliases[i], stdout);
+ putchar_unlocked (' ');
+ fputs_unlocked (net->n_aliases[i], stdout);
++i;
if (net->n_aliases[i] != NULL)
- fputs (",", stdout);
+ putchar_unlocked (',');
}
- fputs ("\n", stdout);
+ putchar_unlocked ('\n');
}
static int
@@ -346,10 +346,10 @@ networks_keys (int number, char *key[])
int i;
struct netent *net;
- if (!number)
+ if (number == 0)
{
setnetent (0);
- while ((net = getnetent()) != NULL)
+ while ((net = getnetent ()) != NULL)
print_networks (net);
endnetent ();
return result;
@@ -378,8 +378,8 @@ print_passwd (struct passwd *pwd)
printf ("%s:%s:%ld:%ld:%s:%s:%s\n",
pwd->pw_name ? pwd->pw_name : "",
pwd->pw_passwd ? pwd->pw_passwd : "",
- (unsigned long)pwd->pw_uid,
- (unsigned long)pwd->pw_gid,
+ (unsigned long int) pwd->pw_uid,
+ (unsigned long int) pwd->pw_gid,
pwd->pw_gecos ? pwd->pw_gecos : "",
pwd->pw_dir ? pwd->pw_dir : "",
pwd->pw_shell ? pwd->pw_shell : "");
@@ -392,10 +392,10 @@ passwd_keys (int number, char *key[])
int i;
struct passwd *pwd;
- if (!number)
+ if (number == 0)
{
setpwent ();
- while ((pwd = getpwent()) != NULL)
+ while ((pwd = getpwent ()) != NULL)
print_passwd (pwd);
endpwent ();
return result;
@@ -423,19 +423,16 @@ print_protocols (struct protoent *proto)
{
unsigned int i;
- fputs (proto->p_name, stdout);
- for (i = strlen (proto->p_name); i < 21; ++i)
- fputs (" ", stdout);
- printf (" %d", proto->p_proto);
+ printf ("%-21s %d", proto->p_name, proto->p_proto);
i = 0;
while (proto->p_aliases[i] != NULL)
{
- fputs (" ", stdout);
- fputs (proto->p_aliases[i], stdout);
+ putchar_unlocked (' ');
+ fputs_unlocked (proto->p_aliases[i], stdout);
++i;
}
- fputs ("\n", stdout);
+ putchar_unlocked ('\n');
}
static int
@@ -445,10 +442,10 @@ protocols_keys (int number, char *key[])
int i;
struct protoent *proto;
- if (!number)
+ if (number == 0)
{
setprotoent (0);
- while ((proto = getprotoent()) != NULL)
+ while ((proto = getprotoent ()) != NULL)
print_protocols (proto);
endprotoent ();
return result;
@@ -476,14 +473,12 @@ print_rpc (struct rpcent *rpc)
{
int i;
- fputs (rpc->r_name, stdout);
- for (i = strlen (rpc->r_name); i < 15; ++i)
- fputs (" ", stdout);
- printf (" %d%s", rpc->r_number, rpc->r_aliases[0] ? " " : "");
+ printf ("%-15s %d%s",
+ rpc->r_name, rpc->r_number, rpc->r_aliases[0] ? " " : "");
for (i = 0; rpc->r_aliases[i]; ++i)
printf (" %s", rpc->r_aliases[i]);
- fputs ("\n", stdout);
+ putchar_unlocked ('\n');
}
static int
@@ -493,10 +488,10 @@ rpc_keys (int number, char *key[])
int i;
struct rpcent *rpc;
- if (!number)
+ if (number == 0)
{
setrpcent (0);
- while ((rpc = getrpcent()) != NULL)
+ while ((rpc = getrpcent ()) != NULL)
print_rpc (rpc);
endrpcent ();
return result;
@@ -524,19 +519,16 @@ print_services (struct servent *serv)
{
unsigned int i;
- fputs (serv->s_name, stdout);
- for (i = strlen (serv->s_name); i < 21; ++i)
- fputs (" ", stdout);
- printf (" %d/%s", ntohs (serv->s_port), serv->s_proto);
+ printf ("%-21s %d/%s", serv->s_name, ntohs (serv->s_port), serv->s_proto);
i = 0;
while (serv->s_aliases[i] != NULL)
{
- fputs (" ", stdout);
- fputs (serv->s_aliases[i], stdout);
+ putchar_unlocked (' ');
+ fputs_unlocked (serv->s_aliases[i], stdout);
++i;
}
- fputs ("\n", stdout);
+ putchar_unlocked ('\n');
}
static int
@@ -549,7 +541,7 @@ services_keys (int number, char *key[])
if (!number)
{
setservent (0);
- while ((serv = getservent()) != NULL)
+ while ((serv = getservent ()) != NULL)
print_services (serv);
endservent ();
return result;
@@ -620,10 +612,10 @@ print_shadow (struct spwd *sp)
sp->sp_namp ? sp->sp_namp : "",
sp->sp_pwdp ? sp->sp_pwdp : "");
-#define SHADOW_FIELD(n) \
- if (sp->n == -1) \
- fputs (":", stdout); \
- else \
+#define SHADOW_FIELD(n) \
+ if (sp->n == -1) \
+ putchar_unlocked (':'); \
+ else \
printf ("%ld:", sp->n)
SHADOW_FIELD (sp_lstchg);
@@ -633,7 +625,7 @@ print_shadow (struct spwd *sp)
SHADOW_FIELD (sp_inact);
SHADOW_FIELD (sp_expire);
if (sp->sp_flag == ~0ul)
- fputs ("\n", stdout);
+ putchar_unlocked ('\n');
else
printf ("%lu\n", sp->sp_flag);
}
@@ -644,12 +636,12 @@ shadow_keys (int number, char *key[])
int result = 0;
int i;
- if (!number)
+ if (number == 0)
{
struct spwd *sp;
setspent ();
- while ((sp = getspent()) != NULL)
+ while ((sp = getspent ()) != NULL)
print_shadow (sp);
endpwent ();
return result;
@@ -689,9 +681,28 @@ D(rpc)
D(services)
D(shadow)
#undef D
- { NULL, NULL }
+ { NULL, NULL }
};
+/* Handle arguments found by argp. */
+static error_t
+parse_option (int key, char *arg, struct argp_state *state)
+{
+ int i;
+ switch (key)
+ {
+ case 's':
+ for (i = 0; databases[i].name; ++i)
+ __nss_configure_lookup (databases[i].name, arg);
+ break;
+
+ default:
+ return ARGP_ERR_UNKNOWN;
+ }
+
+ return 0;
+}
+
/* build doc */
static inline void
build_doc (void)
@@ -707,7 +718,7 @@ build_doc (void)
len += strlen (databases[i].name) + 1;
doc = (char *) malloc (len);
- if (!doc)
+ if (doc == NULL)
doc = short_doc;
else
{
@@ -719,9 +730,9 @@ build_doc (void)
for (i = 0, j = 0; databases[i].name; ++i)
{
len = strlen (databases[i].name);
- if (i)
+ if (i != 0)
{
- if (j + len > 60)
+ if (j + len > 72)
{
j = 0;
*p++ = '\n';
@@ -730,8 +741,7 @@ build_doc (void)
*p++ = ' ';
}
- memcpy (p, databases[i].name, len);
- p += len;
+ p = mempcpy (p, databases[i].name, len);
j += len + 1;
}
}
@@ -764,11 +774,11 @@ main (int argc, char *argv[])
}
for (i = 0; databases[i].name; ++i)
- if (argv[1][0] == databases[i].name[0]
- && !strcmp (argv[1], databases[i].name))
- return databases[i].func (argc - 2, &argv[2]);
+ if (argv[remaining][0] == databases[i].name[0]
+ && !strcmp (argv[remaining], databases[i].name))
+ return databases[i].func (argc - remaining - 1, &argv[remaining + 1]);
- fprintf (stderr, _("Unknown database: %s\n"), argv[1]);
+ fprintf (stderr, _("Unknown database: %s\n"), argv[remaining]);
argp_help (&argp, stdout, ARGP_HELP_SEE, program_invocation_short_name);
return 1;
}
diff --git a/nss/nss_files/files-network.c b/nss/nss_files/files-network.c
index 383f68fe99..9f4a3e0324 100644
--- a/nss/nss_files/files-network.c
+++ b/nss/nss_files/files-network.c
@@ -1,5 +1,5 @@
/* Networks file parser in nss_files module.
- Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 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
@@ -34,10 +34,40 @@ LINE_PARSER
("#",
{
char *addr;
+ char *cp;
+ int n = 1;
STRING_FIELD (result->n_name, isspace, 1);
STRING_FIELD (addr, isspace, 1);
+ /* 'inet_network' does not add zeroes at the end if the network number
+ does not four byte values. We add them outselves if necessary. */
+ cp = strchr (addr, '.');
+ if (cp != NULL)
+ {
+ ++n;
+ cp = strchr (cp + 1, '.');
+ if (cp != NULL)
+ {
+ ++n;
+ cp = strchr (cp + 1, '.');
+ if (cp != NULL)
+ ++n;
+ }
+ }
+ if (n < 4)
+ {
+ char *newp = (char *) alloca (strlen (addr) + (4 - n) * 2 + 1);
+ cp = stpcpy (newp, addr);
+ do
+ {
+ *cp++ = '.';
+ *cp++ = '0';
+ }
+ while (++n < 4);
+ *cp = '\0';
+ addr = newp;
+ }
result->n_net = inet_network (addr);
result->n_addrtype = AF_INET;
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h
index 2a414ca448..a039f245db 100644
--- a/sysdeps/alpha/dl-machine.h
+++ b/sysdeps/alpha/dl-machine.h
@@ -70,16 +70,20 @@ elf_machine_load_address (void)
Elf64_Addr dot;
long int zero_disp;
- asm("br %0, 1f\n\t"
- ".weak __load_address_undefined\n\t"
- "br $0, __load_address_undefined\n"
- "1:"
+ asm("br %0, 1f\n"
+ "0:\n\t"
+ "br $0, 2f\n"
+ "1:\n\t"
+ ".data\n"
+ "2:\n\t"
+ ".quad 0b\n\t"
+ ".previous"
: "=r"(dot));
- zero_disp = *(int *)dot;
+ zero_disp = *(int *) dot;
zero_disp = (zero_disp << 43) >> 41;
- return dot + 4 + zero_disp;
+ return dot - *(Elf64_Addr *) (dot + 4 + zero_disp);
}
/* Set up the loaded object described by L so its unrelocated PLT
diff --git a/sysdeps/s390/s390-32/bits/setjmp.h b/sysdeps/s390/s390-32/bits/setjmp.h
index fa6e03b4be..607cdaf11a 100644
--- a/sysdeps/s390/s390-32/bits/setjmp.h
+++ b/sysdeps/s390/s390-32/bits/setjmp.h
@@ -47,6 +47,6 @@ typedef struct {
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
- ((int) (address) < (jmpbuf)->__gregs[__JB_GPR15])
+ ((void *) (address) < (void *) (jmpbuf)->__gregs[__JB_GPR15])
#endif /* __S390_SETJMP_H__ */
diff --git a/sysdeps/s390/s390-64/bits/setjmp.h b/sysdeps/s390/s390-64/bits/setjmp.h
index 9daa4301d8..1bb3645f9c 100644
--- a/sysdeps/s390/s390-64/bits/setjmp.h
+++ b/sysdeps/s390/s390-64/bits/setjmp.h
@@ -47,6 +47,6 @@ typedef struct {
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
- ((int) (address) < (jmpbuf)->__gregs[__JB_GPR15])
+ ((void *) (address) < (void *) (jmpbuf)->__gregs[__JB_GPR15])
#endif /* __S390_SETJMP_H__ */
diff --git a/sysdeps/unix/sysv/aix/libc-start.c b/sysdeps/unix/sysv/aix/libc-start.c
index 2dfc0251ba..1184664b57 100644
--- a/sysdeps/unix/sysv/aix/libc-start.c
+++ b/sysdeps/unix/sysv/aix/libc-start.c
@@ -1 +1,296 @@
-/* stub libc-start.c */
+/* Initialization code run first thing by the XCOFF startup code. AIX version.
+ Copyright (C) 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 Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+/* hack to use uchar's */
+typedef unsigned char uchar;
+#include <xcoff.h>
+#include <rtinit.h>
+#include <dlldr.h>
+#include <bits/libc-lock.h>
+
+extern void __libc_init_first (int argc, char **argv, char **envp);
+
+/* XXX disable for now
+extern int _dl_starting_up;
+weak_extern (_dl_starting_up)
+extern int __libc_multiple_libcs; */
+
+/* XXX normally defined in generic/dl-sydep.c, hack it into existance
+extern void *__libc_stack_end; */
+void *__libc_stack_end;
+
+ struct __libc_start_data_rec {
+ void *stack;
+ void *toc;
+ int argc;
+ char **argv;
+ char **envp;
+ char *data;
+ char *text;
+ unsigned mcount;
+ unsigned special;
+ int (*main)(int, char **, char **);
+ void (*init)(void);
+ void (*fini)(void);
+ void (*rtld_fini)(void);
+ };
+
+extern struct __libc_start_data_rec __libc_start_data;
+extern int errno;
+
+/* The first piece of initialized data. */
+int __data_start = 0;
+
+#ifndef HAVE_ELF
+/* Since gcc/crtstuff.c won't define it unless the ELF format is used
+ we will need to define it here. */
+void *__dso_handle = NULL;
+#endif
+
+/* AIX kernel function */
+extern int __loadx (int flag, void *module, void *arg1, void *arg2,
+ void *arg3);
+/* Needed by setenv */
+char **__environ;
+
+/* Needed by dl-support.c */
+/* XXX stubbing out dl-support.c for now..
+ size_t _dl_pagesize = 0; */
+
+/*
+ * Find __rtinit symbol
+ *
+ * __RTINIT *find_rtinit()
+ *
+ * __RTINIT *rti - pointer to __rtinit data structure
+ */
+
+static __RTINIT *
+find_rtinit (void)
+{
+ struct xcoffhdr *xcoff_hdr;
+ SCNHDR *sec_hdr;
+ SCNHDR *ldr_sec_hdr;
+ SCNHDR *data_sec_hdr;
+ LDSYM *ldsym_hdr;
+ __RTINIT *rtl;
+
+ xcoff_hdr = (struct xcoffhdr *) __libc_start_data.text;
+ sec_hdr = (SCNHDR *) ((caddr_t) &xcoff_hdr->aouthdr
+ + xcoff_hdr->filehdr.f_opthdr);
+ ldr_sec_hdr = (SCNHDR *) (sec_hdr + (xcoff_hdr->aouthdr.o_snloader - 1));
+ ldsym_hdr = (LDSYM *) ((caddr_t) xcoff_hdr + ldr_sec_hdr->s_scnptr
+ + LDHDRSZ);
+
+ if (__libc_start_data.mcount <= 0)
+ {
+ if (!ldr_sec_hdr->s_scnptr)
+ return NULL;
+
+ if (memcmp (ldsym_hdr, RTINIT_NAME, sizeof(RTINIT_NAME) - 1) != 0)
+ return NULL;
+ }
+
+ data_sec_hdr = (SCNHDR *) (sec_hdr + (xcoff_hdr->aouthdr.o_sndata - 1));
+ rtl = (__RTINIT *) (ldsym_hdr->l_value
+ + (__libc_start_data.data - data_sec_hdr->s_vaddr));
+ return rtl;
+}
+
+/* The mod_init1 calls every initialization function
+ for a given module.
+
+ void mod_init1(handler, rti)
+
+ void *handler - if NULL init funtions for modules loaded at exec time
+ are being executed. Otherwise, the handler points to the
+ module loaded.
+
+ __RTINIT *rti - pointer to __rtinit data structure (with rti->init_offset
+ not equal to zero)
+ */
+
+static void
+mod_init1 (void *handler,__RTINIT *rtl)
+{
+ __RTINIT_DESCRIPTOR *descriptor;
+
+ descriptor = (__RTINIT_DESCRIPTOR *) ((caddr_t) &rtl->rtl
+ + rtl->init_offset);
+ while (descriptor->f != NULL)
+ {
+ if (!(descriptor->flags & _RT_CALLED))
+ {
+ descriptor->flags |= _RT_CALLED;
+ /* Execute init/fini. */
+ descriptor->f (handler, rtl, descriptor);
+ }
+ descriptor = (__RTINIT_DESCRIPTOR *) ((caddr_t) descriptor
+ + rtl->__rtinit_descriptor_size);
+ }
+}
+
+/* The modinit() function performs run-time linking, if enabled, and calling
+ the init() function for all loaded modules.
+
+ int modinit()
+ */
+
+#define DL_BUFFER_SIZE 1000
+
+static int
+modinit (void)
+{
+ int *handler = NULL;
+ __RTINIT *rtinit_info = NULL;
+ int flag;
+ DL_INFO dl_buffer[DL_BUFFER_SIZE];
+ DL_INFO *dl_info = dl_buffer;
+ int i;
+
+ /* Find __rtinit symbols */
+ rtinit_info = find_rtinit ();
+
+ flag = DL_EXECQ;
+ if (rtinit_info && rtinit_info->rtl)
+ flag |= DL_LOAD_RTL;
+
+ /* Get a list of modules that have __rtinit. */
+ if (__loadx (flag, dl_info, (void *) sizeof (dl_buffer), NULL, NULL))
+ exit (0x90);
+
+ if (( dl_info[0].dlinfo_xflags & DL_INFO_OK))
+ {
+ rtinit_info = find_rtinit ();
+ if ((rtinit_info != NULL) & (rtinit_info->rtl != NULL))
+ {
+ if ((*rtinit_info->rtl) (dl_info, 0))
+ exit (0x90);
+ }
+ }
+
+ /* Initialization each module loaded that has __rtinit. */
+ if (dl_info[0].dlinfo_xflags & DL_INFO_OK)
+ {
+ for (i = 1; i < dl_info[0].dlinfo_arraylen + 1; ++i)
+ if (dl_info[i].dlinfo_flags & DL_HAS_RTINIT)
+ {
+ rtinit_info = find_rtinit ();
+ if (rtinit_info)
+ mod_init1 (handler, rtinit_info);
+ }
+ }
+
+ return 0;
+}
+
+
+void
+__libc_start_init (void)
+{
+ /* Do run-time linking, if enabled and call the init()
+ for all loaded modules. */
+ if (__libc_start_data.mcount != __libc_start_data.special)
+ modinit ();
+}
+
+/* For now these are just stubs. */
+void
+__libc_start_fini (void)
+{
+}
+
+void
+__libc_start_rtld_fini (void)
+{
+}
+
+void
+__libc_start_main (void)
+{
+#ifndef SHARED
+
+ /* The next variable is only here to work around a bug in gcc <= 2.7.2.2.
+ If the address would be taken inside the expression the optimizer
+ would try to be too smart and throws it away. Grrr. */
+
+ /* XXX disable for now
+ int *dummy_addr = &_dl_starting_up;
+
+ __libc_multiple_libcs = dummy_addr && !_dl_starting_up; */
+#endif
+
+ /* Store the lowest stack address. */
+ __libc_stack_end = __libc_start_data.stack;
+
+ /* Used by setenv */
+ __environ = __libc_start_data.envp;
+
+#ifndef SHARED
+ /* Clear errno. */
+ errno = 0;
+
+ /* Some security at this point. Prevent starting a SUID binary where
+ the standard file descriptors are not opened. We have to do this
+ only for statically linked applications since otherwise the dynamic
+ loader did the work already. */
+ if (__builtin_expect (__libc_enable_secure, 0))
+ __libc_check_standard_fds ();
+
+#endif
+
+ /* Register the destructor of the dynamic linker if there is any. */
+ if (__builtin_expect (__libc_start_data.rtld_fini != NULL, 1))
+ __cxa_atexit ((void (*) (void *)) __libc_start_data.rtld_fini, NULL, NULL);
+
+ /* Call the initializer of the libc. This is only needed here if we
+ are compiling for the static library in which case we haven't
+ run the constructors in `_dl_start_user'. */
+#ifndef SHARED
+ __libc_init_first (__libc_start_data.argc, __libc_start_data.argv,
+ __libc_start_data.envp);
+#endif
+
+ /* Register the destructor of the program, if any. */
+ if (__libc_start_data.fini)
+ __cxa_atexit ((void (*) (void *)) __libc_start_data.fini, NULL, NULL);
+
+ /* Call the initializer of the program, if any. */
+#ifdef SHARED
+ if (__builtin_expect (_dl_debug_mask & DL_DEBUG_IMPCALLS, 0))
+ _dl_debug_printf ("\ninitialize program: %s\n\n",
+ __libc_start_data.argv[0]);
+#endif
+ if (__libc_start_data.init)
+ (*__libc_start_data.init) ();
+
+#ifdef SHARED
+ if (__builtin_expect (_dl_debug_mask & DL_DEBUG_IMPCALLS, 0))
+ _dl_debug_printf ("\ntransferring control: %s\n\n",
+ __libc_start_data.argv[0]);
+#endif
+
+ exit ((*__libc_start_data.main) (__libc_start_data.argc,
+ __libc_start_data.argv,
+ __libc_start_data.envp));
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 07:34:56 +0000