second update 960907 from main archive

Sun Sep  8 02:36:02 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/SYS_libc.c (_libc_intl_domainname): Change value to "libc".
	This is consistent with all other GNU packages.  We shouldn't
	take care for a possible clash.  Somebody will name the domain
	of a package libc if it is not the libc itself.
	* MakeTAGS ($P/SYS_libc.pot): Rename to $P/libc.pot.
	* po/Makefile (domainname): Change to libc.
	(distribute): Now ship libc.pot.
	* catgets/gencat.c (usage): Use `PACKAGE' for package name in
	version information banner.
	Change bug report address to bug-glibc@prep not @gnu.
	* db/makedb.c (PACKAGE): New macro.  Set to _libc_intl_domain.
	(main): Use `PACKAGE' for package name in version information
	banner.
	Change bug report address to bug-glibc@prep not @gnu.
	* locale/programs/locale.c (main): Use `PACKAGE' for package name
 	in version information banner.
	Change bug report address to bug-glibc@prep not @gnu.
	* locale/programs/localedef.c (main): Likewise.

	* version.h (VERSION): Bump to 1.94.

	* libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO.

ChangeLog

@@ -1,3 +1,26 @@
+Sun Sep  8 02:36:02 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* locale/SYS_libc.c (_libc_intl_domainname): Change value to "libc".
+	This is consistent with all other GNU packages.  We shouldn't
+	take care for a possible clash.  Somebody will name the domain
+	of a package libc if it is not the libc itself.
+	* MakeTAGS ($P/SYS_libc.pot): Rename to $P/libc.pot.
+	* po/Makefile (domainname): Change to libc.
+	(distribute): Now ship libc.pot.
+	* catgets/gencat.c (usage): Use `PACKAGE' for package name in
+	version information banner.
+	Change bug report address to bug-glibc@prep not @gnu.
+	* db/makedb.c (PACKAGE): New macro.  Set to _libc_intl_domain.
+	(main): Use `PACKAGE' for package name in version information
+	banner.
+	Change bug report address to bug-glibc@prep not @gnu.
+	* locale/programs/locale.c (main): Use `PACKAGE' for package name
+ 	in version information banner.
+	Change bug report address to bug-glibc@prep not @gnu.
+	* locale/programs/localedef.c (main): Likewise.
+
+	* version.h (VERSION): Bump to 1.94.
+
 Sat Sep  7 14:00:33 1996  David Mosberger-Tang  <davidm@azstarnet.com>
 
 	* catgets/catgets.c (catopen): Allocate sizeof(*result) bytes
@@ -19,7 +42,7 @@ Sat Sep  7 19:39:19 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 Sat Sep  7 05:15:45 1996  Ulrich Drepper  <drepper@cygnus.com>
 
- 	* libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO.
+	* libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO.
 	* libio/iofopen: Likewise.
 	* libio/iofopncook.c: Likewise.
 	* libio/iopopen.c: Likewise.

MakeTAGS

@@ -166,7 +166,7 @@ $P/subdirs.pot: $(subdirs:%=$P/%.pot)
 include $(common-objpfx)version.mk
 
 # Combine all the messages into the final sorted template translation file.
-$P/SYS_libc.pot: $(all-pot)
+$P/libc.pot: $(all-pot)
 	@rm -f $@.new
 	sed -e 's/VERSION/$(version)/' -e "s/DATE/`date +'%Y-%m-%d %k:%M'`/" \
 	    po/header.pot > $@.new

catgets/gencat.c

@@ -166,7 +166,7 @@ main (int argc, char *argv[])
   if (do_version)
     {
       fprintf (stderr, "%s - GNU %s %s\n", program_invocation_name,
-	       "libc", VERSION);
+	       PACKAGE, VERSION);
       exit (EXIT_SUCCESS);
     }
 
@@ -213,7 +213,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -V, --version       output version information and exit\n\
 If INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n\
 is -, output is written to standard output.\n\
-Report bugs to <bug-glibc@gnu.ai.mit.edu>.\n"),
+Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
 	   program_invocation_name, program_invocation_name);
 
   exit (status);

db/makedb.c

@@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA.  */
 /* Get libc version number.  */
 #include "../version.h"
 
+#define PACKAGE _libc_intl_domainname
 
 /* Long options.  */
 static const struct option long_options[] =
