Changeset 183

Timestamp:

07/28/05 02:05:16 (7 years ago)

Author:

kickback

Message:

changes due to running "gettextize --force --copy --intl" version 0.14.5

Files:

• sweep/trunk/ABOUT-NLS (modified) (13 diffs)
• sweep/trunk/ChangeLog (modified) (1 diff)
• sweep/trunk/Makefile.am (modified) (1 diff)
• sweep/trunk/config.rpath (added)
• sweep/trunk/intl/ChangeLog (modified) (1 diff)
• sweep/trunk/intl/Makefile.in (modified) (16 diffs)
• sweep/trunk/intl/VERSION (modified) (1 diff)
• sweep/trunk/intl/bindtextdom.c (modified) (15 diffs)
• sweep/trunk/intl/cat-compat.c (deleted)
• sweep/trunk/intl/config.charset (added)
• sweep/trunk/intl/dcgettext.c (modified) (5 diffs)
• sweep/trunk/intl/dcigettext.c (added)
• sweep/trunk/intl/dcngettext.c (added)
• sweep/trunk/intl/dgettext.c (modified) (5 diffs)
• sweep/trunk/intl/dngettext.c (added)
• sweep/trunk/intl/eval-plural.h (added)
• sweep/trunk/intl/explodename.c (modified) (4 diffs)
• sweep/trunk/intl/finddomain.c (modified) (5 diffs)
• sweep/trunk/intl/gettext.c (modified) (4 diffs)
• sweep/trunk/intl/gettext.h (deleted)
• sweep/trunk/intl/gettextP.h (modified) (5 diffs)
• sweep/trunk/intl/gmo.h (added)
• sweep/trunk/intl/hash-string.h (modified) (4 diffs)
• sweep/trunk/intl/intl-compat.c (modified) (4 diffs)
• sweep/trunk/intl/l10nflist.c (modified) (19 diffs)
• sweep/trunk/intl/langprefs.c (added)
• sweep/trunk/intl/libgettext.h (deleted)
• sweep/trunk/intl/libgnuintl.h.in (added)
• sweep/trunk/intl/loadinfo.h (modified) (4 diffs)
• sweep/trunk/intl/loadmsgcat.c (modified) (16 diffs)
• sweep/trunk/intl/localcharset.c (added)
• sweep/trunk/intl/localcharset.h (added)
• sweep/trunk/intl/locale.alias (added)
• sweep/trunk/intl/localealias.c (modified) (20 diffs)
• sweep/trunk/intl/localename.c (added)
• sweep/trunk/intl/log.c (added)
• sweep/trunk/intl/ngettext.c (added)
• sweep/trunk/intl/os2compat.c (added)
• sweep/trunk/intl/os2compat.h (added)
• sweep/trunk/intl/osdep.c (added)
• sweep/trunk/intl/plural-exp.c (added)
• sweep/trunk/intl/plural-exp.h (added)
• sweep/trunk/intl/plural.c (added)
• sweep/trunk/intl/plural.y (added)
• sweep/trunk/intl/po2tbl.sed.in (deleted)
• sweep/trunk/intl/printf-args.c (added)
• sweep/trunk/intl/printf-args.h (added)
• sweep/trunk/intl/printf-parse.c (added)
• sweep/trunk/intl/printf-parse.h (added)
• sweep/trunk/intl/printf.c (added)
• sweep/trunk/intl/ref-add.sin (added)
• sweep/trunk/intl/ref-del.sin (added)
• sweep/trunk/intl/relocatable.c (added)
• sweep/trunk/intl/relocatable.h (added)
• sweep/trunk/intl/textdomain.c (modified) (6 diffs)
• sweep/trunk/intl/vasnprintf.c (added)
• sweep/trunk/intl/vasnprintf.h (added)
• sweep/trunk/intl/vasnwprintf.h (added)
• sweep/trunk/intl/wprintf-parse.h (added)
• sweep/trunk/intl/xopen-msg.sed (deleted)
• sweep/trunk/intl/xsize.h (added)
• sweep/trunk/m4/Makefile.am (modified) (1 diff)
• sweep/trunk/m4/codeset.m4 (added)
• sweep/trunk/m4/gettext.m4 (added)
• sweep/trunk/m4/glibc2.m4 (added)
• sweep/trunk/m4/glibc21.m4 (added)
• sweep/trunk/m4/iconv.m4 (added)
• sweep/trunk/m4/intdiv0.m4 (added)
• sweep/trunk/m4/intmax.m4 (added)
• sweep/trunk/m4/inttypes-pri.m4 (added)
• sweep/trunk/m4/inttypes.m4 (added)
• sweep/trunk/m4/inttypes_h.m4 (added)
• sweep/trunk/m4/isc-posix.m4 (added)
• sweep/trunk/m4/lcmessage.m4 (added)
• sweep/trunk/m4/lib-ld.m4 (added)
• sweep/trunk/m4/lib-link.m4 (added)
• sweep/trunk/m4/lib-prefix.m4 (added)
• sweep/trunk/m4/longdouble.m4 (added)
• sweep/trunk/m4/longlong.m4 (added)
• sweep/trunk/m4/nls.m4 (added)
• sweep/trunk/m4/po.m4 (added)
• sweep/trunk/m4/printf-posix.m4 (added)
• sweep/trunk/m4/progtest.m4 (added)
• sweep/trunk/m4/signed.m4 (added)
• sweep/trunk/m4/size_max.m4 (added)
• sweep/trunk/m4/stdint_h.m4 (added)
• sweep/trunk/m4/uintmax_t.m4 (added)
• sweep/trunk/m4/ulonglong.m4 (added)
• sweep/trunk/m4/wchar_t.m4 (added)
• sweep/trunk/m4/wint_t.m4 (added)
• sweep/trunk/m4/xsize.m4 (added)
• sweep/trunk/mkinstalldirs (added)
• sweep/trunk/po/ChangeLog (modified) (1 diff)
• sweep/trunk/po/Makefile.in.in (modified) (8 diffs)
• sweep/trunk/po/Makevars (added)
• sweep/trunk/po/Rules-quot (added)
• sweep/trunk/po/boldquot.sed (added)
• sweep/trunk/po/cat-id-tbl.c (deleted)
• sweep/trunk/po/en@boldquot.header (added)
• sweep/trunk/po/en@quot.header (added)
• sweep/trunk/po/insert-header.sin (added)
• sweep/trunk/po/quot.sed (added)
• sweep/trunk/po/remove-potcdate.sin (added)
• sweep/trunk/po/stamp-cat-id (deleted)

sweep/trunk/ABOUT-NLS

