Update.

2002-04-18  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/locfile.c (to_archive): New variable.  To collect
	data which has to be added to the locale archive.
	(write_all_categories): Take new third parameter with locale name.
	Unless no_archive flag set add new locale data to the archive
	(write_locale_data): Unless no-archive flag set store generated data
	in to_archive data structure instead of generation output file.
	Add new parameter with locale category index.
	* locale/programs/locfile.h: Add new parameters in declaractions of
	write_all_categories and write_locale_data.
	* locale/programs/localedef.c: Recognize --no-archive, --list-archive,
	--add-to-archive, and --delete-from-archive options.  Pass extra
	parameter to write_all_categories.
	* locale/programs/localedef.h: Add prototypes for functions in
	locarchive.c.
	* locale/locarchive.h: New file.
	* locale/programs/locarchive.c: New file.
	* locale/Makefile (distribute): Add programs/locarchive.c and
	locarchive.h.
	(localedef-modules): Add md5 and locarchive.
	Add vpath to crypt subdir for md5.c.

	* locale/programs/ld-address.c: Pass locale category ID as new second
	parameter to write_locale_data.
	* locale/programs/ld-collate.c: Likewise.
	* locale/programs/ld-ctype.c: Likewise.
	* locale/programs/ld-identification.c: Likewise.
	* locale/programs/ld-measurement.c: Likewise.
	* locale/programs/ld-messages.c: Likewise.
	* locale/programs/ld-monetary.c: Likewise.
	* locale/programs/ld-name.c: Likewise.
	* locale/programs/ld-numeric.c: Likewise.
	* locale/programs/ld-paper.c: Likewise.
	* locale/programs/ld-telephone.c: Likewise.
	* locale/programs/ld-time.c: Likewise.

	* locale/simple-hash.c: Move compute_hashval function from here...
	* locale/hashval.h: ...to here.  New file.
	* locale/simple-hash.h: Add prototype for compute_hashval.

	* include/libintl.h: Minor cleanups.

	* elf/reldep7.c: New file.
	* elf/reldep7mod1.c: New file.
	* elf/reldep7mod2.c: New file.
	* elf/Makefile: Add rules to build and run reldep7.

1 files changed, 97 insertions, 0 deletions

diff --git a/locale/locarchive.h b/locale/locarchive.h
new file mode 100644
index 0000000..2005989
--- /dev/null
+++ b/locale/locarchive.h
@@ -0,0 +1,97 @@
+/* Definitions for locale archive handling.
+   Copyright (C) 2002 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.  */
+
+#ifndef _LOCARCHIVE_H
+#define _LOCARCHIVE_H 1
+
+#include <stdint.h>
+
+
+#define AR_MAGIC 0xde020109
+
+struct locarhead
+{
+  uint32_t magic;
+  /* Serial number.  */
+  uint32_t serial;
+  /* Name hash table.  */
+  uint32_t namehash_offset;
+  uint32_t namehash_used;
+  uint32_t namehash_size;
+  /* String table.  */
+  uint32_t string_offset;
+  uint32_t string_used;
+  uint32_t string_size;
+  /* Table with locale records.  */
+  uint32_t locrectab_offset;
+  uint32_t locrectab_used;
+  uint32_t locrectab_size;
+  /* MD5 sum hash table.  */
+  uint32_t sumhash_offset;
+  uint32_t sumhash_used;
+  uint32_t sumhash_size;
+};
+
+
+struct namehashent
+{
+  /* Hash value of the name.  */
+  uint32_t hashval;
+  /* Offset of the name in the string table.  */
+  uint32_t name_offset;
+  /* Offset of the locale record.  */
+  uint32_t locrec_offset;
+};
+
+
+struct sumhashent
+{
+  /* MD5 sum.  */
+  char sum[16];
+  /* Offset of the file in the archive.  */
+  uint32_t file_offset;
+};
+
+struct locrecent
+{
+  struct
+  {
+    uint32_t offset;
+    uint32_t len;
+  } record[__LC_LAST];
+};
+
+
+struct locarhandle
+{
+  int fd;
+  void *addr;
+  size_t len;
+};
+
+
+/* In memory data for the locales with their checksums.  */
+typedef struct
+{
+  off64_t size;
+  void *addr;
+  char sum[16];
+} locale_data_t[__LC_LAST];
+
+#endif	/* locarchive.h */