Update.

2001-08-12  Ulrich Drepper  <drepper@redhat.com>

	* iconvdata/Makefile: Add rules to build ISO-IR-209 and MAC-SAMI.
	* iconvdata/iso-ir-209.c: New file.
	* iconvdata/mac-sami.c: New file.
	* iconvdata/gconv-modules: Add entries for ISO-IR-209 and MAC-SAMI.
	* iconvdata/tst-tables.sh: Likewise.

	* posix/getopt.c: Remove store_args_and_env which is not needed since
	USE_NONOPTION_FLAGS is undefined anyhow.  Use __libc_argc and
	__libc_argv variables.

	Now returns pointer to first character after "LD_".

5 files changed, 72 insertions, 3 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 419ea3c..fe4a750 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -48,7 +48,7 @@ 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
+	   GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -139,7 +139,8 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      iso8859-16.c utf-16.c unicode.c utf-32.c utf-7.c big5hkscs.c  \
 	      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
+	      koi8-t.c georgian-ps.c georgian-academy.c iso-ir-209.c	    \
+	      mac-sami.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -179,7 +180,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			iso_5428 iso_10367-box mac-is nats-dano nats-sefi  \
 			iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2   \
 			iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t	   \
-			georgian-ps georgian-academy
+			georgian-ps georgian-academy iso-ir-209 mac-sami
 
 gen-special-modules := iso8859-7jp
 
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 1eacc1b..5951574 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1442,3 +1442,11 @@ module	INTERNAL		GEORGIAN-PS//		GEORGIAN-PS	1
 #	from			to			module		cost
 module	GEORGIAN-ACADEMY//	INTERNAL		GEORGIAN-ACADEMY 1
 module	INTERNAL		GEORGIAN-ACADEMY//	GEORGIAN-ACADEMY 1
+
+#	from			to			module		cost
+module	ISO-IR-209//		INTERNAL		ISO-IR-209	1
+module	INTERNAL		ISO-IR-209//		ISO-IR-209	1
+
+#	from			to			module		cost
+module	MAC-SAMI//		INTERNAL		MAC-SAMI	1
+module	INTERNAL		MAC-SAMI//		MAC-SAMI	1
diff --git a/iconvdata/iso-ir-209.c b/iconvdata/iso-ir-209.c
new file mode 100644
index 0000000..9ab4950
--- /dev/null
+++ b/iconvdata/iso-ir-209.c
@@ -0,0 +1,29 @@
+/* Conversion from and to ISO-IR-209.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.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 <iso-ir-209.h>
+
+#define CHARSET_NAME	"ISO-IR-209//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/mac-sami.c b/iconvdata/mac-sami.c
new file mode 100644
index 0000000..db221a6
--- /dev/null
+++ b/iconvdata/mac-sami.c
@@ -0,0 +1,29 @@
+/* Conversion from and to MAC-SAMI.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.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 <mac-sami.h>
+
+#define CHARSET_NAME	"MAC-SAMI//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index fea3914..ce706aa 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -180,6 +180,8 @@ cat <<EOF |
   NATS-SEFI
   WIN-SAMI-2        SAMI-WS2
   ISO-IR-197
+  ISO-IR-209
+  MAC-SAMI
   TIS-620
   KOI8-U
   VISCII