@@ -1 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-   If you found this `ABOUT-NLS' file inside a distribution, you may
@@ -16 +17 @@
-explain how users should proceed for getting the programs to use the
-available translations.  They tell how people wanting to contribute and
-at translations should
+on translations can
-
-   When reporting bugs in the `intl/' directory or bugs which may be
@@ -23 +24 @@
-`intl/VERSION' file, in internationalized packages.
-
-
-
-
-   
+1.1 
+====
+
+
-should configure it using
-
@@ -46 +47 @@
-included `libintl'.
-
-
-
-
-
-
-
-ways to 
+1.2 
+====
+
+
+
+
+
-
-   By default, this package will be installed to allow translation of
-messages.  It will automatically detect whether the system already
-GNU `gettext' own
-
-
-
-
-
+included GNU
+
+
+
+
+the default 
-
-     ./configure --with-included-gettext
-     ./configure --disable-nls
-
- respectively
+, respectively,
-internationalizing routines provided within this package, or else,
-_totally_ disable translation of messages.
@@ -73 +74 @@
-configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-be not what is desirable.  You
-
-if the file `intl/VERSION' shows that the library which comes with th
-package is 
+not be desirable.  You should use
+
+`intl/VERSION' shows that the library which comes with this package 
+
-
-     ./configure --with-included-gettext
@@ -87 +88 @@
-extensions of the GNU `gettext' library.
-
-have usually
+usually have
-LL gives an ISO 639 two-letter code identifying the language.  Unless
-translations have been forbidden at `configure' time by using the
@@ -96 +97 @@
-codes, stating which languages are allowed.
-
-
-
-
-   
+1.3 
+====
+
+
-only have to set the `LANG' environment variable to the appropriate
-`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
@@ -113 +114 @@
-example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
-country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your country by running the command
+`locale -a | grep '^LL''.
-
-   Not all programs have translations for all languages.  By default, an
@@ -125 +133 @@
-available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
-
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
-   In the `LANGUAGE' environment variable, but not in the `LANG'
-environment variable, `LL_CC' combinations can be abbreviated as `LL'
@@ -131 +146 @@
-(Portuguese as spoken in Portugal) in this context.
-
-
-
-
-   
+1.4 
+====
+
+
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
@@ -161 +176 @@
-programming skill, here.
-
-
-
-
-   
-September
-
-PO 
+1.5 
+====
+
+
+May 2005.
+
+
-translation percentage of at least 50%.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-   Some counters in the preceding matrix are higher than the number of
@@ -299 +971 @@
-distribution.
-
-September 2001 seems to be old, you may fetch a more recent copy
-
-up-to-date 
+May 2005 seems to be old, you may fetch a more recent copy of
+
+
-`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
-
-
-
-
-   
+1.6 
+====
+
+
-internationalize it you are welcome to use GNU `gettext' in your
-package.  Of course you have to respect the GNU Library General Public
@@ -316 +988 @@
-
-   Once the sources are changed appropriately and the setup can handle
-o
+he
-Free Translation Project is also available for packages which are not
-developed inside the GNU project.  Therefore the information given above

sweep/trunk/ChangeLog

@@ +1 @@
+2005-07-27  gettextize  <bug-gnu-gettext@gnu.org>
+
+        * m4/codeset.m4: New file, from gettext-0.14.5.
+        * m4/gettext.m4: New file, from gettext-0.14.5.
+        * m4/glibc2.m4: New file, from gettext-0.14.5.
+        * m4/glibc21.m4: New file, from gettext-0.14.5.
+        * m4/iconv.m4: New file, from gettext-0.14.5.
+        * m4/intdiv0.m4: New file, from gettext-0.14.5.
+        * m4/intmax.m4: New file, from gettext-0.14.5.
+        * m4/inttypes.m4: New file, from gettext-0.14.5.
+        * m4/inttypes_h.m4: New file, from gettext-0.14.5.
+        * m4/inttypes-pri.m4: New file, from gettext-0.14.5.
+        * m4/isc-posix.m4: New file, from gettext-0.14.5.
+        * m4/lcmessage.m4: New file, from gettext-0.14.5.
+        * m4/lib-ld.m4: New file, from gettext-0.14.5.
+        * m4/lib-link.m4: New file, from gettext-0.14.5.
+        * m4/lib-prefix.m4: New file, from gettext-0.14.5.
+        * m4/longdouble.m4: New file, from gettext-0.14.5.
+        * m4/longlong.m4: New file, from gettext-0.14.5.
+        * m4/nls.m4: New file, from gettext-0.14.5.
+        * m4/po.m4: New file, from gettext-0.14.5.
+        * m4/printf-posix.m4: New file, from gettext-0.14.5.
+        * m4/progtest.m4: New file, from gettext-0.14.5.
+        * m4/signed.m4: New file, from gettext-0.14.5.
+        * m4/size_max.m4: New file, from gettext-0.14.5.
+        * m4/stdint_h.m4: New file, from gettext-0.14.5.
+        * m4/uintmax_t.m4: New file, from gettext-0.14.5.
+        * m4/ulonglong.m4: New file, from gettext-0.14.5.
+        * m4/wchar_t.m4: New file, from gettext-0.14.5.
+        * m4/wint_t.m4: New file, from gettext-0.14.5.
+        * m4/xsize.m4: New file, from gettext-0.14.5.
+        * m4/Makefile.am (EXTRA_DIST): Add the new files.
+        * Makefile.am (EXTRA_DIST): Add config.rpath, mkinstalldirs.
+
-Fri Apr 30 15:06:10 EST 2004 Conrad Parker <conrad@metadecks.org>
-

sweep/trunk/Makefile.am

@@ -13 +13 @@
-pixmap_DATA = sweep.png
-
-
+config.rpath mkinstalldirs  
-             sweep.spec README.Solaris README.ALSA README.i18n acconfig.h TODO
-

sweep/trunk/intl/ChangeLog

@@ -1 @@
-1-09-13  GNU  <bug-gnu-utils
+5-05-23  GNU  <bug-gnu-gettext
-
-0.40
+4.5
-

sweep/trunk/intl/Makefile.in

