mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
afd4eb3759
Sun Nov 17 03:13:57 1996 Ulrich Drepper <drepper@cygnus.com> * db/makedb.c: Update and reformat copyright. * elf/Makefile: Likewise. * elf/dl-close.c: Likewise. * elf/dl-debug.c: Likewise. * elf/dl-deps.c: Likewise. * elf/dl-error.c: Likewise. * elf/dl-fini.c: Likewise. * elf/dl-init.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-minimal.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-symbol.c: Likewise. * elf/dladdr.c: Likewise. * elf/dlclose.c: Likewise. * elf/dlerror.c: Likewise. * elf/dlopen.c: Likewise. * elf/dlsym.c: Likewise. * elf/do-rel.h: Likewise. * elf/dynamic-link.h: Likewise. * elf/eval.c: Likewise. * elf/rtld.c: Likewise. * inet/ether_hton.c: Likewise. * inet/ether_ntoh.c: Likewise. * inet/ether_line.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/Makefile (+gccwarn): Remove definition. Instead set CFLAGS-rcmd.c, CFLAGS-rexec.c, and CFLAGS-ruserpass.c to `-w'. * inet/aliases.h: Add C++ protection. * inet/ether_hton.c: Add prototype for __nss_ethers_lookup. (ether_hostton): Remove unused variable result. * inet/ether_ntoh.c: Likewise. * inet/ether_line.c: Include <ctype.h> and <string.h>. * inet/getnetgrent_r.c: Include <stdlib.h>. Use casts to prevent warnings. (innetgr): Initialize `known' and `needed'. * inet/inet_net.c: Make local variable `i' of type u_int32_t. * nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)) [NEED__RES]: Don't return NULL. Instead set *RESULT to NULL and return -1. * nss/getXXent_r.c (INTERNAL (REENTRANT_GETNAME)): Likewise. (SETFUNC_NAME, ENDFUNC_NAME) [NEED__RES]: Don't return anything. * nss/nss_files/files-alias.c: Debug function. I didn't worked at all before. Sat Nov 16 15:25:34 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/readv.c: Don't use PTR anymore. * sysdeps/posix/writev.c: Likewise. * version.h (VERSION): Bump to 1.98. * nss/db-Makefile: Generate lines for getXXXent iteration. * sysdeps/alpha/Dist: Don't distribute removed files divlu.S, divqu.S, remlu.S, and remqu.S. Fri Nov 15 08:55:54 1996 Andreas Jaeger <aj@arthur.pfalz.de> * posix/unistd.h: Correct typo in documentation. Thu Nov 14 18:08:14 1996 a sun <asun@zoology.washington.edu> * inet/netinet/tcp.h: Use __ protected versions instead of BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN directly. Sat Nov 16 13:44:55 1996 Ulrich Drepper <drepper@cygnus.com> * intl/loadmsgcat.c (_nl_msg_cat_cntr): Initialize so that references in libc.so are not anymore undefined. Sat Nov 16 18:17:36 1996 NIIBE Yutaka <gniibe@mri.co.jp> * io/utime.h: Rename second parameter for utime to prevent warning for -Wshadow. * dirent/dirent.h: Same here for scandir prototype. * math/mathcalls.h: Likewise for frexp and ldexp. * sysdeps/unix/sysv/linux/netinet/in.h: Likewise for bindresvport. Sat Nov 16 03:49:27 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/tst-strtod.c: Add test for error case below. Sat Nov 16 03:48:39 1996 Wolfram Gloger <Wolfram.Gloger@dent.med.uni-muenchen.de> * stdlib/strtod.c: Recognize numbers like 0e-19. Fri Nov 15 08:38:43 1996 Andreas Jaeger <aj@arthur.pfalz.de> * time/Makefile ($(installed-localtime-file)): Fix path to rellns-sh. * Makefile: Don't generate and install gnu/lib-names.h if $(build-shared) is not `yes'. Thu Nov 14 09:23:58 1996 H.J. Lu (hjl@gnu.ai.mit.edu) * sysdeps/posix/Makefile ($(common-objpfx)mk-stdiolim): Depend on $(..)posix/posix1_lim.h, not ../posix/posix1_lim.h. * Makerules (REAL_MAKE_VERSION): New, use it instead of MAKE_VERSION. Thu Nov 14 22:10:43 1996 Ulrich Drepper <drepper@cygnus.com> * nss/nss_files/files-XXX.x (_nss_files_get,ENTNAME_r): Fix typo. * nss/getXXent_r.c: Fix typo. Set correct return value when no further service is available. Thu Nov 14 17:48:13 1996 Ulrich Drepper <drepper@cygnus.com> * db/recno/rec_put.c: Add cast to avoid warning. * db/recno/rec_close.c: Likewise. * db/mpool/mpool.c: Likewise. * db/hash/hash_bigkey.h: Likewise. * db/hash/hash.c: Likewise. * db/btree/bt_split.c: Likewise. * db/btree/bt_put.c: Likewise. Thu Nov 14 14:11:44 1996 Ulrich Drepper <drepper@cygnus.com> * dirent/dirent.h: Update copyright. * elf/elf.h: Likewise. * elf/link.h: Likewise. * gmon/sys/gmon_out.h: Likewise. * gnu-versions.h: Likewise. * intl/libintl.h: Likewise. * io/fcntl.h: Likewise. * io/ftw.h: Likewise. * io/sys/statfs.h: Likewise. * io/utime.h: Likewise. * locale/langinfo.h: Likewise. * malloc/malloc.h: Likewise. * malloc/obstack.h: Likewise. * misc/ar.h: Likewise. * misc/error.h: Likewise. * misc/mntent.h: Likewise. * misc/sgtty.h: Likewise. * misc/sys/cdefs.h: Likewise. * misc/sys/dir.h: Likewise. * misc/sys/file.h: Likewise. * misc/sys/ioctl.h: Likewise. * misc/sys/ustat.h: Likewise. * posix/fnmatch.h: Likewise. * posix/getopt.h: Likewise. * posix/glob.h: Likewise. * posix/posix2_lim.h: Likewise. * posix/regex.h: Likewise. * posix/sys/times.h: Likewise. * posix/sys/types.h: Likewise. * posix/sys/utsname.h: Likewise. * posix/tar.h: Likewise. * posix/wordexp.h: Likewise. * resource/sys/resource.h: Likewise. * resource/sys/vlimit.h: Likewise. * resource/sys/vtimes.h: Likewise. * socket/sys/socket.h: Likewise. * socket/sys/un.h: Likewise. * stdio-common/printf.h: Likewise. * stdlib/alloca.h: Likewise. * string/argz.h: Likewise. * string/endian.h: Likewise. * string/envz.h: Likewise. * string/memory.h: Likewise. * string/strings.h: Likewise. * sysdeps/generic/crypt.h: Likewise. * sysdeps/generic/direntry.h: Likewise. * sysdeps/generic/gnu/types.h: Likewise. * sysdeps/generic/ioctl-types.h: Likewise. * sysdeps/generic/netinet/in.h: Likewise. * sysdeps/generic/resourcebits.h: Likewise. * sysdeps/generic/sigset.h: Likewise. * sysdeps/generic/sockaddrcom.h: Likewise. * sysdeps/generic/sys/mman.h: Likewise. * sysdeps/generic/sys/ptrace.h: Likewise. * sysdeps/generic/termbits.h: Likewise. * sysdeps/generic/waitstatus.h: Likewise. * sysdeps/ieee754/huge_val.h: Likewise. * sysdeps/ieee754/nan.h: Likewise. * sysdeps/mach/hurd/local_lim.h: Likewise. * sysdeps/mach/hurd/statbuf.h: Likewise. * sysdeps/stub/huge_val.h: Likewise. * sysdeps/stub/libc-lock.h: Likewise. * sysdeps/stub/signum.h: Likewise. * sysdeps/stub/statbuf.h: Likewise. * sysdeps/stub/waitflags.h: Likewise. * sysdeps/unix/bsd/bsd4.4/sockaddrcom.h: Likewise. * sysdeps/unix/bsd/osf/alpha/statbuf.h: Likewise. * sysdeps/unix/bsd/osf/sys/mman.h: Likewise. * sysdeps/unix/bsd/signum.h: Likewise. * sysdeps/unix/bsd/statbuf.h: Likewise. * sysdeps/unix/bsd/sun/signum.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/termbits.h: Likewise. * sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise. * sysdeps/unix/bsd/waitflags.h: Likewise. * sysdeps/unix/sysv/irix4/signum.h: Likewise. * sysdeps/unix/sysv/irix4/statbuf.h: Likewise. * sysdeps/unix/sysv/irix4/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/alpha/statbuf.h: Likewise. * sysdeps/unix/sysv/linux/alpha/sys/io.h: Likewise. * sysdeps/unix/sysv/linux/direntry.h: Likewise. * sysdeps/unix/sysv/linux/gnu/types.h: Likewise. * sysdeps/unix/sysv/linux/ioctl-types.h: Likewise. * sysdeps/unix/sysv/linux/local_lim.h: Likewise. * sysdeps/unix/sysv/linux/netinet/in.h: Likewise. * sysdeps/unix/sysv/linux/resourcebits.h: Likewise. * sysdeps/unix/sysv/linux/signum.h: Likewise. * sysdeps/unix/sysv/linux/statbuf.h: Likewise. * sysdeps/unix/sysv/linux/sys/io.h: Likewise. * sysdeps/unix/sysv/linux/sys/klog.h: Likewise. * sysdeps/unix/sysv/linux/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/sys/ptrace.h: Likewise. * sysdeps/unix/sysv/linux/syscall.h: Likewise. * sysdeps/unix/sysv/linux/termbits.h: Likewise. * sysdeps/unix/sysv/local_lim.h: Likewise. * sysdeps/unix/sysv/sco3.2.4/syscall.h: Likewise. * sysdeps/unix/sysv/sco3.2/local_lim.h: Likewise. * sysdeps/unix/sysv/signum.h: Likewise. * sysdeps/unix/sysv/sysv4/i386/statbuf.h: Likewise. * sysdeps/unix/sysv/sysv4/signum.h: Likewise. * sysdeps/unix/sysv/sysv4/sigset.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/signum.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/statbuf.h: Likewise. * sysdeps/unix/sysv/sysv4/waitflags.h: Likewise. * sysdeps/vax/huge_val.h: Likewise. * values.h: Likewise. Thu Nov 14 04:22:41 1996 Ulrich Drepper <drepper@cygnus.com> * malloc/obstack.h: Use memcpy instead of bcopy and define a macro `memcpy' using bcopy if memcpy is not available. * manual/stdio.texi: Correct description of printf customization. The argument info function is not optional anymore and the interface for `printf_function' also changed. * manual/examples/rprintf.c: Define and use argument info function. * stdio-common/printf.h (struct printf_info): Change type for field `pad' to wchar_t. Correct comment for `register_printf_function'. * nss/getXXbyYY.c [NEED_H_ERRNO]: Don't pass pointer to h_errno to reentrant function. Instead use temporary variable and set h_errno if an error occured. Reported by NIIBE Yutaka. are no bits set in the masks. Reported by baldazzi@csr.unibo.it.
359 lines
8.5 KiB
C
359 lines
8.5 KiB
C
/* makedb -- create simple DB database from textual input.
|
|
Copyright (C) 1996 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 <db.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <error.h>
|
|
#include <fcntl.h>
|
|
#include <getopt.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
|
|
|
|
/* Long options. */
|
|
static const struct option long_options[] =
|
|
{
|
|
{ "help", no_argument, NULL, 'h' },
|
|
{ "fold-case", no_argument, NULL, 'f' },
|
|
{ "output", required_argument, NULL, 'o' },
|
|
{ "quiet", no_argument, NULL, 'q' },
|
|
{ "undo", no_argument, NULL, 'u' },
|
|
{ "version", no_argument, NULL, 'V' },
|
|
{ NULL, 0, NULL, 0}
|
|
};
|
|
|
|
/* Prototypes for local functions. */
|
|
static void usage __P ((int status)) __attribute__ ((noreturn));
|
|
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 *output_name;
|
|
const char *input_name;
|
|
FILE *input_file;
|
|
DB *db_file;
|
|
int do_help;
|
|
int do_version;
|
|
int to_lowercase;
|
|
int do_undo;
|
|
int be_quiet;
|
|
int status;
|
|
int opt;
|
|
|
|
/* Set locale via LC_ALL. */
|
|
setlocale (LC_ALL, "");
|
|
|
|
/* Set the text message domain. */
|
|
textdomain (_libc_intl_domainname);
|
|
|
|
/* Initialize local variables. */
|
|
do_help = 0;
|
|
do_version = 0;
|
|
to_lowercase = 0;
|
|
do_undo = 0;
|
|
be_quiet = 0;
|
|
output_name = NULL;
|
|
|
|
while ((opt = getopt_long (argc, argv, "fho:uV", long_options, NULL)) != EOF)
|
|
switch (opt)
|
|
{
|
|
case '\0': /* Long option. */
|
|
break;
|
|
case 'h':
|
|
do_help = 1;
|
|
break;
|
|
case 'f':
|
|
to_lowercase = 1;
|
|
break;
|
|
case 'o':
|
|
output_name = optarg;
|
|
break;
|
|
case 'q':
|
|
be_quiet = 1;
|
|
break;
|
|
case 'u':
|
|
do_undo = 1;
|
|
break;
|
|
case 'V':
|
|
do_version = 1;
|
|
break;
|
|
default:
|
|
usage (EXIT_FAILURE);
|
|
}
|
|
|
|
/* Version information is requested. */
|
|
if (do_version)
|
|
{
|
|
printf ("makedb (GNU %s) %s\n", PACKAGE, VERSION);
|
|
printf (_("\
|
|
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");
|
|
printf (_("Written by %s.\n"), "Ulrich Drepper");
|
|
|
|
exit (EXIT_SUCCESS);
|
|
}
|
|
|
|
/* Help is requested. */
|
|
if (do_help)
|
|
usage (EXIT_SUCCESS);
|
|
else if (do_version)
|
|
exit (EXIT_SUCCESS);
|
|
|
|
/* Determine file names. */
|
|
if (do_undo || output_name != NULL)
|
|
{
|
|
if (optind + 1 != argc)
|
|
{
|
|
wrong_arguments:
|
|
error (0, 0, gettext ("wrong number of arguments"));
|
|
usage (EXIT_FAILURE);
|
|
}
|
|
input_name = argv[optind];
|
|
}
|
|
else
|
|
{
|
|
if (optind + 2 != argc)
|
|
goto wrong_arguments;
|
|
|
|
input_name = argv[optind++];
|
|
output_name = argv[optind];
|
|
}
|
|
|
|
/* 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;
|
|
}
|
|
|
|
|
|
static void
|
|
usage (status)
|
|
int status;
|
|
{
|
|
if (status != EXIT_SUCCESS)
|
|
fprintf (stderr, gettext ("Try `%s --help' for more information.\n"),
|
|
program_invocation_name);
|
|
else
|
|
{
|
|
printf (gettext ("\
|
|
Usage: %s [OPTION]... INPUT-FILE OUTPUT-FILE\n\
|
|
%s [OPTION]... -o OUTPUT-FILE INPUT-FILE\n\
|
|
%s [OPTION]... -u INPUT-FILE\n\
|
|
Mandatory arguments to long options are mandatory for short options too.\n\
|
|
-f, --fold-case convert key to lower case\n\
|
|
-h, --help display this help and exit\n\
|
|
-o, --output=NAME write output to file NAME\n\
|
|
--quiet don't print messages while building database\n\
|
|
-u, --undo print content of database file, one entry a line\n\
|
|
-V, --version output version information and exit\n\
|
|
If INPUT-FILE is -, input is read from standard input.\n"),
|
|
program_invocation_name, program_invocation_name,
|
|
program_invocation_name);
|
|
fputs (gettext ("Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
|
|
stdout);
|
|
}
|
|
|
|
exit (status);
|
|
}
|
|
|
|
|
|
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;
|
|
}
|