mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-19 01:11:05 +00:00
af6f39063b
1997-10-26 18:12 Ulrich Drepper <drepper@cygnus.com> * libio/genops.c: Partial undo of last patch. * libio/stdfiles.c: Likewise. * libio/iofdopen.c: Use _IO_FILE_complete, not _IO_file_plus. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/libio.h: Remove duplicated `;'. * libio/stdio.c: Remove misleading comment. * libio/stdio.h: Declare standard streams as variables. * login/Makefile (distribute): Add README.utmpd. * login/README.utmpd: New file. Provided by Mark M. Kettenis <kettenis@phys.uva.nl>. * manual/job.texi: Document tcgetsid. * manual/pattern.texi: Document globfree. * manual/terminal.texi: Document B38400 ... B460800. * posix/confstr.c: Print "-D_FILE_OFFSET_SIZE=64" for _CS_LFS_CFLAGS. * posix/unistd.h: Add explanation of _POSIX_* constants. * posix/unists.h: Add prototypes for __pread, __pread64, __pwrite and __pwrite64. * sysdeps/generic/pread.c: Define as __pread and make pread weak alias. * sysdeps/generic/pread64.c: Likewise. * sysdeps/generic/pwrite.c: Likewise. * sysdeps/generic/pwrite64.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pread64.c: New file. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=posix] (sysdep_routines): Add s_pread64 and s_pwrite64. * sysdeps/unix/sysv/linux/pread.c: New file. * sysdeps/unix/sysv/linux/pread64.c: New file. * sysdeps/unix/sysv/linux/pwrite.c: New file. * sysdeps/unix/sysv/linux/pwrite64.c: New file. * sysdeps/unix/sysv/linux/s_pread64.c: New file. * sysdeps/unix/sysv/linux/s_pwrite64.c: New file. * sysdeps/unix/sysv/linux/syscalls.list: Add pread and pwrite. * sysdeps/unix/sysv/linux/alpha/pread64.c: New (empty) file. * sysdeps/unix/sysv/linux/alpha/pwrite64.c: New (empty) file. * sysdeps/unix/sysv/linux/sparc/sparc64/pread64.c: New (empty) file. * sysdeps/unix/sysv/linux/sparc/sparc64/pwrite64.c: New (empty) file. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add pread and pwrite with weak aliases for *64 functions. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. * string/bits/string2.h: Add casts to allow void * arguments. * sysdeps/i386/i486/bits/string.h: Define index and rindex only if __USE_BSD or __USE_XOPEN_EXTENDED. * sysdeps/unix/sysv/linux/bits/socket.h: Add SCM_RIGHTS and other SCM_* constants from kernel header. * termios/termios.h: Add prototype for tcgetsid. 1997-10-26 13:26 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * sunrpc/clnt_perr.c: Add trailing '\0' to strings. * sunrpc/get_myaddr.c: Include rpc/clnt.h for prototypes. * sunrpc/pmap_clnt.c: Use get_myaddress from header file. 1997-10-26 05:26 Ulrich Drepper <drepper@cygnus.com> * configure.in: Punt if any directory mentioned in the enable-add-on parameter does not exist. 1997-10-25 19:25 Ulrich Drepper <drepper@cygnus.com> * termios/Makefile (routines): Add tcgetsid. * termios/tcgetsid.c: New file. Provided by Mark M. Kettenis <kettenis@phys.uva.nl>. 1997-10-25 18:56 Ulrich Drepper <drepper@cygnus.com> * stdlib/stdlib.h: Remove mblen optimization. * stdlib/mblen.c: Rewrite to make sure global state is not changed. Reported by anderson@metrolink.com. 1997-10-19 21:51 Wolfram Gloger <wg@wolfram.dent.med.uni-muenchen.de> * malloc/thread-m.h [_LIBC]: Use new __libc_internal_tsd_{set,get} interface for thread-specific data. 1997-10-25 06:51 Ulrich Drepper <drepper@cygnus.com> * elf/dl-addr.c: Use braces for correct logical grouping. Patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>. 1997-10-18 09:15 Geoff Keating <geoffk@ozemail.com.au> * io/ftwtest-sh: Sometimes /tmp is a symlink to somewhere more convenient; that caused this test to break. * sysdeps/powerpc/dl-machine.h: Fix typo. * sysdeps/powerpc/bits/fenv.h: Don't use floating-point registers when -msoft-float is in effect, because this causes compilation to stop. * sysdeps/powerpc/bits/mathinlines.h: Likewise. * rpm/template: Add description, use RPM flags rather than the ones used to build the spec. Build in a temporary directory, not /. * elf/dl-lookup.c: Don't include _itoa.h, it's not used. * elf/dl-minimal.c: Use _itoa_word rather than _itoa. It seems that _itoa is the only routine that ld.so uses that requires something from libgcc.a on powerpc, so it would be best to avoid it in ld.so. * elf/rtld.c: Likewise. * sysdeps/generic/_strerror.c: Likewise. * stdio-common/_itoa.c: Split out digits strings. * stdio-common/itoa-digits.c: New file. * stdio-common/Makefile: Add itoa-digits. 1997-10-21 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/filesys.texi (Scanning Directory Content): Document error case more. * dirent/scandir.c (scandir): Ignore errors from select function. Suggested by urbanw@cs.umu.se (closes PR libc/316). 1997-10-25 06:18 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Corrections. Patch by Erik Troan <ewt@redhat.com>. 1997-10-25 04:00 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Favour exact matching of version function if both the general (1) and glibc-specific (3) entry are present. 1997-10-22 18:47 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * sunrpc/rpc/clnt.h: Add get_myaddress prototype. * nis/libnsl.map: Fix typo. * nis/nis_call.c: Fix memory leak. 1997-10-22 19:29 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/memcmp.c: Define __P if not defined before. Patch by Jim Meyering <meyering@eng.ascend.com>. 1997-10-21 22:09 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sys/prctl.h: New file by Richard Gooch <rgooch@atnf.csiro.au>. 1997-10-21 21:50 Ulrich Drepper <drepper@cygnus.com> * misc/syslog.c (vsyslog): Open console with O_NOCTTY. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-10-21 18:07 Ulrich Drepper <drepper@cygnus.com> * posix/wordexp.c: Improve handling of $... expressions. Patch by Tim Waugh <tim@cyberelk.demon.co.uk>. 1997-10-21 16:12 Ulrich Drepper <drepper@cygnus.com> * manual/string.texi: Correct return values of bcopy and bzero. Patch by Matthew Wilcox <willy@odie.barnet.ac.uk>. 1997-10-18 15:03 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/bits/socket.h: Correct types of some elements in struct msghdr and struct cmsghdr, to keep in step with the kernel. 1997-10-17 22:29 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Fix another bug in startup code. Patch by Eric Delaunay <delaunay@lix.polytechnique.fr>. 1997-10-16 20:17 Richard Henderson <rth@cygnus.com> * sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Dump args to the stack and give the kernel a pointer. Use the sysdep.h macros. 1997-10-17 04:07 Ulrich Drepper <drepper@cygnus.com> * sysdeps/sparc/sparc32/elf/start.S: Calculate argv correctly. Patch by Eric Delaunay <delaunay@lix.polytechnique.fr>. 1997-10-16 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_nextafterxf.c [!__STDC__]: Correct typo. 1997-10-16 14:50 Ulrich Drepper <drepper@cygnus.com> * manual/pattern.texi: Document globfree. 1997-10-15 21:11 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/net/if_packet.h: New file. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add net/if_packet.h. * sysdeps/unix/sysv/linux/net/if_arp.h (ARPHRD_ASH): New type, for 64Mbps ASH. (ARPHRD_ETHER): This is used for 100Mbps networks too. 1997-10-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * Makerules (install): Use full pathnames for linker script. This is to work around a limitation in `ld' while no better solution is possible. 1997-10-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * malloc/malloc.c (mmap_chunk): Put inline before static in function definition to avoid compiler warning. (malloc_extend): Likewise. * sysdeps/generic/des_impl.c: Include "des.h" to avoid warning. 1997-10-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * NEWS: Fix @gnu.ai.mit.edu -> @gnu.org. * README.template: Likewise. * db/makedb.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/ldd.sh.in: Likewise. * intl/locale.alias: Likewise. * login/programs/utmpd.c: Likewise. * libio/stdfiles.c [!_IO_MTSAFE] (DEF_STDFILE): Fix parameter list. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Rules: Remove all empty.* files. (shared-only-routines): Correct implementation. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/s_lrintl.c: Make compilable. * sysdeps/libm-ieee754/s_llrintl.c: Likewise. Optimized. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/ldd.bash.in: Only prepend ./ if the file contains no slash at all. * elf/ldd.sh.in: Likewise. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/sys/ucontext.h: New file. 1997-10-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/s_scalbln.c: New (empty) file. * sysdeps/m68k/fpu/s_scalblnf.c: New (empty) file. * sysdeps/m68k/fpu/s_scalblnl.c: New (empty) file. * sysdeps/m68k/fpu/s_scalbn.c: Add scalbln alias. * sysdeps/m68k/fpu/s_scalbnf.c: Adapted. * sysdeps/m68k/fpu/s_scalbnl.c: Adapted. * sysdeps/m68k/fpu/s_lrint.c: Add standard skeleton stuff. * sysdeps/m68k/fpu/s_lrintf.c: New file. * sysdeps/m68k/fpu/s_lrintl.c: New file. * sysdeps/m68k/fpu/bits/mathinline.h: Add fma and scalbln. Update lrint and scalbn. (__m81_inline) [__cplusplus]: Define to __inline. * math/bits/mathcalls.h: Remove whitespace before second argument of __MATHDECL. Add note explaining this. 1997-10-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/arith.texi (Absolute Value): Spelling fix. 1997-10-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/obstack.h (obstack_empty_p) [!__GNUC__]: Properly parenthesize the macro parameter. * Rules: Remove rules to magically install <subdir>.h headers.
364 lines
8.7 KiB
C
364 lines
8.7 KiB
C
/* 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;
|
|
}
|