mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
af69217fea
1998-01-26 00:57 Ulrich Drepper <drepper@cygnus.com> * db2/Makefile (routines): Add os_alloc. * db2/db.h: Update from db-2.3.16. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_page.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_err.c: Likewise. * db2/common/db_region.c: Likewise. * db2/common/db_shash.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_dup.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_rec.c: Likewise. * db2/db185/db185.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_am.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_auto.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/mutex_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/include/txn_ext.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_util.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log.src: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/log/log_rec.c: Likewise. * db2/log/log_register.c: Likewise. * db2/mp/mp_bh.c: Likewise. * db2/mp/mp_fget.c: Likewise. * db2/mp/mp_fopen.c: Likewise. * db2/mp/mp_fput.c: Likewise. * db2/mp/mp_pr.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_alloc.c: Likewise. * db2/os/os_config.c: Likewise. * db2/os/os_stat.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_printlog/db_printlog.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/progs/db_stat/db_stat.c: Likewise. * db2/txn/txn.c: Likewise. * elf/dl-close.c (_dl_close): Rename inner variable named map to imap. Unmap memory blocks in reverse order of allocation. Call munmap with load address added to offset. Bug reported by Miguel de Icaza. * locale/programs/ld-collate.c (collate_end_weight): Correctly fill up weight array. * localedata/locales/cs_CZ: Update by Michael Mraka <michael@informatics.muni.cz>. * misc/sys/syslog.h: Reformat a bit. Don't declare vsyslog unless __USE_BSD. * nis/nss_compat/compat-grp.c: Correctly handle buffer overflow while reading line with fgets. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * shadow/fgetspent_r.c: Likewise. * string/strerror_r.c: Correct comment. Patch by Andreas Jaeger. * sysdeps/unix/sysv/linux/bits/stat.h: Define _STATBUF_ST_RDEV. * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/i386/sys/ucontext.h: Allocate room for FP register content in ucontext_t. 1998-01-22 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_modfl.c (modf): Correct calculation. Patch by Markus Schoder <Markus.Schoder@dresdner-bank.de>. * math/libm-test.c (modf_test): Add more tests for modf. * sysdeps/unix/sysv/linux/sys/mman.h: Add const to mlock and munlock according to Unix98. 1998-01-25 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nss_files/files-network.c (LINE_PARSER): Set n_addrtype to AF_INET. 1998-01-21 07:22 H.J. Lu <hjl@gnu.org> * sysdeps/posix/ttyname.c: Handle symbolic links. * sysdeps/posix/ttyname_r.c: Ditto. 1998-01-25 19:39 Ulrich Drepper <drepper@cygnus.com> * db2/makedb.c (process_input): Write terminating \0 for value. (print_database): Simply print value string, don't use length. 1998-01-24 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nsswitch.c (__nss_configure_lookup): Correct test for early exit of loop. 1998-01-25 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/ypclnt.c: Don't set dom_client to NULL, or we will not close all sockets. 1998-01-25 14:54 Ulrich Drepper <drepper@cygnus.com> * signal/Makefile (routines): Add sighold, sigrelse, sigignore, and sigset. * signal/sighold.c: New file. * signal/sigrelse.c: New file. * sysdeps/generic/sigignore.c: New file. * sysdeps/generic/sigset.c: New file. * sysdeps/posix/sigignore.c: New file. * sysdeps/posix/sigset.c: New file. * signal/signal.h: Add prototypes for new functions. * sysdeps/unix/sysv/linux/alpha/bits/signum.h: Define SIG_HOLD. * sysdeps/unix/sysv/linux/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/signum.h: Likewise. 1998-01-23 00:16 Tim Waugh <tim@cyberelk.demon.co.uk> * posix/wordexp.c: Added IFS field-splitting in parameter and command substitution. Fixed an IFS-related bug that caused an infinite loop. 1998-01-25 12:38 Ulrich Drepper <drepper@cygnus.com> * stdlib/Makefile (routines): Add getcontext, setcontext, makecontext, and swapcontext. * stdlib/ucontext.h: Correct prototypes. * sysdeps/generic/getcontext.c: New file. * sysdeps/generic/setcontext.c: New file. * sysdeps/generic/makecontext.c: New file. * sysdeps/generic/swapcontext.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc64/Makefile: Removed. 1998-01-25 04:07 Ulrich Drepper <drepper@cygnus.com> * resource/sys/resource.h: Remove #include of ulimit.h which is not allowed by SUSv2 and not available on other systems. * sysdeps/unix/sysv/linux/ulimit.c: Include ulimit.h. * streams/Makefile: New file. * streams/stropts.h: New file. * sysdeps/generic/bits/stropts.h: New file. * sysdeps/generic/isastream.c: New file. * sysdeps/generic/getmsg.c: New file. * sysdeps/generic/getpmsg.c: New file. * sysdeps/generic/putmsg.c: New file. * sysdeps/generic/putpmsg.c: New file. * sysdeps/generic/fattach.c: New file. * sysdeps/generic/fdetach.c: New file. * sysdeps/unix/inet/Subdirs: Add streams. * sysdeps/generic/bits/types.h: Add definition of __t_scalar_t and __t_uscalar_t. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/mach/_strerror.c: Follow changes of generic version to handle small buffers correctly. 1998-01-24 17:31 H.J. Lu <hjl@gnu.org> * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Remove the 3rd arg and add declaration for _dl_runtime_resolve and _dl_runtime_profile. 1998-01-25 02:42 Ulrich Drepper <drepper@cygnus.com> * include/cpio.h: New file. Mainly copied from GNU cpio. * posix/Makefile (headers): Add cpio.h.
366 lines
8.7 KiB
C
366 lines
8.7 KiB
C
/* Create simple DB database from textual input.
|
|
Copyright (C) 1996, 1997, 1998 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_185.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 == EINVAL ? 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'"),
|
|
output_name);
|
|
|
|
/* 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, 1998");
|
|
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) + 1;
|
|
|
|
/* 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;
|
|
continue;
|
|
}
|
|
else
|
|
error (0, errno, gettext ("while writing database file"));
|
|
|
|
status = EXIT_FAILURE;
|
|
|
|
clearerr (input);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (ferror (input))
|
|
{
|
|
error (0, 0, gettext ("problems while reading `%s'"), inname);
|
|
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,
|
|
(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;
|
|
}
|