@@ -112,7 +113,7 @@ main (argc, argv)
 
   /* Version information is requested.  */
   if (do_version)
-    printf ("%s - GNU %s %s\n", program_invocation_name, "libc", VERSION);
+    printf ("%s - GNU %s %s\n", program_invocation_name, PACKAGE, VERSION);
 
   /* Help is requested.  */
   if (do_help)
@@ -208,7 +209,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -u, --undo          print content of database file, one entry a line\n\
   -V, --version       output version information and exit\n\
 If INPUT-FILE is -, input is read from standard input.\n\
-Report bugs to <bug-glibc@gnu.ai.mit.edu>.\n"),
+Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
 	    program_invocation_name, program_invocation_name,
 	    program_invocation_name);
 

locale/Makefile

@@ -25,6 +25,7 @@ headers		= locale.h langinfo.h
 distribute	= localeinfo.h categories.def iso-4217.def weight.h \
 		  strlen-hash.h \
 		  $(addprefix programs/, \
+			      locale.c localedef.c \
 			      $(localedef-modules:=.c) $(locale-modules:=.c) \
 			      $(lib-modules:=.c) config.h simple-hash.h \
 			      charmap-kw.gperf charmap-kw.h locfile-token.h \

locale/SYS_libc.c

@@ -1,6 +1,4 @@
 /* Define a constant for the dgettext domainname for libc internal messages,
    so the string constant is not repeated in dozens of object files.  */
 
-#include "../version.h"
-
-const char _libc_intl_domainname[] = "SYS_GNU_libc-" VERSION;
+const char _libc_intl_domainname[] = "libc";

locale/programs/locale.c

@@ -183,7 +183,7 @@ main (int argc, char *argv[])
   /* Version information is requested.  */
   if (do_version)
     {
-      fprintf (stderr, "%s - GNU %s %s\n", __progname, "libc", VERSION);
+      fprintf (stderr, "%s - GNU %s %s\n", __progname, PACKAGE, VERSION);
       exit (EXIT_SUCCESS);
     }
 
@@ -245,7 +245,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
   -c, --category-name   write names of selected categories\n\
   -k, --keyword-name    write names of selected keywords\n\
-Report bugs to <bug-glibc@gnu.ai.mit.edu>."),
+Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
 	    __progname);
 
   exit (status);

locale/programs/localedef.c

@@ -174,7 +174,7 @@ main (int argc, char *argv[])
   if (do_version)
     {
       fprintf (stderr, "%s - GNU %s %s\n", program_invocation_short_name,
-	       "libc", VERSION);
+	       PACKAGE, VERSION);
       exit (0);
     }
 
@@ -397,7 +397,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 System's directory for character maps: %s\n\
                        locale files  : %s\n\
-Report bugs to <bug-glibc@gnu.ai.mit.edu>."),
+Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
 	    program_invocation_name, CHARMAP_PATH, LOCALE_PATH);
 
   exit (status);

po/Makefile

@@ -32,7 +32,7 @@ LINGUAS = $(ALL_LINGUAS)
 endif
 
 # Text domain name to install under; must match ../locale/SYS_libc.c string.
-domainname = SYS_GNU_libc-$(version)
+domainname = libc
 
 # Get $(version) defined.
 include ../Makeconfig
@@ -45,7 +45,7 @@ mo-installed = $(localedir)/%/LC_MESSAGES/$(domainname).mo
 install-others = $(LINGUAS:%=$(mo-installed))
 
 # Files to distribute: all the source and compiled binary translation files.
-distribute = $(ALL_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) SYS_libc.pot
+distribute = $(ALL_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) libc.pot
 
 
 include ../Rules
@@ -58,7 +58,7 @@ include ../Rules
 %.mo: %.po
 	$(MSGFMT) -o $@ $<
 
-# Install the message object files as SYS_libc.po in the language directory.
+# Install the message object files as libc.po in the language directory.
 $(mo-installed): %.mo; $(do-install)
 
 .PHONY: linguas linguas.mo

po/SYS_libc.pot → po/libc.pot

@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 1.93\n"
-"POT-Creation-Date: 1996-08-29  1:37\n"
+"Project-Id-Version: libc 1.94\n"
+"POT-Creation-Date: 1996-09-08  3:45\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+DIST\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -275,7 +275,7 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: catgets/gencat.c:243
+#: catgets/gencat.c:244
 msgid "*standard input*"
 msgstr ""
 
