diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | db/makedb.c | 363 | ||||
| -rw-r--r-- | localedata/ChangeLog | 2 | ||||
| -rw-r--r-- | localedata/Makefile | 8 |
5 files changed, 8 insertions, 370 deletions
diff --git a/ChangeLog b/ChangeLog index a20d42801c..9b4aebac83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ Remove rules to build makedb. * db/Versions: Rename libdb to libdb1. * include/db.h: If USE_LIBDB1 is defined include db/db.h. + * db/makedb.c: Removed. * scripts/versions.awk: Recognize digits in library names. @@ -23,6 +24,8 @@ * db/hash/hash_bigkey.c: Likewise. * db/recno/rec_close.c: Likewise. + * Makefile: Add localedata/% goal. + 1998-09-22 19:58 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * posix/execvp.c: Don't give up searching the PATH if execve diff --git a/Makefile b/Makefile index 21ae9d508a..711a5ac5db 100644 --- a/Makefile +++ b/Makefile @@ -282,7 +282,7 @@ FORCE: rpm/%: subdir_distinfo $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F) -iconvdata/%: +iconvdata/% localedata/%: $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F) # This is a special goal for people making binary distributions. Normally diff --git a/db/makedb.c b/db/makedb.c deleted file mode 100644 index c277da71e7..0000000000 --- a/db/makedb.c +++ /dev/null @@ -1,363 +0,0 @@ -/* Create simple DB database from textual input. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <argp.h> -#include <ctype.h> -#include <db.h> -#include <errno.h> -#include <error.h> -#include <fcntl.h> -#include <libintl.h> -#include <locale.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -/* Get libc version number. */ -#include "../version.h" - -#define PACKAGE _libc_intl_domainname - -/* If non-zero convert key to lower case. */ -static int to_lowercase; - -/* If non-zero print content of input file, one entry per line. */ -static int do_undo; - -/* If non-zero do not print informational messages. */ -static int be_quiet; - -/* Name of output file. */ -static const char *output_name; - -/* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); -void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; - -/* Definitions of arguments for argp functions. */ -static const struct argp_option options[] = -{ - { "fold-case", 'f', NULL, 0, N_("Convert key to lower case") }, - { "output", 'o', N_("NAME"), 0, N_("Write output to file NAME") }, - { "quiet", 'q', NULL, 0, - N_("Do not print messages while building database") }, - { "undo", 'u', NULL, 0, - N_("Print content of database file, one entry a line") }, - { NULL, 0, NULL, 0, NULL } -}; - -/* Short description of program. */ -static const char doc[] = N_("Create simple DB database from textual input."); - -/* Strings for arguments in help texts. */ -static const char args_doc[] = N_("\ -INPUT-FILE OUTPUT-FILE\n-o OUTPUT-FILE INPUT-FILE\n-u INPUT-FILE"); - -/* Prototype for option handler. */ -static error_t parse_opt __P ((int key, char *arg, struct argp_state *state)); - -/* Function to print some extra text in the help message. */ -static char *more_help __P ((int key, const char *text, void *input)); - -/* Data structure to communicate with argp functions. */ -static struct argp argp = -{ - options, parse_opt, args_doc, doc, NULL, more_help -}; - - -/* Prototypes for local functions. */ -static int process_input __P ((FILE *input, const char *inname, DB *output, - int to_lowercase, int be_quiet)); -static int print_database __P ((DB *db)); -int main __P ((int argc, char *argv[])); - - -int -main (argc, argv) - int argc; - char *argv[]; -{ - const char *input_name; - FILE *input_file; - DB *db_file; - int status; - int remaining; - - /* Set locale via LC_ALL. */ - setlocale (LC_ALL, ""); - - /* Set the text message domain. */ - textdomain (_libc_intl_domainname); - - /* Initialize local variables. */ - input_name = NULL; - - /* Parse and process arguments. */ - argp_parse (&argp, argc, argv, 0, &remaining, NULL); - - /* Determine file names. */ - if (do_undo || output_name != NULL) - { - if (remaining + 1 != argc) - { - wrong_arguments: - error (0, 0, gettext ("wrong number of arguments")); - argp_help (&argp, stdout, ARGP_HELP_SEE, - program_invocation_short_name); - exit (1); - } - input_name = argv[remaining]; - } - else - { - if (remaining + 2 != argc) - goto wrong_arguments; - - input_name = argv[remaining++]; - output_name = argv[remaining]; - } - - /* Special handling if we are asked to print the database. */ - if (do_undo) - { - db_file = dbopen (input_name, O_RDONLY, 0666, DB_BTREE, NULL); - if (db_file == NULL) - error (EXIT_FAILURE, 0, gettext ("cannot open database file `%s': %s"), - input_name, - errno == EFTYPE ? gettext ("incorrectly formatted file") - : strerror (errno)); - - status = print_database (db_file); - - db_file->close (db_file); - - return status; - } - - /* Open input file. */ - if (strcmp (input_name, "-") == 0 || strcmp (input_name, "/dev/stdin") == 0) - input_file = stdin; - else - { - input_file = fopen (input_name, "r"); - if (input_file == NULL) - error (EXIT_FAILURE, errno, gettext ("cannot open input file `%s'"), - input_name); - } - - /* Open output file. This must not be standard output so we don't - handle "-" and "/dev/stdout" special. */ - db_file = dbopen (output_name, O_CREAT | O_RDWR | O_TRUNC, 0666, - DB_BTREE, NULL); - if (db_file == NULL) - error (EXIT_FAILURE, errno, gettext ("cannot open output file `%s'")); - - /* Start the real work. */ - status = process_input (input_file, input_name, db_file, to_lowercase, - be_quiet); - - /* Close files. */ - if (input_file != stdin) - fclose (input_file); - db_file->close (db_file); - - return status; -} - - -/* Handle program arguments. */ -static error_t -parse_opt (int key, char *arg, struct argp_state *state) -{ - switch (key) - { - case 'f': - to_lowercase = 1; - break; - case 'o': - output_name = arg; - break; - case 'q': - be_quiet = 1; - break; - case 'u': - do_undo = 1; - break; - default: - return ARGP_ERR_UNKNOWN; - } - return 0; -} - - -static char * -more_help (int key, const char *text, void *input) -{ - switch (key) - { - case ARGP_KEY_HELP_EXTRA: - /* We print some extra information. */ - return strdup (gettext ("\ -Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n")); - default: - break; - } - return (char *) text; -} - -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state) -{ - fprintf (stream, "makedb (GNU %s) %s\n", PACKAGE, VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "1996, 1997"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - -static int -process_input (input, inname, output, to_lowercase, be_quiet) - FILE *input; - const char *inname; - DB *output; - int to_lowercase; - int be_quiet; -{ - char *line; - size_t linelen; - int status; - size_t linenr; - - line = NULL; - linelen = 0; - status = EXIT_SUCCESS; - linenr = 0; - - while (!feof (input)) - { - DBT key; - DBT val; - char *cp; - int n; - - n = getline (&line, &linelen, input); - if (n < 0) - /* This means end of file or some bug. */ - break; - if (n == 0) - /* Short read. Probably interrupted system call. */ - continue; - - ++linenr; - - if (line[n - 1] == '\n') - /* Remove trailing newline. */ - line[--n] = '\0'; - - cp = line; - while (isspace (*cp)) - ++cp; - - if (*cp == '#') - /* First non-space character in line '#': it's a comment. */ - continue; - - key.data = cp; - while (*cp != '\0' && !isspace (*cp)) - { - if (to_lowercase) - *cp = tolower (*cp); - ++cp; - } - - if (key.data == cp) - /* It's an empty line. */ - continue; - - key.size = cp - (char *) key.data; - - while (isspace (*cp)) - ++cp; - - val.data = cp; - val.size = &line[n] - cp; - - /* Store the value. */ - status = output->put (output, &key, &val, R_NOOVERWRITE); - if (status != 0) - { - if (status == 1) - { - if (!be_quiet) - error_at_line (0, 0, inname, linenr, - gettext ("duplicate key")); - /* This is no real error. Just give a warning. */ - status = 0; - } - else - error (0, errno, gettext ("while writing data base file")); - - status = status ? EXIT_FAILURE : EXIT_SUCCESS; - - clearerr (input); - break; - } - } - - if (ferror (input)) - { - error (0, 0, gettext ("problems while reading `%s'")); - status = EXIT_FAILURE; - } - - return status; -} - - -static int -print_database (db) - DB *db; -{ - DBT key; - DBT val; - int no_more; - - no_more = db->seq (db, &key, &val, R_FIRST); - while (!no_more) - { - printf ("%.*s %.*s\n", (int) key.size, (char *) key.data, (int) val.size, - (char *) val.data); - - no_more = db->seq (db, &key, &val, R_NEXT); - } - - if (no_more == -1) - { - error (0, errno, gettext ("while reading database")); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} diff --git a/localedata/ChangeLog b/localedata/ChangeLog index d920713908..f8e72b422f 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,6 +1,6 @@ 1998-09-23 Ulrich Drepper <drepper@cygnus.com> - * Makefile [no install_root] (LOCALEDEF): Run localedef using jsut + * Makefile [no install_root] (LOCALEDEF): Run localedef using just built ld.so. 1998-06-15 Ulrich Drepper <drepper@cygnus.com> diff --git a/localedata/Makefile b/localedata/Makefile index 231f3ac5dc..4108b7ed47 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -80,13 +80,11 @@ do-tst-rpmatch: tst-rpmatch.sh $(objpfx)tst-rpmatch do-tst-fmon endif # Sometimes the whole collection of locale files should be installed. -ifneq ($(install_root),) -LOCALEDEF=chroot $(install_root) $(bindir)/localedef -else LOCALEDEF=$(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef -endif install-locales: while read locale charset; do \ case $$locale in \#*) continue;; esac; \ - $(LOCALEDEF) -c -i $$locale -f $$charset $$locale; \ + $(LOCALEDEF) -c -i locales/$$locale -f charmaps/$$charset \ + -u repertoiremaps/mnemonic.ds \ + $(inst_localedir)/$$locale; \ done < SUPPORTED |