@@ -1 @@
-in GNU NLS Utilities.
-, 2001
+library of GNU gettext
+-2005
-#
-# This program is free software; you can redistribute it and/or modify it
@@ -14 +14 @@
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-# USA.
-
@@ -25 +25 @@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-@srcdir@
+$(srcdir)
-
-prefix = @prefix@
@@ -41 +41 @@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-`case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+$(MKINSTALLDIRS)
-
-l = @INTL_LIBTOOL_SUFFIX_PREFIX@
@@ -53 +53 @@
-
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
-
+
+
+
+
+
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-DISTFILES.common = Makefile.in \
-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
-DISTFILES.generated = plural.c
-DISTFILES.normal = VERSION
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# Libtool's library version information for libintl.
@@ -84 +165 @@
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-1
-1
-0
+7
+3
+4
-
-.SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
+
-.c.o:
-        $(COMPILE) $<
-.c.lo:
-        $(LIBTOOL) --mode=compile $(COMPILE) $<
-
-.y.c:
@@ -99 +179 @@
-        rm -f $*.h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-libintl.h: libgnuintl.h
-$(srcdir)/
-
-
+
+
+$(srcdir)/
-        $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-        mv t-$@ $@
-
-check: all
-
-# This installation goal is only used in GNU gettext.  Packages which
-# only use the library should use install instead.
-
-# We must not install the libintl.h/libintl.a files if we are on a
@@ -143 +260 @@
-install: install-exec install-data
-install-exec: all
-test "$(PACKAGE)" = "gettext"
-INTLOBJS@' = '$(GETTOBJS)'
+{ test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; }
+USE_INCLUDED_LIBINTL@' = yes
-          $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-          $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
-          $(LIBTOOL) --mode=install \
-            $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+          if test "@RELOCATABLE@" = yes; then \
+            dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
+            if test -n "$$dependencies"; then \
+              rm -f $(DESTDIR)$(libdir)/libintl.la; \
+            fi; \
+          fi; \
+        else \
+          : ; \
+        fi
+        if test "$(PACKAGE)" = "gettext-tools" \
+           && test '@USE_INCLUDED_LIBINTL@' = no \
+           && test @GLIBC2@ != no; then \
+          $(mkinstalldirs) $(DESTDIR)$(libdir); \
+          $(LIBTOOL) --mode=install \
+            $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
+          rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+          $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+          $(LIBTOOL) --mode=uninstall \
+            rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
-        else \
-          : ; \
-        fi
-        if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-
+test @GLIBC21@ != no || 
-          temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-          dest=$(DESTDIR)$(libdir)/charset.alias; \
@@ -182 +318 @@
-        fi
-install-data: all
-
+-tools
-          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-          $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-          $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-
+.0
-          for file in $$dists; do \
-            $(INSTALL_DATA) $(srcdir)/$$file \
@@ -206 +342 @@
-        fi
-
+install-strip: install
+
+installdirs:
+        if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+           && test '@USE_INCLUDED_LIBINTL@' = yes; then \
+          $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+        else \
+          : ; \
+        fi
+        if test "$(PACKAGE)" = "gettext-tools" \
+           && test '@USE_INCLUDED_LIBINTL@' = no \
+           && test @GLIBC2@ != no; then \
+          $(mkinstalldirs) $(DESTDIR)$(libdir); \
+        else \
+          : ; \
+        fi
+        if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+          test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+          $(mkinstalldirs) $(DESTDIR)$(localedir); \
+        else \
+          : ; \
+        fi
+        if test "$(PACKAGE)" = "gettext-tools"; then \
+          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+        else \
+          : ; \
+        fi
+
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-test "$(PACKAGE)" = "gettext"
-INTLOBJS@' = '$(GETTOBJS)'
+{ test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; }
+USE_INCLUDED_LIBINTL@' = yes
-          rm -f $(DESTDIR)$(includedir)/libintl.h; \
-          $(LIBTOOL) --mode=uninstall \
-            rm -f $(DESTDIR)$(libdir)/libintl.$la; \
+        else \
+          : ; \
+        fi
+        if test "$(PACKAGE)" = "gettext-tools" \
+           && test '@USE_INCLUDED_LIBINTL@' = no \
+           && test @GLIBC2@ != no; then \
+          rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-        else \
-          : ; \
@@ -244 +415 @@
-          : ; \
-        fi
-
-
+-tools
+.0
-            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-          done; \
@@ -252 +423 @@
-        fi
-
-
+ ps pdf html
-
-$(OBJECTS): ../config.h libgnuintl.h
-
-
+
+
+
+
+
+
+
+
-
-tags: TAGS
@@ -263 +440 @@
-        here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
+ctags: CTAGS
+
+CTAGS: $(HEADERS) $(SOURCES)
+        here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
+
-id: ID
-
@@ -270 +452 @@
-
-mostlyclean:
-
-
+obj *.
+gnuintl.h lib
-        rm -f -r .libs _libs
-
@@ -278 +460 @@
-distclean: clean
-        rm -f Makefile ID TAGS
-gettext
+"gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"
-          rm -f ChangeLog.inst $(DISTFILES.normal); \
-        else \
@@ -293 +475 @@
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.

sweep/trunk/intl/VERSION

@@ -1 @@
-0.40
+4.5

sweep/trunk/intl/bindtextdom.c

@@ -1 +1 @@
-/* Implementation of the bindtextdomain(3) function
-, 2001
+-2003
-
-   This program is free software; you can redistribute it and/or modify it
@@ -14 +14 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -46 +46 @@
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-_nl_default_dirname__
-_nl_domain_bindings__
+libintl_nl_default_dirname
+libintl_nl_domain_bindings
-#endif
-
@@ -59 +59 @@
-/* Contains the default location of the message catalogs.  */
-extern const char _nl_default_dirname[];
+#ifdef _LIBC
+extern const char _nl_default_dirname_internal[] attribute_hidden;
+#else
+# define INTUSE(name) name
+#endif
-
-/* List with bindings of specific domains.  */
@@ -64 +69 @@
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-
+ attribute_hidden
-
-
@@ -78 +83 @@
-# endif
-#else
-
-
-
-
-
-
-
-
-
+
+
+
+
-/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
-   to be used for the DOMAINNAME message catalog.
@@ -94 +94 @@
-   modified nor returned.  */
-static void
-
-
-
-
+
+
-{
-  struct binding *binding;
@@ -147 +145 @@
-              if (strcmp (dirname, result) != 0)
-                {
-_nl_default_dirname
-_nl_default_dirname
+INTUSE(_nl_default_dirname)
+INTUSE(_nl_default_dirname)
-                  else
-                    {
@@ -163 +161 @@
-                  if (__builtin_expect (result != NULL, 1))
-                    {
-_nl_default_dirname
+INTUSE(_nl_default_dirname)
-                        free (binding->dirname);
-
@@ -217 +215 @@
-      /* Simply return the default values.  */
-      if (dirnamep)
-_nl_default_dirname
+INTUSE(_nl_default_dirname)
-      if (codesetp)
-        *codesetp = NULL;
@@ -239 +237 @@
-          if (dirname == NULL)
-            /* The default value.  */
-_nl_default_dirname
+INTUSE(_nl_default_dirname)
-          else
-            {
-_nl_default_dirname
-_nl_default_dirname
+INTUSE(_nl_default_dirname)
+INTUSE(_nl_default_dirname)
-              else
-                {
@@ -266 +264 @@
-      else
-        /* The default value.  */
-_nl_default_dirname
+INTUSE(_nl_default_dirname)
-
-      new_binding->codeset_cntr = 0;
@@ -322 +320 @@
-        {
-        failed_codeset:
-_nl_default_dirname
+INTUSE(_nl_default_dirname)
-            free (new_binding->dirname);
-        failed_dirname:
@@ -344 +342 @@
-   in DIRNAME rather than in the system locale data base.  */
-char *
-
-
-
+
-{
-  set_binding_values (domainname, &dirname, NULL);
@@ -355 +351 @@
-   DOMAINNAME message catalog will be returned.  */
-char *
-
-
-
+
-{
-  set_binding_values (domainname, NULL, &codeset);

sweep/trunk/intl/dcgettext.c

@@ -1 +1 @@
-/* Implementation of the dcgettext(3) function.
-, 2001
+-2003
-
-   This program is free software; you can redistribute it and/or modify it
@@ -14 +14 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -38 +38 @@
-# define DCIGETTEXT __dcigettext
-#else
-dcgettext__
-dcigettext__
+libintl_dcgettext
+libintl_dcigettext
-#endif
-
@@ -45 +45 @@
-   locale.  */
-char *
-
-
-
-
+
-{
-  return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
@@ -55 +52 @@
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
+INTDEF(__dcgettext)
-weak_alias (__dcgettext, dcgettext);
-#endif

sweep/trunk/intl/dgettext.c

@@ -1 +1 @@
-/* Implementation of the dgettext(3) function.
-, 2001
+-2003
-
-   This program is free software; you can redistribute it and/or modify it
@@ -14 +14 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -21 +21 @@
-#endif
-
+#include "gettextP.h"
+
-#include <locale.h>
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
@@ -38 +39 @@
-#ifdef _LIBC
-# define DGETTEXT __dgettext
-__dcgettext
+INTUSE(__dcgettext)
-#else
-dgettext__
-dcgettext__
+libintl_dgettext
+libintl_dcgettext
-#endif
-
@@ -47 +48 @@
-   LC_MESSAGES locale.  */
-char *
-
-
-
+
-{
-  return DCGETTEXT (domainname, msgid, LC_MESSAGES);

sweep/trunk/intl/explodename.c

@@ -1 @@
-, 2001
+-2001, 2003
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
@@ -14 +14 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -39 +39 @@
-
-char *
-
-
+
-{
-  while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
@@ -51 +50 @@
-
-int
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-{
-  enum { undecided, xpg, cen } syntax;

sweep/trunk/intl/finddomain.c

@@ -1 +1 @@
-/* Handle list of needed message catalogs
-, 2001
+-2001, 2003
-   Written by Ulrich Drepper <drepper@gnu.org>, 1995.
-
@@ -15 +15 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -48 +48 @@
-struct loaded_l10nfile *
-internal_function
-
-
-
-
-
+
+
-{
-  struct loaded_l10nfile *retval;
@@ -179 +176 @@
-
-#ifdef _LIBC
-
-
+
-{
-  struct loaded_l10nfile *runp = _nl_loaded_domains;
@@ -194 +190 @@
-    }
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif

sweep/trunk/intl/gettext.c

@@ -1 +1 @@
-/* Implementation of gettext(3) function.
-, 2001
+-2003
-
-   This program is free software; you can redistribute it and/or modify it
@@ -14 +14 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -43 +43 @@
-#ifdef _LIBC
-# define GETTEXT __gettext
-__dcgettext
+INTUSE(__dcgettext)
-#else
-gettext__
-dcgettext__
+libintl_gettext
+libintl_dcgettext
-#endif
-
@@ -53 +53 @@
-   text).  */
-char *
-
-
+
-{
-  return DCGETTEXT (NULL, msgid, LC_MESSAGES);

sweep/trunk/intl/gettextP.h

@@ -1 +1 @@
-/* Header describing internals of libintl library.
-, 2001
+-2005
-   Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
-
@@ -15 +15 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -33 +33 @@
-#include "loadinfo.h"
-
-ettext
+mo
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
+#endif
+
+#ifndef attribute_hidden
+# define attribute_hidden
-#endif
-
@@ -73 +69 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-};
-
-/* This is the data structure to pass information to the parser and get
-   the result in a thread-safe way.  */
-struct parse_args
-{
-  const char *cp;
-  struct expression *res;
-};
-
-
-/* The representation of an opened message catalog.  */
-struct loaded_domain
-{
+  /* Pointer to memory containing the .mo file.  */
-  const char *data;
+  /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed.  */
-  int use_mmap;
+  /* Size of mmap()ed memory.  */
-  size_t mmap_size;
+  /* 1 if the .mo file uses a different endianness than this machine.  */
-  int must_swap;
+  /* Pointer to additional malloc()ed memory.  */
+  void *malloced;
+
+  /* Number of static strings pairs.  */
-  nls_uint32 nstrings;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  nls_uint32 hash_size;
-
+
+
+
+
+
-  int codeset_cntr;
-#ifdef _LIBC
@@ -168 +151 @@
-extern int _nl_msg_cat_cntr;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif
-

sweep/trunk/intl/hash-string.h

@@ -1 +1 @@
-/* Description of GNU message catalog format: string hashing function.
-, 1998, 2000, 2001
+-1998, 2000-2003
-
-   This program is free software; you can redistribute it and/or modify it
@@ -14 +14 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-/* We assume to have `unsigned long int' value with at least 32 bits.  */
@@ -34 +26 @@
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long int hash_string PARAMS ((const char *__str_param));
-
-static inline unsigned long int
-
-
+
-{
-  unsigned long int hval, g;
@@ -48 +37 @@
-    {
-      hval <<= 4;
-long int
+char
-      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
-      if (g != 0)

sweep/trunk/intl/intl-compat.c

@@ -1 +1 @@
-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
-   Library.
-, 2001
+-2003
-
-   This program is free software; you can redistribute it and/or modify it
@@ -15 +15 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -22 +22 @@
-#endif
-
-#include "libgnuintl.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
@@ -81 +47 @@
-
-
+/* When building a DLL, we must export some functions.  Note that because
+   the functions are only defined for binary backward compatibility, we
+   don't need to use __declspec(dllimport) in any case.  */
+#if defined _MSC_VER && BUILDING_DLL
+# define DLL_EXPORTED __declspec(dllexport)
+#else
+# define DLL_EXPORTED
+#endif
+
+
+DLL_EXPORTED
-char *
-
-
+
-{
-gettext__
+libintl_gettext
-}
-
-
+DLL_EXPORTED
-char *
-
-
-
+
-{
-dgettext__
+libintl_dgettext
-}
-
-
+DLL_EXPORTED
-char *
-
-
-
-
+
-{
-dcgettext__
+libintl_dcgettext
-}
-
-
+DLL_EXPORTED
-char *
-
-
-
-
+
-{
-ngettext__
+libintl_ngettext
-}
-
-
+DLL_EXPORTED
-char *
-
-
-
-
-
+
+
-{
-dngettext__
+libintl_dngettext
-}
-
-
+DLL_EXPORTED
-char *
-
-
-
-
-
-
+
+
+
-{
-dcngettext__
+libintl_dcngettext
-}
-
-
+DLL_EXPORTED
-char *
-
-
+
-{
-textdomain__
+libintl_textdomain
-}
-
-
+DLL_EXPORTED
-char *
-
-
-
+
-{
-bindtextdomain__
+libintl_bindtextdomain
-}
-
-
+DLL_EXPORTED
-char *
-
-
-
+
-{
-bind_textdomain_codeset__
+libintl_bind_textdomain_codeset
-}

sweep/trunk/intl/l10nflist.c

@@ -1 @@
-, 2001
+-2004
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
@@ -14 +14 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -29 +29 @@
-
-#include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined _LIBC || defined HAVE_ARGZ_H
@@ -64 +59 @@
-#else
-# ifndef HAVE_STPCPY
-PARAMS ((char *dest, const char *src)
+(char *dest, const char *src
-# endif
+#endif
+
+/* Pathname support.
+   ISSLASH(C)           tests whether C is a directory separator character.
+   IS_ABSOLUTE_PATH(P)  tests whether P is an absolute path.  If it is not,
+                        it may be concatenated to a directory pathname.
+ */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+# define HAS_DEVICE(P) \
+    ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
+     && (P)[1] == ':')
+# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
+#else
+  /* Unix */
+# define ISSLASH(C) ((C) == '/')
+# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
-#endif
-
@@ -72 +85 @@
-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
-/* Returns the number of strings in ARGZ.  */
-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
-
-static size_t
-
-
-
+
-{
-  size_t count = 0;
@@ -91 +100 @@
-# undef __argz_count
-# define __argz_count(argz, len) argz_count__ (argz, len)
+#else
+# ifdef _LIBC
+#  define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
+# endif
-#endif  /* !_LIBC && !HAVE___ARGZ_COUNT */
-
@@ -96 +109 @@
-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
-   except the last into the character SEP.  */
-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
-
-static void
-
-
-
-
+
-{
-  while (len > 0)
@@ -115 +123 @@
-# undef __argz_stringify
-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
+#else
+# ifdef _LIBC
+#  define __argz_stringify(argz, len, sep) \
+  INTUSE(__argz_stringify) (argz, len, sep)
+# endif
-#endif  /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
-                                  const char *entry));
-
-static char *
-
-
-
-
+
-{
-  if (entry)
@@ -146 +153 @@
-
-/* Return number of bits set in X.  */
-static int pop PARAMS ((int x));
-
-static inline int
-
-
+
-{
-  /* We assume that no more than 16 bits are used.  */
@@ -163 +167 @@
-
-struct loaded_l10nfile *
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-{
-  char *abs_filename;
-last = NULL
+*lastp
-  struct loaded_l10nfile *retval;
-  char *cp;
+  size_t dirlist_count;
-  size_t entries;
-  int cnt;
+
+  /* If LANGUAGE contains an absolute directory specification, we ignore
+     DIRLIST.  */
+  if (IS_ABSOLUTE_PATH (language))
+    dirlist_len = 0;
-
-  /* Allocate room for the full file name.  */
@@ -205 +205 @@
-                                      || (mask & CEN_REVISION) != 0)
-                                     ? (1 + ((mask & CEN_SPONSOR) != 0
-+ 1 
+
-                                        + ((mask & CEN_REVISION) != 0
-                                           ? strlen (revision) + 1 : 0)) : 0)
@@ -213 +213 @@
-    return NULL;
-
-  retval = NULL;
-  last = NULL;
-
-  /* Construct file name.  */
-
-
-
-
+
+
+
+
+
+
+
+
+
-  cp = stpcpy (cp, language);
-
@@ -267 +269 @@
-  /* Look in list of already loaded domains whether it is already
-     available.  */
- = NULL
+p = l10nfile_list
-  for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
-    if (retval->filename != NULL)
@@ -282 +284 @@
-          }
-
- = retval
+p = &retval->next
-      }
-
@@ -291 +293 @@
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
-  if (retval == NULL)
-    return NULL;
-
-  retval->filename = abs_filename;
-
+
+
+
+
+
+
-                     || ((mask & XPG_CODESET) != 0
-                         && (mask & XPG_NORM_CODESET) != 0));
-  retval->data = NULL;
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-  entries = 0;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if ((cnt & ~mask) == 0
-        && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
-        && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
-      {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          retval->successor[entries++]
-, strlen (dir) + 1, cnt
-
+list, dirlist_len
+cnt, 
-                                  normalized_codeset, modifier, special,
-                                  sponsor, revision, filename, 1);
@@ -346 +366 @@
-   freed by the caller.  */
-const char *
-
-
-
+
-{
-  int len = 0;
@@ -357 +375 @@
-
-  for (cnt = 0; cnt < name_len; ++cnt)
-
+(unsigned char) 
-      {
-        ++len;
-
-
+(unsigned char) 
-          only_digit = 0;
-      }
@@ -375 +393 @@
-
-      for (cnt = 0; cnt < name_len; ++cnt)
-
-
-
+(unsigned char) 
+(unsigned char) 
+(unsigned char) 
-          *wp++ = codeset[cnt];
-
@@ -395 +413 @@
-#if !_LIBC && !HAVE_STPCPY
-static char *
-
-
-
+
-{
-  while ((*dest++ = *src++) != '\0')

sweep/trunk/intl/loadinfo.h

@@ -1 @@
-, 2001
+-2003
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -15 +15 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -21 +21 @@
-#define _LOADINFO_H     1
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-#ifndef internal_function
@@ -78 +82 @@
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
-PARAMS (
-         size_t name_len)
+
+  size_t name_len
-
+/* Lookup a locale dependent file.
+   *L10NFILE_LIST denotes a pool of lookup results of locale dependent
+   files of the same kind, sorted in decreasing order of ->filename.
+   DIRLIST and DIRLIST_LEN are an argz list of directories in which to
+   look, containing at least one directory (i.e. DIRLIST_LEN > 0).
+   MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER,
+   SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as
+   produced by _nl_explode_name().  FILENAME is the filename suffix.
+   The return value is the lookup result, either found in *L10NFILE_LIST,
+   or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
+   If the return value is non-NULL, it is added to *L10NFILE_LIST, and
+   its ->next field denotes the chaining inside *L10NFILE_LIST, and
+   furthermore its ->successor[] field contains a list of other lookup
+   results from which this lookup result inherits.  */
-extern struct loaded_l10nfile *
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+/* Lookup the real locale name for a locale alias NAME, or NULL if
+   NAME is not a locale alias (but possibly a real locale name).
+   The return value is statically allocated and must not be freed.  */
+extern const char *_nl_expand_alias (const char *name);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-#endif  /* loadinfo.h */

sweep/trunk/intl/loadmsgcat.c

@@ -1 +1 @@
-/* Load needed message catalogs.
-, 2001
+-2004
-
-   This program is free software; you can redistribute it and/or modify it
@@ -14 +14 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -35 +35 @@
-
-#ifdef __GNUC__
+# undef  alloca
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-
-
+
+
+
-# else
-
+
+
+
+
- #pragma alloca
-
-
+ 
+ 
-char *alloca ();
+#    endif
-#   endif
-#  endif
@@ -72 +78 @@
-#endif
-
-
+
+
+
+
+
+
+
+
-#include "gettextP.h"
+#include "hash-string.h"
+#include "plural-exp.h"
-
-#ifdef _LIBC
-# include "../locale/localeinfo.h"
+#endif
+
+/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
+   Note that our fallback values need not be literal strings, because we don't
+   use them with preprocessor string concatenation.  */
+#if !defined PRId8 || PRI_MACROS_BROKEN
+# undef PRId8
+# define PRId8 "d"
+#endif
+#if !defined PRIi8 || PRI_MACROS_BROKEN
+# undef PRIi8
+# define PRIi8 "i"
+#endif
+#if !defined PRIo8 || PRI_MACROS_BROKEN
+# undef PRIo8
+# define PRIo8 "o"
+#endif
+#if !defined PRIu8 || PRI_MACROS_BROKEN
+# undef PRIu8
+# define PRIu8 "u"
+#endif
+#if !defined PRIx8 || PRI_MACROS_BROKEN
+# undef PRIx8
+# define PRIx8 "x"
+#endif
+#if !defined PRIX8 || PRI_MACROS_BROKEN
+# undef PRIX8
+# define PRIX8 "X"
+#endif
+#if !defined PRId16 || PRI_MACROS_BROKEN
+# undef PRId16
+# define PRId16 "d"
+#endif
+#if !defined PRIi16 || PRI_MACROS_BROKEN
+# undef PRIi16
+# define PRIi16 "i"
+#endif
+#if !defined PRIo16 || PRI_MACROS_BROKEN
+# undef PRIo16
+# define PRIo16 "o"
+#endif
+#if !defined PRIu16 || PRI_MACROS_BROKEN
+# undef PRIu16
+# define PRIu16 "u"
+#endif
+#if !defined PRIx16 || PRI_MACROS_BROKEN
+# undef PRIx16
+# define PRIx16 "x"
+#endif
+#if !defined PRIX16 || PRI_MACROS_BROKEN
+# undef PRIX16
+# define PRIX16 "X"
+#endif
+#if !defined PRId32 || PRI_MACROS_BROKEN
+# undef PRId32
+# define PRId32 "d"
+#endif
+#if !defined PRIi32 || PRI_MACROS_BROKEN
+# undef PRIi32
+# define PRIi32 "i"
+#endif
+#if !defined PRIo32 || PRI_MACROS_BROKEN
+# undef PRIo32
+# define PRIo32 "o"
+#endif
+#if !defined PRIu32 || PRI_MACROS_BROKEN
+# undef PRIu32
+# define PRIu32 "u"
+#endif
+#if !defined PRIx32 || PRI_MACROS_BROKEN
+# undef PRIx32
+# define PRIx32 "x"
+#endif
+#if !defined PRIX32 || PRI_MACROS_BROKEN
+# undef PRIX32
+# define PRIX32 "X"
+#endif
+#if !defined PRId64 || PRI_MACROS_BROKEN
+# undef PRId64
+# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
+#endif
+#if !defined PRIi64 || PRI_MACROS_BROKEN
+# undef PRIi64
+# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
+#endif
+#if !defined PRIo64 || PRI_MACROS_BROKEN
+# undef PRIo64
+# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
+#endif
+#if !defined PRIu64 || PRI_MACROS_BROKEN
+# undef PRIu64
+# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
+#endif
+#if !defined PRIx64 || PRI_MACROS_BROKEN
+# undef PRIx64
+# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
+#endif
+#if !defined PRIX64 || PRI_MACROS_BROKEN
+# undef PRIX64
+# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
+#endif
+#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
+# undef PRIdLEAST8
+# define PRIdLEAST8 "d"
+#endif
+#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
+# undef PRIiLEAST8
+# define PRIiLEAST8 "i"
+#endif
+#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
+# undef PRIoLEAST8
+# define PRIoLEAST8 "o"
+#endif
+#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
+# undef PRIuLEAST8
+# define PRIuLEAST8 "u"
+#endif
+#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
+# undef PRIxLEAST8
+# define PRIxLEAST8 "x"
+#endif
+#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
+# undef PRIXLEAST8
+# define PRIXLEAST8 "X"
+#endif
+#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
+# undef PRIdLEAST16
+# define PRIdLEAST16 "d"
+#endif
+#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
+# undef PRIiLEAST16
+# define PRIiLEAST16 "i"
+#endif
+#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
+# undef PRIoLEAST16
+# define PRIoLEAST16 "o"
+#endif
+#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
+# undef PRIuLEAST16
+# define PRIuLEAST16 "u"
+#endif
+#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
+# undef PRIxLEAST16
+# define PRIxLEAST16 "x"
+#endif
+#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
+# undef PRIXLEAST16
+# define PRIXLEAST16 "X"
+#endif
+#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
+# undef PRIdLEAST32
+# define PRIdLEAST32 "d"
+#endif
+#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
+# undef PRIiLEAST32
+# define PRIiLEAST32 "i"
+#endif
+#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
+# undef PRIoLEAST32
+# define PRIoLEAST32 "o"
+#endif
+#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
+# undef PRIuLEAST32
+# define PRIuLEAST32 "u"
+#endif
+#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
+# undef PRIxLEAST32
+# define PRIxLEAST32 "x"
+#endif
+#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
+# undef PRIXLEAST32
+# define PRIXLEAST32 "X"
+#endif
+#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
+# undef PRIdLEAST64
+# define PRIdLEAST64 PRId64
+#endif
+#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
+# undef PRIiLEAST64
+# define PRIiLEAST64 PRIi64
+#endif
+#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
+# undef PRIoLEAST64
+# define PRIoLEAST64 PRIo64
+#endif
+#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
+# undef PRIuLEAST64
+# define PRIuLEAST64 PRIu64
+#endif
+#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
+# undef PRIxLEAST64
+# define PRIxLEAST64 PRIx64
+#endif
+#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
+# undef PRIXLEAST64
+# define PRIXLEAST64 PRIX64
+#endif
+#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
+# undef PRIdFAST8
+# define PRIdFAST8 "d"
+#endif
+#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
+# undef PRIiFAST8
+# define PRIiFAST8 "i"
+#endif
+#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
+# undef PRIoFAST8
+# define PRIoFAST8 "o"
+#endif
+#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
+# undef PRIuFAST8
+# define PRIuFAST8 "u"
+#endif
+#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
+# undef PRIxFAST8
+# define PRIxFAST8 "x"
+#endif
+#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
+# undef PRIXFAST8
+# define PRIXFAST8 "X"
+#endif
+#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
+# undef PRIdFAST16
+# define PRIdFAST16 "d"
+#endif
+#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
+# undef PRIiFAST16
+# define PRIiFAST16 "i"
+#endif
+#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
+# undef PRIoFAST16
+# define PRIoFAST16 "o"
+#endif
+#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
+# undef PRIuFAST16
+# define PRIuFAST16 "u"
+#endif
+#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
+# undef PRIxFAST16
+# define PRIxFAST16 "x"
+#endif
+#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
+# undef PRIXFAST16
+# define PRIXFAST16 "X"
+#endif
+#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
+# undef PRIdFAST32
+# define PRIdFAST32 "d"
+#endif
+#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
+# undef PRIiFAST32
+# define PRIiFAST32 "i"
+#endif
+#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
+# undef PRIoFAST32
+# define PRIoFAST32 "o"
+#endif
+#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
+# undef PRIuFAST32
+# define PRIuFAST32 "u"
+#endif
+#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
+# undef PRIxFAST32
+# define PRIxFAST32 "x"
+#endif
+#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
+# undef PRIXFAST32
+# define PRIXFAST32 "X"
+#endif
+#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
+# undef PRIdFAST64
+# define PRIdFAST64 PRId64
+#endif
+#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
+# undef PRIiFAST64
+# define PRIiFAST64 PRIi64
+#endif
+#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
+# undef PRIoFAST64
+# define PRIoFAST64 PRIo64
+#endif
+#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
+# undef PRIuFAST64
+# define PRIuFAST64 PRIu64
+#endif
+#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
+# undef PRIxFAST64
+# define PRIxFAST64 PRIx64
+#endif
+#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
+# undef PRIXFAST64
+# define PRIXFAST64 PRIX64
+#endif
+#if !defined PRIdMAX || PRI_MACROS_BROKEN
+# undef PRIdMAX
+# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
+#endif
+#if !defined PRIiMAX || PRI_MACROS_BROKEN
+# undef PRIiMAX
+# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
+#endif
+#if !defined PRIoMAX || PRI_MACROS_BROKEN
+# undef PRIoMAX
+# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
+#endif
+#if !defined PRIuMAX || PRI_MACROS_BROKEN
+# undef PRIuMAX
+# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
+#endif
+#if !defined PRIxMAX || PRI_MACROS_BROKEN
+# undef PRIxMAX
+# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
+#endif
+#if !defined PRIXMAX || PRI_MACROS_BROKEN
+# undef PRIXMAX
+# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
+#endif
+#if !defined PRIdPTR || PRI_MACROS_BROKEN
+# undef PRIdPTR
+# define PRIdPTR \
+  (sizeof (void *) == sizeof (long) ? "ld" : \
+   sizeof (void *) == sizeof (int) ? "d" : \
+   "lld")
+#endif
+#if !defined PRIiPTR || PRI_MACROS_BROKEN
+# undef PRIiPTR
+# define PRIiPTR \
+  (sizeof (void *) == sizeof (long) ? "li" : \
+   sizeof (void *) == sizeof (int) ? "i" : \
+   "lli")
+#endif
+#if !defined PRIoPTR || PRI_MACROS_BROKEN
+# undef PRIoPTR
+# define PRIoPTR \
+  (sizeof (void *) == sizeof (long) ? "lo" : \
+   sizeof (void *) == sizeof (int) ? "o" : \
+   "llo")
+#endif
+#if !defined PRIuPTR || PRI_MACROS_BROKEN
+# undef PRIuPTR
+# define PRIuPTR \
+  (sizeof (void *) == sizeof (long) ? "lu" : \
+   sizeof (void *) == sizeof (int) ? "u" : \
+   "llu")
+#endif
+#if !defined PRIxPTR || PRI_MACROS_BROKEN
+# undef PRIxPTR
+# define PRIxPTR \
+  (sizeof (void *) == sizeof (long) ? "lx" : \
+   sizeof (void *) == sizeof (int) ? "x" : \
+   "llx")
+#endif
+#if !defined PRIXPTR || PRI_MACROS_BROKEN
+# undef PRIXPTR
+# define PRIXPTR \
+  (sizeof (void *) == sizeof (long) ? "lX" : \
+   sizeof (void *) == sizeof (int) ? "X" : \
+   "llX")
-#endif
-
@@ -92 +465 @@
-#endif
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define PLURAL_PARSE __gettextparse
-#else
-# define PLURAL_PARSE gettextparse__
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
@@ -128 +491 @@
-#endif
-
+
-/* We need a sign, whether a new catalog was loaded, which can be associated
-   with all translations.  This is important if the translations are
@@ -133 +497 @@
-int _nl_msg_cat_cntr;
-
-
-
-
-
-
-
+
+
+
+
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
-#else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    }
+  /* Other system dependent strings are not valid.  */
+  return NULL;
-}
-
-# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
-
-#endif
-
-
-/* Initialize the codeset dependent parts of an opened message catalog.
@@ -205 +769 @@
-const char *
-internal_function
-
-
-
-
+
+
+
-{
-  /* Find out about the character set the file is encoded with.
@@ -269 +832 @@
-                {
-# ifdef _LIBC
-(*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string
+_NL_CURRENT (LC_CTYPE, CODESET)
-# else
-#  if HAVE_ICONV
@@ -289 +852 @@
-# else
-#  if HAVE_ICONV
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#   endif
-
-
-
-
+
-#  endif
-# endif
@@ -317 +887 @@
-void
-internal_function
-
-
+
-{
-  if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
@@ -338 +907 @@
-void
-internal_function
-
-
-
+
+
-{
-  int fd;
@@ -352 +920 @@
-  int use_mmap = 0;
-  struct loaded_domain *domain;
+  int revision;
-  const char *nullentry;
-
@@ -459 +1028 @@
-  domain->mmap_size = size;
-  domain->must_swap = data->magic != _MAGIC;
+  domain->malloced = NULL;
-
-  /* Fill in the information about the available tables.  */
-
+
+
+
-    {
-    case 0:
+    case 1:
-      domain->nstrings = W (domain->must_swap, data->nstrings);
-
+const 
-        ((char *) data + W (domain->must_swap, data->orig_tab_offset));
-
+const 
-        ((char *) data + W (domain->must_swap, data->trans_tab_offset));
-      domain->hash_size = W (domain->must_swap, data->hash_tab_size);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      break;
-    default:
-      /* This is an invalid revision.  */
+    invalid:
+      /* This is an invalid .mo file.  */
+      if (domain->malloced)
+        free (domain->malloced);
-#ifdef HAVE_MMAP
-      if (use_mmap)
@@ -492 +1392 @@
-
-  /* Also look for a plural specification.  */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -548 +1399 @@
-void
-internal_function
-
-
+
-{
-
+__gettext_
-    __gettext_free_exp (domain->plural);
-
-  _nl_free_domain_conv (domain);
+
+  if (domain->malloced)
+    free (domain->malloced);
-
-# ifdef _POSIX_MAPPED_FILES

sweep/trunk/intl/localealias.c

@@ -1 +1 @@
-/* Handle aliases for locale names.
-, 2001
+-2001, 2003
-
-   This program is free software; you can redistribute it and/or modify it
@@ -14 +14 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -30 +30 @@
-#include <ctype.h>
-#include <stdio.h>
+#if defined _LIBC || defined HAVE___FSETLOCKING
+# include <stdio_ext.h>
+#endif
-#include <sys/types.h>
-
-#ifdef __GNUC__
+# undef alloca
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-
-
+
+
+
-# else
-
+
+
+
+
- #pragma alloca
-
-
+ 
+ 
-char *alloca ();
+#    endif
-#   endif
-#  endif
@@ -50 +59 @@
-
-#include <stdlib.h>
-
-#include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#include "gettextP.h"
+
+#if ENABLE_RELOCATABLE
+# include "relocatable.h"
+#else
+# define relocate(pathname) (pathname)
+#endif
-
-/* @@ end of prolog @@ */
@@ -72 +81 @@
-# endif
-# define HAVE_MEMPCPY   1
+# define HAVE___FSETLOCKING     1
-
-/* We need locking here since we can be called from different places.  */
@@ -81 +91 @@
-#ifndef internal_function
-# define internal_function
+#endif
+
+/* Some optimizations for glibc.  */
+#ifdef _LIBC
+# define FEOF(fp)               feof_unlocked (fp)
+# define FGETS(buf, n, fp)      fgets_unlocked (buf, n, fp)
+#else
+# define FEOF(fp)               feof (fp)
+# define FGETS(buf, n, fp)      fgets (buf, n, fp)
-#endif
-
@@ -92 +111 @@
-#endif
-
-defined HAVE
+HAVE_DECL
-# undef fgets
-# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
-#endif
-defined HAVE
+HAVE_DECL
-# undef feof
-# define feof(s) feof_unlocked (s)
@@ -109 +128 @@
-
-
-
+
+
+
+
+
-static size_t string_space_act;
-static size_t string_space_max;
-static struct alias_map *map
+libc_freeres_ptr (static struct alias_map *map)
-static size_t nmap;
-static size_t maxmap;
@@ -118 +141 @@
-
-/* Prototypes for local functions.  */
-PARAMS ((const char *fname, int fname_len)
+(const char *fname, int fname_len
-     internal_function;
-PARAMS ((void)
-PARAMS (
-         const struct alias_map *map2)
+(void
+
+  const struct alias_map *map2
-
-
-const char *
-
-
+
-{
- = LOCALE_ALIAS_PATH
+
-  struct alias_map *retval;
-  const char *result = NULL;
@@ -138 +160 @@
-#endif
-
+  if (locale_alias_path == NULL)
+    locale_alias_path = LOCALE_ALIAS_PATH;
+
-  do
-    {
@@ -147 +172 @@
-        retval = (struct alias_map *) bsearch (&item, map, nmap,
-                                               sizeof (struct alias_map),
-PARAMS (
-        const void *)
+
+ const void *
-                                                ) alias_compare);
-      else
@@ -190 +215 @@
-static size_t
-internal_function
-
-
-
+
-{
-  FILE *fp;
@@ -208 +231 @@
-#endif
-
-full_fname
+relocate (full_fname)
-  freea (full_fname);
-  if (fp == NULL)
-    return 0;
-
+#ifdef HAVE___FSETLOCKING
+  /* No threads present.  */
+  __fsetlocking (fp, FSETLOCKING_BYCALLER);
+#endif
+
-  added = 0;
-feof
+FEOF
-    {
-      /* It is a reasonable approach to use a fix buffer here because
@@ -220 +248 @@
-         b) these fields must be usable as file names and so must not
-            be that long
-
-
+
+
+
+
-      char *alias;
-      char *value;
-      char *cp;
-
-fgets
+FGETS
-        /* EOF reached.  */
-        break;
-
-      /* Possibly not the whole line fits into the buffer.  Ignore
-         the rest of the line.  */
-      if (strchr (buf, '\n') == NULL)
-        {
-          char altbuf[BUFSIZ];
-          do
-            if (fgets (altbuf, sizeof altbuf, fp) == NULL)
-              /* Make sure the inner loop will be left.  The outer loop
-                 will exit at the `feof' test.  */
-              break;
-          while (strchr (altbuf, '\n') == NULL);
-        }
-
-      cp = buf;
-      /* Ignore leading white space.  */
-
+(unsigned char) 
-        ++cp;
-
@@ -252 +269 @@
-        {
-          alias = cp++;
-
+(unsigned char) 
-            ++cp;
-          /* Terminate alias name.  */
@@ -259 +276 @@
-
-          /* Now look for the beginning of the value.  */
-
+(unsigned char) 
-            ++cp;
-
@@ -268 +285 @@
-
-              value = cp++;
-
+(unsigned char) 
-                ++cp;
-              /* Terminate value.  */
@@ -326 +343 @@
-            }
-        }
+
+      /* Possibly not the whole line fits into the buffer.  Ignore
+         the rest of the line.  */
+      while (strchr (buf, '\n') == NULL)
+        if (FGETS (buf, sizeof buf, fp) == NULL)
+          /* Make sure the inner loop will be left.  The outer loop
+             will exit at the `feof' test.  */
+          break;
-    }
-
@@ -334 +359 @@
-  if (added > 0)
-    qsort (map, nmap, sizeof (struct alias_map),
-PARAMS ((const void *, const void *)
+(const void *, const void *
-
-  return added;
@@ -359 +384 @@
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (string_space != NULL)
-    free (string_space);
-  if (map != NULL)
-    free (map);
-}
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-
-static int
-
-
-
+
-{
-#if defined _LIBC || defined HAVE_STRCASECMP

sweep/trunk/intl/textdomain.c

@@ -1 +1 @@
-/* Implementation of the textdomain(3) function.
-, 2001
+-2003
-
-   This program is free software; you can redistribute it and/or modify it
@@ -14 +14 @@
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-9 Temple Place - Suite 330, Boston, MA 02111-1307
+1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-   USA.  */
-
@@ -45 +45 @@
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-_nl_default_default_domain__
-_nl_current_default_domain__
+libintl_nl_default_default_domain
+libintl_nl_current_default_domain
-#endif
-
@@ -52 +52 @@
-
-/* Name of the default text domain.  */
-
+ attribute_hidden
-
-/* Default text domain in which entries for gettext(3) are to be found.  */
-
+ attribute_hidden
-
-
@@ -68 +68 @@
-# endif
-#else
-textdomain__
+libintl_textdomain
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-
+ attribute_hidden
-
-/* Set the current default message catalog to DOMAINNAME.
@@ -78 +78 @@
-   If DOMAINNAME is "", reset to the default of "messages".  */
-char *
-
-
+
-{
-  char *new_domain;

sweep/trunk/m4/Makefile.am

@@ -1 +1 @@
-
-
+codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 
-        ogg.m4 \
-        speex.m4 \

sweep/trunk/po/ChangeLog

@@ +1 @@
+2005-07-27  gettextize  <bug-gnu-gettext@gnu.org>
+
+        * Makefile.in.in: Upgrade to gettext-0.14.5.
+        * boldquot.sed: New file, from gettext-0.14.5.
+        * en@boldquot.header: New file, from gettext-0.14.5.
+        * en@quot.header: New file, from gettext-0.14.5.
+        * insert-header.sin: New file, from gettext-0.14.5.
+        * quot.sed: New file, from gettext-0.14.5.
+        * remove-potcdate.sin: New file, from gettext-0.14.5.
+        * Rules-quot: New file, from gettext-0.14.5.
+        * cat-id-tbl.c: Remove file.
+        * stamp-cat-id: Remove file.
+
-2002-04-22  gettextize  <bug-gnu-utils@gnu.org>
-

sweep/trunk/po/Makefile.in.in

@@ -1 @@
-program source directory in GNU NLS utilities package
-, 2001
+PO directory in any package using GNU gettext
+-2005
-#
-
-
-
-
+
+
+
+
+
+
+
+
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-
-
-
+
-
-SHELL = /bin/sh
@@ -30 +31 @@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-
-
-
+
+
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge
-
-
-
-
-
-
-
-
+
+
+
+
-
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-
-
+
+
+
+
+
+
+
-
-POTFILES = \
@@ -55 +56 @@
-CATALOGS = @CATALOGS@
-
+# Makevars gets inserted here. (Don't remove this line!)
+
-.SUFFIXES:
-
-
-
-
-
-
-
-
+
-
-.po.mo:
-
+
+
-
-.po.gmo:
-
-
+
+
+
+
+
+
+
+
-
-
-all: all-@USE_NLS@
-
-$(CATALOGS)
+stamp-po
-all-no:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# otherwise packages like GCC can not be built if only parts of the source
-# have been downloaded.
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-          --files-from=$(srcdir)/POTFILES.in \
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -94 +158 @@
-install-exec:
-install-data: install-data-@USE_NLS@
-
+-tools
-          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-
-
+
+
+
+
+
+
+
-        else \
-          : ; \
@@ -107 +176 @@
-        for cat in $$catalogs; do \
-          cat=`basename $$cat`; \
-
+-e 
-          dir=$(localedir)/$$lang/LC_MESSAGES; \
-          $(mkinstalldirs) $(DESTDIR)$$dir; \
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        done
-
@@ -123 +259 @@
-installcheck:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        catalogs='$(CATALOGS)'; \
-        for cat in $$catalogs; do \
-          cat=`basename $$cat`; \
-
-
+
+
+
+
-        done
-        if test "$(PACKAGE)" = "gettext"; then \
-          rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-        else \
-          : ; \
-        fi
-
-check: all
-
-dvi info tags 
+info dvi ps pdf html tags TAGS ctags C
-
-mostlyclean:
-
+
+
+
-        rm -fr *.o
-
@@ -152 +298 @@
-        @echo "This command is intended for maintainers to use;"
-        @echo "it deletes files that may require special tools to rebuild."
-
+stamp-po 
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
@@ -159 +305 @@
-        @$(MAKE) dist2
-# This is a separate target because 'update-po' must be executed before.
-
+stamp-po 
-        dists="$(DISTFILES)"; \
+        if test "$(PACKAGE)" = "gettext-tools"; then \
+          dists="$$dists Makevars.template"; \
+        fi; \
+        if test -f $(srcdir)/$(DOMAIN).pot; then \
+          dists="$$dists $(DOMAIN).pot stamp-po"; \
+        fi; \
+        if test -f $(srcdir)/ChangeLog; then \
+          dists="$$dists ChangeLog"; \
+        fi; \
+        for i in 0 1 2 3 4 5 6 7 8 9; do \
+          if test -f $(srcdir)/ChangeLog.$$i; then \
+            dists="$$dists ChangeLog.$$i"; \
+          fi; \
+        done; \
+        if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-        for file in $$dists; do \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-          else \
-
-
+
-          fi; \
-        done
+
+update-po: Makefile
+        $(MAKE) $(DOMAIN).pot-update
+        test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
-        $(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+        @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+        echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+        exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+        @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+        if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+        tmpdir=`pwd`; \
+        echo "$$lang:"; \
+        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+        echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+        cd $(srcdir); \
+        if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+          if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+            rm -f $$tmpdir/$$lang.new.po; \
+          else \
+            if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+              :; \
+            else \
+              echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+              exit 1; \
+            fi; \
+          fi; \
+        else \
+          echo "msgmerge for $$lang.po failed!" 1>&2; \
+          rm -f $$tmpdir/$$lang.new.po; \
+        fi
+
+$(DUMMYPOFILES):
-
-update-gmo: Makefile $(GMOFILES)
-        @:
-
-$(top_builddir)/config.status POTFILES.in
+Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
-        cd $(top_builddir) \
-          && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-               $(SHELL) ./config.status
-
+force:
+
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.