@@ -568,6 +568,10 @@ msgstr ""
 msgid "Exec format error"
 msgstr ""
 
+#: locale/programs/localedef.c:207
+msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
+msgstr ""
+
 #: sunrpc/clnt_perr.c:290
 msgid "Failed (unspecified error)"
 msgstr ""
@@ -1403,7 +1407,8 @@ msgstr ""
 msgid "Transport endpoint is not connected"
 msgstr ""
 
-#: catgets/gencat.c:202 db/makedb.c:196
+#: catgets/gencat.c:202 db/makedb.c:197 locale/programs/locale.c:234
+#: locale/programs/localedef.c:383
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
@@ -1481,9 +1486,10 @@ msgid ""
 "  -V, --version       output version information and exit\n"
 "If INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n"
 "is -, output is written to standard output.\n"
+"Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"
 msgstr ""
 
-#: db/makedb.c:199
+#: db/makedb.c:200
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... INPUT-FILE OUTPUT-FILE\n"
@@ -1497,6 +1503,43 @@ msgid ""
 "  -u, --undo          print content of database file, one entry a line\n"
 "  -V, --version       output version information and exit\n"
 "If INPUT-FILE is -, input is read from standard input.\n"
+"Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"
+msgstr ""
+
+#: locale/programs/localedef.c:386
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... name\n"
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"  -c, --force               create output even if warning messages were "
+"issued\n"
+"  -h, --help                display this help and exit\n"
+"  -f, --charmap=FILE        symbolic character names defined in FILE\n"
+"  -i, --inputfile=FILE      source definitions are found in FILE\n"
+"  -u, --code-set-name=NAME  specify code set for mapping ISO 10646 elements\n"
+"  -v, --verbose             print more messages\n"
+"  -V, --version             output version information and exit\n"
+"      --posix               be strictly POSIX conform\n"
+"\n"
+"System's directory for character maps: %s\n"
+"                       locale files  : %s\n"
+"Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"
+msgstr ""
+
+#: locale/programs/locale.c:237
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... name\n"
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"  -h, --help            display this help and exit\n"
+"  -V, --version         output version information and exit\n"
+"\n"
+"  -a, --all-locales     write names of available locales\n"
+"  -m, --charmaps        write names of available charmaps\n"
+"\n"
+"  -c, --category-name   write names of selected categories\n"
+"  -k, --keyword-name    write names of selected keywords\n"
+"Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"
 msgstr ""
 
 #: posix/getconf.c:131
@@ -1623,6 +1666,11 @@ msgstr ""
 msgid "can't reassign procedure number %d\n"
 msgstr ""
 
+#: locale/programs/localedef.c:281
+#, c-format
+msgid "cannot `stat' locale file `%s'"
+msgstr ""
+
 #: locale/programs/ld-collate.c:1313
 #, c-format
 msgid "cannot insert collation element `%.*s'"
@@ -1637,17 +1685,22 @@ msgstr ""
 msgid "cannot insert new collating symbol definition: %s"
 msgstr ""
 
-#: db/makedb.c:148
+#: db/makedb.c:149
 #, c-format
 msgid "cannot open database file `%s': %s"
 msgstr ""
 
-#: catgets/gencat.c:249 db/makedb.c:167
+#: catgets/gencat.c:250 db/makedb.c:168
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr ""
 
-#: catgets/gencat.c:754 catgets/gencat.c:795 db/makedb.c:176
+#: locale/programs/localedef.c:215
+#, c-format
+msgid "cannot open locale definition file `%s'"
+msgstr ""
+
+#: catgets/gencat.c:755 catgets/gencat.c:796 db/makedb.c:177
 #, c-format
 msgid "cannot open output file `%s'"
 msgstr ""
@@ -1661,6 +1714,30 @@ msgstr ""
 msgid "cannot process order specification"
 msgstr ""
 
+#: locale/programs/locale.c:293
+#, c-format
+msgid "cannot read character map directory `%s'"
+msgstr ""
+
+#: locale/programs/locale.c:268
+#, c-format
+msgid "cannot read locale directory `%s'"
+msgstr ""
+
+#: locale/programs/localedef.c:303
+#, c-format
+msgid "cannot read locale file `%s'"
+msgstr ""
+
+#: locale/programs/localedef.c:328
+#, c-format
+msgid "cannot write output files to `%s'"
+msgstr ""
+
+#: locale/programs/localedef.c:371
+msgid "category data requested more than once: should not happen"
+msgstr ""
+
 #: locale/programs/ld-ctype.c:264
 #, c-format
 msgid "character %s'%s' in class `%s' must be in class `%s'"
