1998-02-18 18:59:16 +01:00
|
|
|
/* Convert text in given files from the specified from-set to the to-set.
|
2011-01-17 21:08:10 +01:00
|
|
|
Copyright (C) 1998-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
1998-02-18 18:59:16 +01:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
|
2005-12-07 06:49:17 +01:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
2007-07-16 02:56:07 +02:00
|
|
|
it under the terms of the GNU General Public License as published
|
|
|
|
by the Free Software Foundation; version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
1998-02-18 18:59:16 +01:00
|
|
|
|
2005-12-07 06:49:17 +01:00
|
|
|
This program is distributed in the hope that it will be useful,
|
1998-02-18 18:59:16 +01:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2005-12-07 06:49:17 +01:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
1998-02-18 18:59:16 +01:00
|
|
|
|
2005-12-07 06:49:17 +01:00
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software Foundation,
|
|
|
|
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
#include <argp.h>
|
2001-02-04 06:49:00 +01:00
|
|
|
#include <assert.h>
|
1998-04-01 18:15:20 +02:00
|
|
|
#include <ctype.h>
|
1998-02-18 18:59:16 +01:00
|
|
|
#include <errno.h>
|
|
|
|
#include <error.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <iconv.h>
|
2002-07-27 10:20:17 +02:00
|
|
|
#include <langinfo.h>
|
1998-02-18 18:59:16 +01:00
|
|
|
#include <locale.h>
|
1998-04-01 18:15:20 +02:00
|
|
|
#include <search.h>
|
2002-09-24 06:19:03 +02:00
|
|
|
#include <stdbool.h>
|
1998-02-18 18:59:16 +01:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
1999-06-19 11:58:37 +02:00
|
|
|
#include <libintl.h>
|
1998-08-03 18:47:01 +02:00
|
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
|
|
# include <sys/mman.h>
|
|
|
|
#endif
|
2001-02-05 06:57:24 +01:00
|
|
|
#include <charmap.h>
|
1998-04-03 17:46:53 +02:00
|
|
|
#include <gconv_int.h>
|
2001-02-05 06:57:24 +01:00
|
|
|
#include "iconv_prog.h"
|
2001-09-01 21:03:22 +02:00
|
|
|
#include "iconvconfig.h"
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
/* Get libc version number. */
|
|
|
|
#include "../version.h"
|
|
|
|
|
|
|
|
#define PACKAGE _libc_intl_domainname
|
|
|
|
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
|
|
|
|
#define OPT_VERBOSE 1000
|
2000-04-30 08:52:59 +02:00
|
|
|
#define OPT_LIST 'l'
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
/* Definitions of arguments for argp functions. */
|
|
|
|
static const struct argp_option options[] =
|
|
|
|
{
|
|
|
|
{ NULL, 0, NULL, 0, N_("Input/Output format specification:") },
|
|
|
|
{ "from-code", 'f', "NAME", 0, N_("encoding of original text") },
|
|
|
|
{ "to-code", 't', "NAME", 0, N_("encoding for output") },
|
1998-04-01 18:15:20 +02:00
|
|
|
{ NULL, 0, NULL, 0, N_("Information:") },
|
2000-04-30 08:52:59 +02:00
|
|
|
{ "list", 'l', NULL, 0, N_("list all known coded character sets") },
|
1998-02-18 18:59:16 +01:00
|
|
|
{ NULL, 0, NULL, 0, N_("Output control:") },
|
2000-04-30 08:52:59 +02:00
|
|
|
{ NULL, 'c', NULL, 0, N_("omit invalid characters from output") },
|
1998-02-18 18:59:16 +01:00
|
|
|
{ "output", 'o', "FILE", 0, N_("output file") },
|
2000-09-04 11:40:57 +02:00
|
|
|
{ "silent", 's', NULL, 0, N_("suppress warnings") },
|
1998-02-18 18:59:16 +01:00
|
|
|
{ "verbose", OPT_VERBOSE, NULL, 0, N_("print progress information") },
|
|
|
|
{ NULL, 0, NULL, 0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Short description of program. */
|
|
|
|
static const char doc[] = N_("\
|
|
|
|
Convert encoding of given files from one encoding to another.");
|
|
|
|
|
|
|
|
/* Strings for arguments in help texts. */
|
|
|
|
static const char args_doc[] = N_("[FILE...]");
|
|
|
|
|
|
|
|
/* Prototype for option handler. */
|
2000-04-30 08:52:59 +02:00
|
|
|
static error_t parse_opt (int key, char *arg, struct argp_state *state);
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
/* Function to print some extra text in the help message. */
|
2000-04-30 08:52:59 +02:00
|
|
|
static char *more_help (int key, const char *text, void *input);
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
/* Data structure to communicate with argp functions. */
|
|
|
|
static struct argp argp =
|
|
|
|
{
|
|
|
|
options, parse_opt, args_doc, doc, NULL, more_help
|
|
|
|
};
|
|
|
|
|
2001-11-29 06:00:56 +01:00
|
|
|
/* Code sets to convert from and to respectively. An empty string as the
|
|
|
|
default causes the 'iconv_open' function to look up the charset of the
|
|
|
|
currently selected locale and use it. */
|
|
|
|
static const char *from_code = "";
|
|
|
|
static const char *to_code = "";
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
/* File to write output to. If NULL write to stdout. */
|
|
|
|
static const char *output_file;
|
|
|
|
|
|
|
|
/* Nonzero if verbose ouput is wanted. */
|
2001-02-05 06:57:24 +01:00
|
|
|
int verbose;
|
1998-02-18 18:59:16 +01:00
|
|
|
|
1998-04-01 18:15:20 +02:00
|
|
|
/* Nonzero if list of all coded character sets is wanted. */
|
|
|
|
static int list;
|
|
|
|
|
2000-06-06 05:16:30 +02:00
|
|
|
/* If nonzero omit invalid character from output. */
|
2001-02-05 06:57:24 +01:00
|
|
|
int omit_invalid;
|
2000-06-06 05:16:30 +02:00
|
|
|
|
1998-02-18 18:59:16 +01:00
|
|
|
/* Prototypes for the functions doing the actual work. */
|
2008-03-11 21:14:03 +01:00
|
|
|
static int process_block (iconv_t cd, char *addr, size_t len, FILE **output,
|
|
|
|
const char *output_file);
|
|
|
|
static int process_fd (iconv_t cd, int fd, FILE **output,
|
|
|
|
const char *output_file);
|
|
|
|
static int process_file (iconv_t cd, FILE *input, FILE **output,
|
|
|
|
const char *output_file);
|
1999-01-19 00:15:16 +01:00
|
|
|
static void print_known_names (void) internal_function;
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
main (int argc, char *argv[])
|
|
|
|
{
|
|
|
|
int status = EXIT_SUCCESS;
|
|
|
|
int remaining;
|
|
|
|
iconv_t cd;
|
2000-06-06 05:16:30 +02:00
|
|
|
const char *orig_to_code;
|
2001-02-05 06:57:24 +01:00
|
|
|
struct charmap_t *from_charmap = NULL;
|
|
|
|
struct charmap_t *to_charmap = NULL;
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
/* Set locale via LC_ALL. */
|
|
|
|
setlocale (LC_ALL, "");
|
|
|
|
|
|
|
|
/* Set the text message domain. */
|
|
|
|
textdomain (_libc_intl_domainname);
|
|
|
|
|
|
|
|
/* Parse and process arguments. */
|
|
|
|
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
|
|
1998-04-01 18:15:20 +02:00
|
|
|
/* List all coded character sets if wanted. */
|
|
|
|
if (list)
|
|
|
|
{
|
|
|
|
print_known_names ();
|
|
|
|
exit (EXIT_SUCCESS);
|
|
|
|
}
|
1998-02-18 18:59:16 +01:00
|
|
|
|
2000-06-06 05:16:30 +02:00
|
|
|
/* If we have to ignore errors make sure we use the appropriate name for
|
|
|
|
the to-character-set. */
|
|
|
|
orig_to_code = to_code;
|
|
|
|
if (omit_invalid)
|
|
|
|
{
|
|
|
|
const char *errhand = strchrnul (to_code, '/');
|
|
|
|
int nslash = 2;
|
|
|
|
char *newp;
|
|
|
|
char *cp;
|
|
|
|
|
|
|
|
if (*errhand == '/')
|
|
|
|
{
|
|
|
|
--nslash;
|
|
|
|
errhand = strchrnul (errhand, '/');
|
|
|
|
|
|
|
|
if (*errhand == '/')
|
|
|
|
{
|
|
|
|
--nslash;
|
2003-04-06 22:36:19 +02:00
|
|
|
errhand = strchr (errhand, '\0');
|
2000-06-06 05:16:30 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-04-06 22:36:19 +02:00
|
|
|
newp = (char *) alloca (errhand - to_code + nslash + 7 + 1);
|
2000-06-06 05:16:30 +02:00
|
|
|
cp = mempcpy (newp, to_code, errhand - to_code);
|
2000-06-13 20:22:02 +02:00
|
|
|
while (nslash-- > 0)
|
2000-06-06 05:16:30 +02:00
|
|
|
*cp++ = '/';
|
2003-04-06 22:36:19 +02:00
|
|
|
if (cp[-1] != '/')
|
|
|
|
*cp++ = ',';
|
2001-01-31 08:00:50 +01:00
|
|
|
memcpy (cp, "IGNORE", sizeof ("IGNORE"));
|
2000-06-06 05:16:30 +02:00
|
|
|
|
|
|
|
to_code = newp;
|
|
|
|
}
|
|
|
|
|
2001-02-05 06:57:24 +01:00
|
|
|
/* POSIX 1003.2b introduces a silly thing: the arguments to -t anf -f
|
|
|
|
can be file names of charmaps. In this case iconv will have to read
|
|
|
|
those charmaps and use them to do the conversion. But there are
|
|
|
|
holes in the specification. There is nothing said that if -f is a
|
|
|
|
charmap filename that -t must be, too. And vice versa. There is
|
|
|
|
also no word about the symbolic names used. What if they don't
|
|
|
|
match? */
|
|
|
|
if (strchr (from_code, '/') != NULL)
|
|
|
|
/* The from-name might be a charmap file name. Try reading the
|
|
|
|
file. */
|
2006-08-19 19:54:05 +02:00
|
|
|
from_charmap = charmap_read (from_code, /*0, 1*/1, 0, 0, 0);
|
2001-02-05 06:57:24 +01:00
|
|
|
|
|
|
|
if (strchr (orig_to_code, '/') != NULL)
|
|
|
|
/* The to-name might be a charmap file name. Try reading the
|
|
|
|
file. */
|
2006-08-19 19:54:05 +02:00
|
|
|
to_charmap = charmap_read (orig_to_code, /*0, 1,*/1, 0, 0, 0);
|
2001-02-05 06:57:24 +01:00
|
|
|
|
1998-02-18 18:59:16 +01:00
|
|
|
|
2001-02-05 06:57:24 +01:00
|
|
|
/* At this point we have to handle two cases. The first one is
|
|
|
|
where a charmap is used for the from- or to-charset, or both. We
|
|
|
|
handle this special since it is very different from the sane way of
|
|
|
|
doing things. The other case allows converting using the iconv()
|
|
|
|
function. */
|
|
|
|
if (from_charmap != NULL || to_charmap != NULL)
|
|
|
|
/* Construct the conversion table and do the conversion. */
|
|
|
|
status = charmap_conversion (from_code, from_charmap, to_code, to_charmap,
|
2008-03-11 21:14:03 +01:00
|
|
|
argc, remaining, argv, output_file);
|
1998-02-18 18:59:16 +01:00
|
|
|
else
|
2001-02-05 06:57:24 +01:00
|
|
|
{
|
|
|
|
/* Let's see whether we have these coded character sets. */
|
|
|
|
cd = iconv_open (to_code, from_code);
|
|
|
|
if (cd == (iconv_t) -1)
|
|
|
|
{
|
|
|
|
if (errno == EINVAL)
|
2002-09-24 06:19:03 +02:00
|
|
|
{
|
|
|
|
/* Try to be nice with the user and tell her which of the
|
|
|
|
two encoding names is wrong. This is possible because
|
|
|
|
all supported encodings can be converted from/to Unicode,
|
|
|
|
in other words, because the graph of encodings is
|
|
|
|
connected. */
|
|
|
|
bool from_wrong =
|
|
|
|
(iconv_open ("UTF-8", from_code) == (iconv_t) -1
|
|
|
|
&& errno == EINVAL);
|
|
|
|
bool to_wrong =
|
|
|
|
(iconv_open (to_code, "UTF-8") == (iconv_t) -1
|
|
|
|
&& errno == EINVAL);
|
|
|
|
const char *from_pretty =
|
|
|
|
(from_code[0] ? from_code : nl_langinfo (CODESET));
|
|
|
|
const char *to_pretty =
|
|
|
|
(orig_to_code[0] ? orig_to_code : nl_langinfo (CODESET));
|
|
|
|
|
|
|
|
if (from_wrong)
|
|
|
|
{
|
|
|
|
if (to_wrong)
|
2005-02-08 00:20:05 +01:00
|
|
|
error (0, 0,
|
2002-09-24 06:19:03 +02:00
|
|
|
_("\
|
2006-09-21 06:04:20 +02:00
|
|
|
conversions from `%s' and to `%s' are not supported"),
|
2002-09-24 06:19:03 +02:00
|
|
|
from_pretty, to_pretty);
|
|
|
|
else
|
2005-02-08 00:20:05 +01:00
|
|
|
error (0, 0,
|
2002-09-24 06:19:03 +02:00
|
|
|
_("conversion from `%s' is not supported"),
|
|
|
|
from_pretty);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (to_wrong)
|
2005-02-08 00:20:05 +01:00
|
|
|
error (0, 0,
|
2002-09-24 06:19:03 +02:00
|
|
|
_("conversion to `%s' is not supported"),
|
|
|
|
to_pretty);
|
|
|
|
else
|
2005-02-08 00:20:05 +01:00
|
|
|
error (0, 0,
|
2002-09-24 06:19:03 +02:00
|
|
|
_("conversion from `%s' to `%s' is not supported"),
|
|
|
|
from_pretty, to_pretty);
|
|
|
|
}
|
2005-02-08 00:20:05 +01:00
|
|
|
|
|
|
|
argp_help (&argp, stderr, ARGP_HELP_SEE,
|
|
|
|
program_invocation_short_name);
|
|
|
|
exit (1);
|
2002-09-24 06:19:03 +02:00
|
|
|
}
|
2001-02-05 06:57:24 +01:00
|
|
|
else
|
|
|
|
error (EXIT_FAILURE, errno,
|
|
|
|
_("failed to start conversion processing"));
|
|
|
|
}
|
2000-04-30 08:52:59 +02:00
|
|
|
|
2008-03-11 21:14:03 +01:00
|
|
|
/* The output file. Will be opened when we are ready to produce
|
|
|
|
output. */
|
|
|
|
FILE *output = NULL;
|
|
|
|
|
2001-02-05 06:57:24 +01:00
|
|
|
/* Now process the remaining files. Write them to stdout or the file
|
|
|
|
specified with the `-o' parameter. If we have no file given as
|
|
|
|
the parameter process all from stdin. */
|
|
|
|
if (remaining == argc)
|
|
|
|
{
|
2008-03-11 21:14:03 +01:00
|
|
|
if (process_file (cd, stdin, &output, output_file) != 0)
|
2001-02-05 06:57:24 +01:00
|
|
|
status = EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
do
|
|
|
|
{
|
2001-07-08 09:32:45 +02:00
|
|
|
#ifdef _POSIX_MAPPED_FILES
|
2001-02-05 06:57:24 +01:00
|
|
|
struct stat st;
|
|
|
|
char *addr;
|
2001-07-08 09:32:45 +02:00
|
|
|
#endif
|
2004-03-04 20:14:56 +01:00
|
|
|
int fd, ret;
|
2001-02-05 06:57:24 +01:00
|
|
|
|
|
|
|
if (verbose)
|
2004-09-30 10:56:32 +02:00
|
|
|
fprintf (stderr, "%s:\n", argv[remaining]);
|
2001-02-05 06:57:24 +01:00
|
|
|
if (strcmp (argv[remaining], "-") == 0)
|
|
|
|
fd = 0;
|
|
|
|
else
|
2000-04-30 08:52:59 +02:00
|
|
|
{
|
2001-02-05 06:57:24 +01:00
|
|
|
fd = open (argv[remaining], O_RDONLY);
|
|
|
|
|
|
|
|
if (fd == -1)
|
|
|
|
{
|
|
|
|
error (0, errno, _("cannot open input file `%s'"),
|
|
|
|
argv[remaining]);
|
|
|
|
status = EXIT_FAILURE;
|
|
|
|
continue;
|
|
|
|
}
|
2000-04-30 08:52:59 +02:00
|
|
|
}
|
1998-02-18 18:59:16 +01:00
|
|
|
|
1998-08-03 18:47:01 +02:00
|
|
|
#ifdef _POSIX_MAPPED_FILES
|
2001-02-05 06:57:24 +01:00
|
|
|
/* We have possibilities for reading the input file. First try
|
|
|
|
to mmap() it since this will provide the fastest solution. */
|
|
|
|
if (fstat (fd, &st) == 0
|
|
|
|
&& ((addr = mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE,
|
|
|
|
fd, 0)) != MAP_FAILED))
|
1998-02-18 18:59:16 +01:00
|
|
|
{
|
2001-02-05 06:57:24 +01:00
|
|
|
/* Yes, we can use mmap(). The descriptor is not needed
|
|
|
|
anymore. */
|
|
|
|
if (close (fd) != 0)
|
|
|
|
error (EXIT_FAILURE, errno,
|
|
|
|
_("error while closing input `%s'"),
|
|
|
|
argv[remaining]);
|
|
|
|
|
2008-03-11 21:14:03 +01:00
|
|
|
ret = process_block (cd, addr, st.st_size, &output,
|
|
|
|
output_file);
|
2004-03-04 20:14:56 +01:00
|
|
|
|
|
|
|
/* We don't need the input data anymore. */
|
|
|
|
munmap ((void *) addr, st.st_size);
|
|
|
|
|
|
|
|
if (ret != 0)
|
2001-02-05 06:57:24 +01:00
|
|
|
{
|
|
|
|
status = EXIT_FAILURE;
|
|
|
|
|
2004-03-04 20:14:56 +01:00
|
|
|
if (ret < 0)
|
|
|
|
/* We cannot go on with producing output since it might
|
|
|
|
lead to problem because the last output might leave
|
|
|
|
the output stream in an undefined state. */
|
|
|
|
break;
|
2001-02-05 06:57:24 +01:00
|
|
|
}
|
1998-02-18 18:59:16 +01:00
|
|
|
}
|
2001-02-05 06:57:24 +01:00
|
|
|
else
|
1998-08-03 18:47:01 +02:00
|
|
|
#endif /* _POSIX_MAPPED_FILES */
|
1998-02-18 18:59:16 +01:00
|
|
|
{
|
2001-02-05 06:57:24 +01:00
|
|
|
/* Read the file in pieces. */
|
2008-03-11 21:14:03 +01:00
|
|
|
ret = process_fd (cd, fd, &output, output_file);
|
2004-03-04 20:14:56 +01:00
|
|
|
|
|
|
|
/* Now close the file. */
|
|
|
|
close (fd);
|
|
|
|
|
|
|
|
if (ret != 0)
|
2001-02-05 06:57:24 +01:00
|
|
|
{
|
|
|
|
/* Something went wrong. */
|
|
|
|
status = EXIT_FAILURE;
|
|
|
|
|
2004-03-04 20:14:56 +01:00
|
|
|
if (ret < 0)
|
|
|
|
/* We cannot go on with producing output since it might
|
|
|
|
lead to problem because the last output might leave
|
|
|
|
the output stream in an undefined state. */
|
|
|
|
break;
|
2001-02-05 06:57:24 +01:00
|
|
|
}
|
1998-02-18 18:59:16 +01:00
|
|
|
}
|
|
|
|
}
|
2001-02-05 06:57:24 +01:00
|
|
|
while (++remaining < argc);
|
1998-02-18 18:59:16 +01:00
|
|
|
|
2008-03-11 21:14:03 +01:00
|
|
|
/* Close the output file now. */
|
|
|
|
if (output != NULL && fclose (output))
|
|
|
|
error (EXIT_FAILURE, errno, _("error while closing output file"));
|
|
|
|
}
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Handle program arguments. */
|
|
|
|
static error_t
|
|
|
|
parse_opt (int key, char *arg, struct argp_state *state)
|
|
|
|
{
|
|
|
|
switch (key)
|
|
|
|
{
|
|
|
|
case 'f':
|
|
|
|
from_code = arg;
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
to_code = arg;
|
|
|
|
break;
|
|
|
|
case 'o':
|
|
|
|
output_file = arg;
|
|
|
|
break;
|
2000-04-30 08:52:59 +02:00
|
|
|
case 's':
|
|
|
|
/* Nothing, for now at least. We are not giving out any information
|
|
|
|
about missing character or so. */
|
|
|
|
break;
|
|
|
|
case 'c':
|
2000-06-06 05:16:30 +02:00
|
|
|
/* Omit invalid characters from output. */
|
|
|
|
omit_invalid = 1;
|
2000-04-30 08:52:59 +02:00
|
|
|
break;
|
1998-02-18 18:59:16 +01:00
|
|
|
case OPT_VERBOSE:
|
|
|
|
verbose = 1;
|
|
|
|
break;
|
1998-04-01 18:15:20 +02:00
|
|
|
case OPT_LIST:
|
|
|
|
list = 1;
|
|
|
|
break;
|
1998-02-18 18:59:16 +01:00
|
|
|
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 ("\
|
2004-05-17 20:59:35 +02:00
|
|
|
For bug reporting instructions, please see:\n\
|
|
|
|
<http://www.gnu.org/software/libc/bugs.html>.\n"));
|
1998-02-18 18:59:16 +01:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return (char *) text;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Print the version information. */
|
|
|
|
static void
|
|
|
|
print_version (FILE *stream, struct argp_state *state)
|
|
|
|
{
|
|
|
|
fprintf (stream, "iconv (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\
|
2011-01-17 21:08:10 +01:00
|
|
|
"), "2011");
|
1998-02-18 18:59:16 +01:00
|
|
|
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2008-03-11 21:14:03 +01:00
|
|
|
write_output (const char *outbuf, const char *outptr, FILE **output,
|
|
|
|
const char *output_file)
|
|
|
|
{
|
|
|
|
/* We have something to write out. */
|
|
|
|
int errno_save = errno;
|
|
|
|
|
|
|
|
if (*output == NULL)
|
|
|
|
{
|
|
|
|
/* Determine output file. */
|
|
|
|
if (output_file != NULL && strcmp (output_file, "-") != 0)
|
|
|
|
{
|
|
|
|
*output = fopen (output_file, "w");
|
2010-01-25 16:17:47 +01:00
|
|
|
if (*output == NULL)
|
2008-03-11 21:14:03 +01:00
|
|
|
error (EXIT_FAILURE, errno, _("cannot open output file"));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*output = stdout;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fwrite (outbuf, 1, outptr - outbuf, *output) < (size_t) (outptr - outbuf)
|
|
|
|
|| ferror (*output))
|
|
|
|
{
|
|
|
|
/* Error occurred while printing the result. */
|
|
|
|
error (0, 0, _("\
|
|
|
|
conversion stopped due to problem in writing the output"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
errno = errno_save;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
process_block (iconv_t cd, char *addr, size_t len, FILE **output,
|
|
|
|
const char *output_file)
|
1998-02-18 18:59:16 +01:00
|
|
|
{
|
|
|
|
#define OUTBUF_SIZE 32768
|
1998-04-24 09:07:59 +02:00
|
|
|
const char *start = addr;
|
1998-02-18 18:59:16 +01:00
|
|
|
char outbuf[OUTBUF_SIZE];
|
Update.
1998-04-20 18:00 Ulrich Drepper <drepper@cygnus.com>
* libc.map: Add __dgettext to GLIBC_2.0 and __libc_longjmp, and
__libc_siglongjmp to GLIBC_2.1.
* elf/dl-minimal.c (__assert_perror_fail): Don't use strerror, use
__strerror_r.
* iconv/Makefile: Don't run tests now.
* iconv/iconv_prog.c (process_block): If loop is repeated, call iconv
with correct output buffer.
Major rewrite of the low-level gconv functionality.
* iconv/gconv.c: Rewritten.
* iconv/gconv.h: Likewise.
* iconv/gconv_builtin.c: Likewise.
* iconv/gconv_builtin.h: Likewise.
* iconv/gconv_conf.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/iconv.c: Likewise.
* iconvdata/8bit-gap.c: Likewise.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/Makefile: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/cns11643.c: Likewise.
* iconvdata/cns11643.h: Likewise.
* iconvdata/cns11643l1.c: Likewise.
* iconvdata/cns11643l1.h: Likewise.
* iconvdata/ebcdic-at-de-a.c: Likewise.
* iconvdata/ebcdic-at-de.c: Likewise.
* iconvdata/ebcdic-ca-fr.c: Likewise.
* iconvdata/euccn.c: Likewise.
* iconvdata/eucjp.c: Likewise.
* iconvdata/euckr.c: Likewise.
* iconvdata/euctw.c: Likewise.
* iconvdata/gb2312.c: Likewise.
* iconvdata/gb2312.h: Likewise.
* iconvdata/hp-roman8.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso6937.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso8859-10.c: Likewise.
* iconvdata/iso8859-2.c: Likewise.
* iconvdata/iso8859-3.c: Likewise.
* iconvdata/iso8859-4.c: Likewise.
* iconvdata/iso8859-5.c: Likewise.
* iconvdata/iso8859-6.c: Likewise.
* iconvdata/iso8859-7.c: Likewise.
* iconvdata/iso8859-8.c: Likewise.
* iconvdata/iso8859-9.c: Likewise.
* iconvdata/jis0201.c: Likewise.
* iconvdata/jis0201.h: Likewise.
* iconvdata/jis0208.c: Likewise.
* iconvdata/jis0208.h: Likewise.
* iconvdata/jis0212.c: Likewise.
* iconvdata/jis0212.h: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/koi-8.c: Likewise.
* iconvdata/koi8-r.c: Likewise.
* iconvdata/ksc5601.c: Likewise.
* iconvdata/ksc5601.h: Likewise.
* iconvdata/latin-greek-1.c: Likewise.
* iconvdata/latin-greek.c: Likewise.
* iconvdata/run-iconv-test.sh: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* wcsmbs/btowc.c: Likewise.
* wcsmbs/mbrtowc.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsmbsload.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wctob.c: Likewise.
* iconv/loop.c: New file.
* iconv/skeleton.c: New file.
* stdlib/mblen.c: Handle empty input string correctly.
* stdlib/mbtowc.c: Likewise.
* posix/getopt.c: Various cleanups.
* sysdeps/arm/bits/setjmp.h: Add copyright text.
* sysdeps/i386/bits/setjmp.h: Likewise.
* sysdeps/m68k/bits/setjmp.h: Likewise.
* sysdeps/powerpc/bits/setjmp.h: Likewise.
* sysdeps/sparc/sparc32/bits/setjmp.h: Likewise.
* sysdeps/generic/longjmp.c: Rename function to __libc_siglongjmp
and make longjmp weak alias.
1998-04-18 20:29 Philip Blundell <Philip.Blundell@pobox.com>
* iconv/Makefile (routines): Only include gconv_dl if building for
an ELF system - dynamic linking is not available on a.out.
(CFLAGS-gconv_conf.c): Define STATIC_GCONV if omitting gconv_dl
due to above check.
* iconv/gconv_db.c: If STATIC_GCONV defined, don't try to call
routines from gconv_dl.
1998-04-17 Gordon Matzigkeit <gord@profitpress.com>
* csu/init.c (_IO_stdin_used): Protect with USE_IN_LIBIO so that
we can compile without libio.
1998-04-20 16:28 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/Subdirs: Remove login.
1998-04-11 Gordon Matzigkeit <gord@profitpress.com>
* db2/compat.h: Include <errno.h>, to make sure we get the
definition of EFTYPE before we define it ourselves.
1998-04-10 Gordon Matzigkeit <gord@profitpress.com>
* sysdeps/generic/bits/socket.h: Protect against multiple inclusion.
* sysdeps/mach/hurd/bits/ioctls.h: Likewise.
Fix typo to allow inclusion from sys/ioctl.h again.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* iconvdata/*.[ch]: Clean up namespace. Optimize character lookup.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libc.map: Export __strerror_r. Remove _strerror_internal.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/strcasestr.c: Undefine strcasestr, not strstr.
Also undefine __strcasestr.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/regex.c: Rename __re_max_failures back to re_max_failures,
aliases do not work with global variables due to copy relocations.
1998-04-20 15:12 Ulrich Drepper <drepper@cygnus.com>
* manual/creature.texi: Fix type. Patch by Andreas Schwab.
1998-04-20 13:47 Ulrich Drepper <drepper@cygnus.com>
* signal/sighold.c: Include stddef.h for NULL definition.
* signal/sigrelse.c: Likewise.
* sysdeps/posix/sigignore.c: Likewise.
* sysdeps/posix/sigset.c: Likewise.
* sysdeps/posix/waitid.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigsuspend.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigtimedwait.c: Likewise.
* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
* wcsmbs/mbsrtowcs.c: Include stdlib.h for MB_CUR_MAX.
Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
1998-04-13 Mark Kettenis <kettenis@phys.uva.nl>
* login/Makefile (headers): Remove utmpx.h and bits/utmpx.h.
* login/getutent.c (getutxent): Remove alias.
* login/getutent_r.c (setutxent, pututxline, endutxent):
Remove aliases.
* login/getutid.c (getutxid): Remove alias.
* login/getutline.c (getutxline): Remove alias.
* login/utmp.h: Add prototypes for __updwtmp, __getutent,
__getutid, __getutline and __pututline.
* login/utmpx.h: Moved to ...
* sysdeps/gnu/utmpx.h: ... here. [__USE_GNU]: Define UTMPX_FILE,
UTMPX_FILENAME, WTMPX_FILE and WTMPX_FILENAME, declare utmpxname
and updwtmpx.
* login/updwtmp.c: Moved to ...
* sysdeps/generic/updwtmp.c: ... here. (updwtmp): Generalized by
allowing file name transformation.
* sysdeps/gnu/updwtmp.c: New file. Use generic implementation with
additional file name transformation.
* sysdeps/unix/sysv/linux/updwtmp.c: Likewise.
* login/utmp_file.c: Moved to ...
* sysdeps/generic/utmp_file.c: ... here. (setutent_file):
Generalized by allowing file name transformation. Do not
print error message. Library functions should not print them.
Reported by Jim Meyering.
* sysdeps/gnu/utmp_file.c: New file. Use generic implementation
with additional file name transformation.
* sysdeps/unix/sysv/linux/utmp_file.c: Likewise.
* sysdeps/gnu/Makefile [$(subdir)=login] (sysdep_routines): Add
setutxent, getutxent, endutxent, getutxid, getutxid, getutxline,
pututxline, utmpxname and updwtmpx. (sysdep_headers): Add utmpx.h
and bits/utmpx.h.
* sysdeps/gnu/bits/utmpx.h [__USE_GNU] Include paths.h.
(_PATH_UTMPX): Define to _PATH_UTMP. (_PATH_WTMPX): Define to
_PATH_WTMPX. (RUN_LVL): Define only if __USE_GNU. (ACCOUNTING):
Define if __USE_GNU.
* sysdeps/gnu/setutxent.c: New file.
* sysdeps/gnu/getutxent.c: New file.
* sysdeps/gnu/endutxent.c: New file.
* sysdeps/gnu/getutxid.c: New file.
* sysdeps/gnu/getutxline.c: New file.
* sysdeps/gnu/pututxline.c: New file.
* sysdeps/gnu/utmpxname.c: New file.
* sysdeps/gnu/updwtmpx.c: New file.
* sysdeps/unix/sysv/linux/paths.h (_PATH_UTMP_DB): Remove.
* sysdeps/generic/bits/utmpx.h: Remove.
1998-04-20 Ulrich Drepper <drepper@cygnus.com>
* posix/wordexp-test.c (main): Initialize ifs element of ts for
~root test.
1998-04-17 07:53 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/i386/s_pread64.S: Fix a typo.
1998-04-17 11:32 Ulrich Drepper <drepper@cygnus.com>
* libio/oldfileops.c (_IO_old_file_seekoff): Define temporary st
variable using _G_stat64.
* libio/fileops.c: Remove macro definition of fstat, it is in the
global header.
Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.
1998-04-17 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/strlen.S: New file, based on code by Matthew Wilcox
<willy@odie.barnet.ac.uk>.
1998-04-16 Philip Blundell <Philip.Blundell@pobox.com>
* inet/netinet/in.h (IN6_IS_ADDR_MC_NODELOCAL): New macro,
required by IPv6 Basic API.
(IN6_IS_ADDR_MC_LINKLOCAL): Likewise.
(IN6_IS_ADDR_MC_SITELOCAL): Likewise.
(IN6_IS_ADDR_MC_ORGLOCAL): Likewise.
(IN6_IS_ADDR_MC_GLOBAL): Likewise.
1998-04-20 20:41:05 +02:00
|
|
|
char *outptr;
|
|
|
|
size_t outlen;
|
|
|
|
size_t n;
|
2004-03-04 20:14:56 +01:00
|
|
|
int ret = 0;
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
while (len > 0)
|
|
|
|
{
|
Update.
1998-04-20 18:00 Ulrich Drepper <drepper@cygnus.com>
* libc.map: Add __dgettext to GLIBC_2.0 and __libc_longjmp, and
__libc_siglongjmp to GLIBC_2.1.
* elf/dl-minimal.c (__assert_perror_fail): Don't use strerror, use
__strerror_r.
* iconv/Makefile: Don't run tests now.
* iconv/iconv_prog.c (process_block): If loop is repeated, call iconv
with correct output buffer.
Major rewrite of the low-level gconv functionality.
* iconv/gconv.c: Rewritten.
* iconv/gconv.h: Likewise.
* iconv/gconv_builtin.c: Likewise.
* iconv/gconv_builtin.h: Likewise.
* iconv/gconv_conf.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/iconv.c: Likewise.
* iconvdata/8bit-gap.c: Likewise.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/Makefile: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/cns11643.c: Likewise.
* iconvdata/cns11643.h: Likewise.
* iconvdata/cns11643l1.c: Likewise.
* iconvdata/cns11643l1.h: Likewise.
* iconvdata/ebcdic-at-de-a.c: Likewise.
* iconvdata/ebcdic-at-de.c: Likewise.
* iconvdata/ebcdic-ca-fr.c: Likewise.
* iconvdata/euccn.c: Likewise.
* iconvdata/eucjp.c: Likewise.
* iconvdata/euckr.c: Likewise.
* iconvdata/euctw.c: Likewise.
* iconvdata/gb2312.c: Likewise.
* iconvdata/gb2312.h: Likewise.
* iconvdata/hp-roman8.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso6937.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso8859-10.c: Likewise.
* iconvdata/iso8859-2.c: Likewise.
* iconvdata/iso8859-3.c: Likewise.
* iconvdata/iso8859-4.c: Likewise.
* iconvdata/iso8859-5.c: Likewise.
* iconvdata/iso8859-6.c: Likewise.
* iconvdata/iso8859-7.c: Likewise.
* iconvdata/iso8859-8.c: Likewise.
* iconvdata/iso8859-9.c: Likewise.
* iconvdata/jis0201.c: Likewise.
* iconvdata/jis0201.h: Likewise.
* iconvdata/jis0208.c: Likewise.
* iconvdata/jis0208.h: Likewise.
* iconvdata/jis0212.c: Likewise.
* iconvdata/jis0212.h: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/koi-8.c: Likewise.
* iconvdata/koi8-r.c: Likewise.
* iconvdata/ksc5601.c: Likewise.
* iconvdata/ksc5601.h: Likewise.
* iconvdata/latin-greek-1.c: Likewise.
* iconvdata/latin-greek.c: Likewise.
* iconvdata/run-iconv-test.sh: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* wcsmbs/btowc.c: Likewise.
* wcsmbs/mbrtowc.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsmbsload.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wctob.c: Likewise.
* iconv/loop.c: New file.
* iconv/skeleton.c: New file.
* stdlib/mblen.c: Handle empty input string correctly.
* stdlib/mbtowc.c: Likewise.
* posix/getopt.c: Various cleanups.
* sysdeps/arm/bits/setjmp.h: Add copyright text.
* sysdeps/i386/bits/setjmp.h: Likewise.
* sysdeps/m68k/bits/setjmp.h: Likewise.
* sysdeps/powerpc/bits/setjmp.h: Likewise.
* sysdeps/sparc/sparc32/bits/setjmp.h: Likewise.
* sysdeps/generic/longjmp.c: Rename function to __libc_siglongjmp
and make longjmp weak alias.
1998-04-18 20:29 Philip Blundell <Philip.Blundell@pobox.com>
* iconv/Makefile (routines): Only include gconv_dl if building for
an ELF system - dynamic linking is not available on a.out.
(CFLAGS-gconv_conf.c): Define STATIC_GCONV if omitting gconv_dl
due to above check.
* iconv/gconv_db.c: If STATIC_GCONV defined, don't try to call
routines from gconv_dl.
1998-04-17 Gordon Matzigkeit <gord@profitpress.com>
* csu/init.c (_IO_stdin_used): Protect with USE_IN_LIBIO so that
we can compile without libio.
1998-04-20 16:28 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/Subdirs: Remove login.
1998-04-11 Gordon Matzigkeit <gord@profitpress.com>
* db2/compat.h: Include <errno.h>, to make sure we get the
definition of EFTYPE before we define it ourselves.
1998-04-10 Gordon Matzigkeit <gord@profitpress.com>
* sysdeps/generic/bits/socket.h: Protect against multiple inclusion.
* sysdeps/mach/hurd/bits/ioctls.h: Likewise.
Fix typo to allow inclusion from sys/ioctl.h again.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* iconvdata/*.[ch]: Clean up namespace. Optimize character lookup.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libc.map: Export __strerror_r. Remove _strerror_internal.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/strcasestr.c: Undefine strcasestr, not strstr.
Also undefine __strcasestr.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/regex.c: Rename __re_max_failures back to re_max_failures,
aliases do not work with global variables due to copy relocations.
1998-04-20 15:12 Ulrich Drepper <drepper@cygnus.com>
* manual/creature.texi: Fix type. Patch by Andreas Schwab.
1998-04-20 13:47 Ulrich Drepper <drepper@cygnus.com>
* signal/sighold.c: Include stddef.h for NULL definition.
* signal/sigrelse.c: Likewise.
* sysdeps/posix/sigignore.c: Likewise.
* sysdeps/posix/sigset.c: Likewise.
* sysdeps/posix/waitid.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigsuspend.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigtimedwait.c: Likewise.
* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
* wcsmbs/mbsrtowcs.c: Include stdlib.h for MB_CUR_MAX.
Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
1998-04-13 Mark Kettenis <kettenis@phys.uva.nl>
* login/Makefile (headers): Remove utmpx.h and bits/utmpx.h.
* login/getutent.c (getutxent): Remove alias.
* login/getutent_r.c (setutxent, pututxline, endutxent):
Remove aliases.
* login/getutid.c (getutxid): Remove alias.
* login/getutline.c (getutxline): Remove alias.
* login/utmp.h: Add prototypes for __updwtmp, __getutent,
__getutid, __getutline and __pututline.
* login/utmpx.h: Moved to ...
* sysdeps/gnu/utmpx.h: ... here. [__USE_GNU]: Define UTMPX_FILE,
UTMPX_FILENAME, WTMPX_FILE and WTMPX_FILENAME, declare utmpxname
and updwtmpx.
* login/updwtmp.c: Moved to ...
* sysdeps/generic/updwtmp.c: ... here. (updwtmp): Generalized by
allowing file name transformation.
* sysdeps/gnu/updwtmp.c: New file. Use generic implementation with
additional file name transformation.
* sysdeps/unix/sysv/linux/updwtmp.c: Likewise.
* login/utmp_file.c: Moved to ...
* sysdeps/generic/utmp_file.c: ... here. (setutent_file):
Generalized by allowing file name transformation. Do not
print error message. Library functions should not print them.
Reported by Jim Meyering.
* sysdeps/gnu/utmp_file.c: New file. Use generic implementation
with additional file name transformation.
* sysdeps/unix/sysv/linux/utmp_file.c: Likewise.
* sysdeps/gnu/Makefile [$(subdir)=login] (sysdep_routines): Add
setutxent, getutxent, endutxent, getutxid, getutxid, getutxline,
pututxline, utmpxname and updwtmpx. (sysdep_headers): Add utmpx.h
and bits/utmpx.h.
* sysdeps/gnu/bits/utmpx.h [__USE_GNU] Include paths.h.
(_PATH_UTMPX): Define to _PATH_UTMP. (_PATH_WTMPX): Define to
_PATH_WTMPX. (RUN_LVL): Define only if __USE_GNU. (ACCOUNTING):
Define if __USE_GNU.
* sysdeps/gnu/setutxent.c: New file.
* sysdeps/gnu/getutxent.c: New file.
* sysdeps/gnu/endutxent.c: New file.
* sysdeps/gnu/getutxid.c: New file.
* sysdeps/gnu/getutxline.c: New file.
* sysdeps/gnu/pututxline.c: New file.
* sysdeps/gnu/utmpxname.c: New file.
* sysdeps/gnu/updwtmpx.c: New file.
* sysdeps/unix/sysv/linux/paths.h (_PATH_UTMP_DB): Remove.
* sysdeps/generic/bits/utmpx.h: Remove.
1998-04-20 Ulrich Drepper <drepper@cygnus.com>
* posix/wordexp-test.c (main): Initialize ifs element of ts for
~root test.
1998-04-17 07:53 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/i386/s_pread64.S: Fix a typo.
1998-04-17 11:32 Ulrich Drepper <drepper@cygnus.com>
* libio/oldfileops.c (_IO_old_file_seekoff): Define temporary st
variable using _G_stat64.
* libio/fileops.c: Remove macro definition of fstat, it is in the
global header.
Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.
1998-04-17 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/strlen.S: New file, based on code by Matthew Wilcox
<willy@odie.barnet.ac.uk>.
1998-04-16 Philip Blundell <Philip.Blundell@pobox.com>
* inet/netinet/in.h (IN6_IS_ADDR_MC_NODELOCAL): New macro,
required by IPv6 Basic API.
(IN6_IS_ADDR_MC_LINKLOCAL): Likewise.
(IN6_IS_ADDR_MC_SITELOCAL): Likewise.
(IN6_IS_ADDR_MC_ORGLOCAL): Likewise.
(IN6_IS_ADDR_MC_GLOBAL): Likewise.
1998-04-20 20:41:05 +02:00
|
|
|
outptr = outbuf;
|
|
|
|
outlen = OUTBUF_SIZE;
|
|
|
|
n = iconv (cd, &addr, &len, &outptr, &outlen);
|
1998-02-18 18:59:16 +01:00
|
|
|
|
2004-03-04 20:14:56 +01:00
|
|
|
if (n == (size_t) -1 && omit_invalid && errno == EILSEQ)
|
|
|
|
{
|
|
|
|
ret = 1;
|
|
|
|
if (len == 0)
|
|
|
|
n = 0;
|
|
|
|
else
|
|
|
|
errno = E2BIG;
|
|
|
|
}
|
|
|
|
|
1998-02-18 18:59:16 +01:00
|
|
|
if (outptr != outbuf)
|
|
|
|
{
|
2008-03-11 21:14:03 +01:00
|
|
|
ret = write_output (outbuf, outptr, output, output_file);
|
|
|
|
if (ret != 0)
|
|
|
|
break;
|
1998-02-18 18:59:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (n != (size_t) -1)
|
1999-11-25 20:27:07 +01:00
|
|
|
{
|
|
|
|
/* All the input test is processed. For state-dependent
|
2010-03-15 19:50:59 +01:00
|
|
|
character sets we have to flush the state now. */
|
1999-11-25 20:27:07 +01:00
|
|
|
outptr = outbuf;
|
|
|
|
outlen = OUTBUF_SIZE;
|
2004-03-04 20:14:56 +01:00
|
|
|
n = iconv (cd, NULL, NULL, &outptr, &outlen);
|
1999-11-25 20:27:07 +01:00
|
|
|
|
|
|
|
if (outptr != outbuf)
|
|
|
|
{
|
2008-03-11 21:14:03 +01:00
|
|
|
ret = write_output (outbuf, outptr, output, output_file);
|
|
|
|
if (ret != 0)
|
|
|
|
break;
|
1999-11-25 20:27:07 +01:00
|
|
|
}
|
|
|
|
|
2004-03-04 20:14:56 +01:00
|
|
|
if (n != (size_t) -1)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (omit_invalid && errno == EILSEQ)
|
|
|
|
{
|
|
|
|
ret = 1;
|
|
|
|
break;
|
|
|
|
}
|
1999-11-25 20:27:07 +01:00
|
|
|
}
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
if (errno != E2BIG)
|
|
|
|
{
|
|
|
|
/* iconv() ran into a problem. */
|
|
|
|
switch (errno)
|
|
|
|
{
|
|
|
|
case EILSEQ:
|
2003-04-06 22:36:19 +02:00
|
|
|
if (! omit_invalid)
|
|
|
|
error (0, 0, _("illegal input sequence at position %ld"),
|
|
|
|
(long int) (addr - start));
|
1998-02-18 18:59:16 +01:00
|
|
|
break;
|
|
|
|
case EINVAL:
|
|
|
|
error (0, 0, _("\
|
|
|
|
incomplete character or shift sequence at end of buffer"));
|
|
|
|
break;
|
|
|
|
case EBADF:
|
|
|
|
error (0, 0, _("internal error (illegal descriptor)"));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
error (0, 0, _("unknown iconv() error %d"), errno);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-03-04 20:14:56 +01:00
|
|
|
return ret;
|
1998-02-18 18:59:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2008-03-11 21:14:03 +01:00
|
|
|
process_fd (iconv_t cd, int fd, FILE **output, const char *output_file)
|
1998-02-18 18:59:16 +01:00
|
|
|
{
|
|
|
|
/* we have a problem with reading from a desriptor since we must not
|
|
|
|
provide the iconv() function an incomplete character or shift
|
|
|
|
sequence at the end of the buffer. Since we have to deal with
|
|
|
|
arbitrary encodings we must read the whole text in a buffer and
|
|
|
|
process it in one step. */
|
|
|
|
static char *inbuf = NULL;
|
|
|
|
static size_t maxlen = 0;
|
|
|
|
char *inptr = NULL;
|
|
|
|
size_t actlen = 0;
|
|
|
|
|
|
|
|
while (actlen < maxlen)
|
|
|
|
{
|
2001-01-12 18:03:52 +01:00
|
|
|
ssize_t n = read (fd, inptr, maxlen - actlen);
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
if (n == 0)
|
|
|
|
/* No more text to read. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (n == -1)
|
|
|
|
{
|
|
|
|
/* Error while reading. */
|
|
|
|
error (0, errno, _("error while reading the input"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
inptr += n;
|
|
|
|
actlen += n;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (actlen == maxlen)
|
|
|
|
while (1)
|
|
|
|
{
|
2001-01-12 18:03:52 +01:00
|
|
|
ssize_t n;
|
2001-12-29 16:57:15 +01:00
|
|
|
char *new_inbuf;
|
1998-02-18 18:59:16 +01:00
|
|
|
|
|
|
|
/* Increase the buffer. */
|
2001-12-29 16:57:15 +01:00
|
|
|
new_inbuf = (char *) realloc (inbuf, maxlen + 32768);
|
|
|
|
if (new_inbuf == NULL)
|
|
|
|
{
|
|
|
|
error (0, errno, _("unable to allocate buffer for input"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
inbuf = new_inbuf;
|
1998-02-18 18:59:16 +01:00
|
|
|
maxlen += 32768;
|
|
|
|
inptr = inbuf + actlen;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
n = read (fd, inptr, maxlen - actlen);
|
|
|
|
|
|
|
|
if (n == 0)
|
|
|
|
/* No more text to read. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (n == -1)
|
|
|
|
{
|
|
|
|
/* Error while reading. */
|
|
|
|
error (0, errno, _("error while reading the input"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
inptr += n;
|
|
|
|
actlen += n;
|
|
|
|
}
|
|
|
|
while (actlen < maxlen);
|
|
|
|
|
|
|
|
if (n == 0)
|
|
|
|
/* Break again so we leave both loops. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we have all the input in the buffer. Process it in one run. */
|
2008-03-11 21:14:03 +01:00
|
|
|
return process_block (cd, inbuf, actlen, output, output_file);
|
1998-02-18 18:59:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2008-03-11 21:14:03 +01:00
|
|
|
process_file (iconv_t cd, FILE *input, FILE **output, const char *output_file)
|
1998-02-18 18:59:16 +01:00
|
|
|
{
|
|
|
|
/* This should be safe since we use this function only for `stdin' and
|
|
|
|
we haven't read anything so far. */
|
2008-03-11 21:14:03 +01:00
|
|
|
return process_fd (cd, fileno (input), output, output_file);
|
1998-02-18 18:59:16 +01:00
|
|
|
}
|
1998-04-01 18:15:20 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* Print all known character sets/encodings. */
|
|
|
|
static void *printlist;
|
|
|
|
static size_t column;
|
|
|
|
static int not_first;
|
|
|
|
|
|
|
|
static void
|
|
|
|
insert_print_list (const void *nodep, VISIT value, int level)
|
|
|
|
{
|
|
|
|
if (value == leaf || value == postorder)
|
|
|
|
{
|
|
|
|
const struct gconv_alias *s = *(const struct gconv_alias **) nodep;
|
1998-04-24 09:07:59 +02:00
|
|
|
tsearch (s->fromname, &printlist, (__compar_fn_t) strverscmp);
|
1998-04-01 18:15:20 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-04-20 19:33:29 +02:00
|
|
|
do_print_human (const void *nodep, VISIT value, int level)
|
1998-04-01 18:15:20 +02:00
|
|
|
{
|
|
|
|
if (value == leaf || value == postorder)
|
|
|
|
{
|
|
|
|
const char *s = *(const char **) nodep;
|
|
|
|
size_t len = strlen (s);
|
|
|
|
size_t cnt;
|
|
|
|
|
|
|
|
while (len > 0 && s[len - 1] == '/')
|
|
|
|
--len;
|
|
|
|
|
|
|
|
for (cnt = 0; cnt < len; ++cnt)
|
|
|
|
if (isalnum (s[cnt]))
|
|
|
|
break;
|
|
|
|
if (cnt == len)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (not_first)
|
|
|
|
{
|
|
|
|
putchar (',');
|
|
|
|
++column;
|
|
|
|
|
|
|
|
if (column > 2 && column + len > 77)
|
|
|
|
{
|
|
|
|
fputs ("\n ", stdout);
|
|
|
|
column = 2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
putchar (' ');
|
|
|
|
++column;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
1998-04-24 09:07:59 +02:00
|
|
|
not_first = 1;
|
1998-04-01 18:15:20 +02:00
|
|
|
|
|
|
|
fwrite (s, len, 1, stdout);
|
|
|
|
column += len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-04-20 19:33:29 +02:00
|
|
|
static void
|
|
|
|
do_print (const void *nodep, VISIT value, int level)
|
|
|
|
{
|
|
|
|
if (value == leaf || value == postorder)
|
|
|
|
{
|
|
|
|
const char *s = *(const char **) nodep;
|
|
|
|
|
|
|
|
puts (s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-04-01 18:15:20 +02:00
|
|
|
static void
|
1999-01-19 00:15:16 +01:00
|
|
|
internal_function
|
|
|
|
add_known_names (struct gconv_module *node)
|
|
|
|
{
|
|
|
|
if (node->left != NULL)
|
|
|
|
add_known_names (node->left);
|
|
|
|
if (node->right != NULL)
|
|
|
|
add_known_names (node->right);
|
|
|
|
do
|
|
|
|
{
|
2000-06-20 02:34:21 +02:00
|
|
|
if (strcmp (node->from_string, "INTERNAL"))
|
|
|
|
tsearch (node->from_string, &printlist,
|
|
|
|
(__compar_fn_t) strverscmp);
|
2001-09-01 21:03:22 +02:00
|
|
|
if (strcmp (node->to_string, "INTERNAL") != 0)
|
2000-06-20 02:34:21 +02:00
|
|
|
tsearch (node->to_string, &printlist, (__compar_fn_t) strverscmp);
|
1999-01-19 00:15:16 +01:00
|
|
|
|
2000-06-20 02:34:21 +02:00
|
|
|
node = node->same;
|
1999-01-19 00:15:16 +01:00
|
|
|
}
|
|
|
|
while (node != NULL);
|
|
|
|
}
|
|
|
|
|
2001-09-01 21:03:22 +02:00
|
|
|
|
|
|
|
static void
|
|
|
|
insert_cache (void)
|
|
|
|
{
|
|
|
|
const struct gconvcache_header *header;
|
|
|
|
const char *strtab;
|
|
|
|
const struct hash_entry *hashtab;
|
|
|
|
size_t cnt;
|
|
|
|
|
2002-08-05 01:32:14 +02:00
|
|
|
header = (const struct gconvcache_header *) __gconv_get_cache ();
|
|
|
|
strtab = (char *) header + header->string_offset;
|
|
|
|
hashtab = (struct hash_entry *) ((char *) header + header->hash_offset);
|
2001-09-01 21:03:22 +02:00
|
|
|
|
|
|
|
for (cnt = 0; cnt < header->hash_size; ++cnt)
|
|
|
|
if (hashtab[cnt].string_offset != 0)
|
|
|
|
{
|
|
|
|
const char *str = strtab + hashtab[cnt].string_offset;
|
|
|
|
|
|
|
|
if (strcmp (str, "INTERNAL") != 0)
|
|
|
|
tsearch (str, &printlist, (__compar_fn_t) strverscmp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-01-19 00:15:16 +01:00
|
|
|
static void
|
|
|
|
internal_function
|
1998-04-01 18:15:20 +02:00
|
|
|
print_known_names (void)
|
|
|
|
{
|
|
|
|
iconv_t h;
|
2002-08-05 01:32:14 +02:00
|
|
|
void *cache;
|
1998-04-01 18:15:20 +02:00
|
|
|
|
|
|
|
/* We must initialize the internal databases first. */
|
|
|
|
h = iconv_open ("L1", "L1");
|
|
|
|
iconv_close (h);
|
|
|
|
|
2001-09-01 21:03:22 +02:00
|
|
|
/* See whether we have a cache. */
|
2002-08-05 01:32:14 +02:00
|
|
|
cache = __gconv_get_cache ();
|
|
|
|
if (cache != NULL)
|
2001-09-01 21:03:22 +02:00
|
|
|
/* Yep, use only this information. */
|
|
|
|
insert_cache ();
|
|
|
|
else
|
|
|
|
{
|
2002-08-05 01:32:14 +02:00
|
|
|
struct gconv_module *modules;
|
|
|
|
|
2001-09-01 21:03:22 +02:00
|
|
|
/* No, then use the information read from the gconv-modules file.
|
|
|
|
First add the aliases. */
|
2002-08-05 01:32:14 +02:00
|
|
|
twalk (__gconv_get_alias_db (), insert_print_list);
|
1998-04-01 18:15:20 +02:00
|
|
|
|
2001-09-01 21:03:22 +02:00
|
|
|
/* Add the from- and to-names from the known modules. */
|
2002-08-05 01:32:14 +02:00
|
|
|
modules = __gconv_get_modules_db ();
|
|
|
|
if (modules != NULL)
|
|
|
|
add_known_names (modules);
|
2001-09-01 21:03:22 +02:00
|
|
|
}
|
1998-04-01 18:15:20 +02:00
|
|
|
|
2004-07-17 19:45:03 +02:00
|
|
|
bool human_readable = isatty (fileno (stdout));
|
|
|
|
|
|
|
|
if (human_readable)
|
|
|
|
fputs (_("\
|
1998-04-01 18:15:20 +02:00
|
|
|
The following list contain all the coded character sets known. This does\n\
|
|
|
|
not necessarily mean that all combinations of these names can be used for\n\
|
|
|
|
the FROM and TO command line parameters. One coded character set can be\n\
|
2000-06-20 02:34:21 +02:00
|
|
|
listed with several different names (aliases).\n\n "), stdout);
|
1998-04-01 18:15:20 +02:00
|
|
|
|
|
|
|
/* Now print the collected names. */
|
|
|
|
column = 2;
|
2004-07-17 19:45:03 +02:00
|
|
|
twalk (printlist, human_readable ? do_print_human : do_print);
|
1998-04-01 18:15:20 +02:00
|
|
|
|
2004-07-17 19:45:03 +02:00
|
|
|
if (human_readable && column != 0)
|
|
|
|
puts ("");
|
1998-04-01 18:15:20 +02:00
|
|
|
}
|