@@ -1772,11 +1849,11 @@ msgstr ""
 msgid "duplicate definition for character `%.*s'"
 msgstr ""
 
-#: db/makedb.c:293
+#: db/makedb.c:295
 msgid "duplicate key"
 msgstr ""
 
-#: catgets/gencat.c:368
+#: catgets/gencat.c:369
 msgid "duplicate set definition"
 msgstr ""
 
@@ -1785,11 +1862,11 @@ msgstr ""
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr ""
 
-#: catgets/gencat.c:531
+#: catgets/gencat.c:532
 msgid "duplicated message identifier"
 msgstr ""
 
-#: catgets/gencat.c:504
+#: catgets/gencat.c:505
 msgid "duplicated message number"
 msgstr ""
 
@@ -1923,7 +2000,7 @@ msgstr ""
 msgid "illegal result type"
 msgstr ""
 
-#: catgets/gencat.c:341 catgets/gencat.c:418
+#: catgets/gencat.c:342 catgets/gencat.c:419
 msgid "illegal set number"
 msgstr ""
 
@@ -1937,7 +2014,7 @@ msgstr ""
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr ""
 
-#: db/makedb.c:150
+#: db/makedb.c:151
 msgid "incorrectly formatted file"
 msgstr ""
 
@@ -2014,7 +2091,12 @@ msgstr ""
 msgid "line too long"
 msgstr ""
 
-#: catgets/gencat.c:599
+#: locale/programs/localedef.c:275
+#, c-format
+msgid "locale file `%s', used in `copy' statement, not found"
+msgstr ""
+
+#: catgets/gencat.c:600
 msgid "malformed line ignored"
 msgstr ""
 
@@ -2067,6 +2149,10 @@ msgstr ""
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr ""
 
+#: locale/programs/localedef.c:334
+msgid "no output file produced because warning were issued"
+msgstr ""
+
 #: locale/programs/charmap.c:315 locale/programs/charmap.c:466
 #: locale/programs/charmap.c:545
 msgid "no symbolic name given"
@@ -2102,7 +2188,7 @@ msgstr ""
 msgid "preprocessor error"
 msgstr ""
 
-#: db/makedb.c:309
+#: db/makedb.c:311
 #, c-format
 msgid "problems while reading `%s'"
 msgstr ""
@@ -2338,7 +2424,7 @@ msgstr ""
 msgid "syntax error: not inside a locale definition section"
 msgstr ""
 
-#: catgets/gencat.c:370 catgets/gencat.c:506 catgets/gencat.c:533
+#: catgets/gencat.c:371 catgets/gencat.c:507 catgets/gencat.c:534
 msgid "this is the first definition"
 msgstr ""
 
@@ -2418,12 +2504,12 @@ msgstr ""
 msgid "unknown collation directive"
 msgstr ""
 
-#: catgets/gencat.c:467
+#: catgets/gencat.c:468
 #, c-format
 msgid "unknown directive `%s': line ignored"
 msgstr ""
 
-#: catgets/gencat.c:446
+#: catgets/gencat.c:447
 #, c-format
 msgid "unknown set `%s'"
 msgstr ""
@@ -2441,7 +2527,7 @@ msgstr ""
 msgid "unruly zone"
 msgstr ""
 
-#: catgets/gencat.c:951
+#: catgets/gencat.c:952
 msgid "unterminated message"
 msgstr ""
 
@@ -2526,19 +2612,19 @@ msgstr ""
 msgid "while opening UTMP file"
 msgstr ""
 
-#: catgets/gencat.c:978
+#: catgets/gencat.c:979
 msgid "while opening old catalog file"
 msgstr ""
 
-#: db/makedb.c:336
+#: db/makedb.c:338
 msgid "while reading database"
 msgstr ""
 
-#: db/makedb.c:298
+#: db/makedb.c:300
 msgid "while writing data base file"
 msgstr ""
 
-#: db/makedb.c:129
+#: db/makedb.c:130
 msgid "wrong number of arguments"
 msgstr ""
 

version.h

@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "alpha"
-#define VERSION "1.93"
+#define VERSION "1.94"