2018-01-01 00:32:25 +00:00
|
|
|
/* Copyright (C) 2000-2018 Free Software Foundation, Inc.
|
2000-10-01 19:15:29 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
2007-07-16 00:56:07 +00: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.
|
2000-10-01 19:15:29 +00:00
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
This program is distributed in the hope that it will be useful,
|
2000-10-01 19:15:29 +00:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2005-12-07 05:49:17 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
2000-10-01 19:15:29 +00:00
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
You should have received a copy of the GNU General Public License
|
2012-02-09 23:18:22 +00:00
|
|
|
along with this program; if not, see <http://www.gnu.org/licenses/>. */
|
2000-10-01 19:15:29 +00:00
|
|
|
|
|
|
|
#include <dirent.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <libintl.h>
|
|
|
|
#include <spawn.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
2002-02-05 23:29:24 +00:00
|
|
|
#include "localedef.h"
|
2000-10-01 19:15:29 +00:00
|
|
|
#include "charmap-dir.h"
|
|
|
|
|
|
|
|
/* The data type of a charmap directory being traversed. */
|
|
|
|
struct charmap_dir
|
|
|
|
{
|
|
|
|
DIR *dir;
|
|
|
|
/* The directory pathname, ending in a slash. */
|
|
|
|
char *directory;
|
|
|
|
size_t directory_len;
|
|
|
|
/* Scratch area used for returning pathnames. */
|
|
|
|
char *pathname;
|
|
|
|
size_t pathname_size;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Starts a charmap directory traversal.
|
|
|
|
Returns a CHARMAP_DIR, or NULL if the directory doesn't exist. */
|
|
|
|
CHARMAP_DIR *
|
|
|
|
charmap_opendir (const char *directory)
|
|
|
|
{
|
|
|
|
struct charmap_dir *cdir;
|
|
|
|
DIR *dir;
|
|
|
|
size_t len;
|
|
|
|
int add_slash;
|
|
|
|
|
|
|
|
dir = opendir (directory);
|
|
|
|
if (dir == NULL)
|
|
|
|
{
|
locale: Fix localedef exit code (Bug 22292)
The error and warning handling in localedef, locale, and iconv
is a bit of a mess.
We use ugly constructs like this:
WITH_CUR_LOCALE (error (1, errno, gettext ("\
cannot read character map directory `%s'"), directory));
to issue errors, and read error_message_count directly from the
error API to detect errors. The problem with that is that the
code also uses error to print warnings, and informative messages.
All of this leads to problems where just having warnings will
produce an exit status as-if errors had been seen.
To fix this situation I have adopted the following high-level
changes:
* All errors are counted distinctly.
* All warnings are counted distinctly.
* All informative messages are not counted.
* Increasing verbosity cannot generate *more* errors, and
it previously did for errors conditional on verbose,
this is now fixed.
* Increasing verbosity *can* generate *more* warnings.
* Making the output quiet cannot generate *fewer* errors,
and it previously did for errors conditional on be_quiet,
this is now fixed.
* Each of error, warning, and informative message has it's
own function to call defined in record-status.h, and they
are: record_error, record_warning, and record_verbose.
* The record_error function always records an error, but
conditional on be_quiet may not print it.
* The record_warning function always records a warning,
but conditional on be_quiet may not print it.
* The record_verbose function only prints the verbose
message if verbose is true and be_quiet is false.
This has allowed the following fix:
* Previously any warnings were being treated as errors
because they incremented error_message_count, but now
we properly return an exit status of 1 if there are
warnings but output was generated.
All of this allows localedef to correctly decide if errors,
or warnings were present, and produce the correct exit code.
The locale and iconv programs now also use record-status.h
and we have removed the WITH_CUR_LOCALE hack, and instead
have internal push_locale/pop_locale functions centralized
in the record routines.
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
2017-10-13 16:54:03 +00:00
|
|
|
record_error (1, errno, gettext ("\
|
|
|
|
cannot read character map directory `%s'"),
|
|
|
|
directory);
|
2000-10-01 19:15:29 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
cdir = (struct charmap_dir *) xmalloc (sizeof (struct charmap_dir));
|
|
|
|
cdir->dir = dir;
|
|
|
|
|
|
|
|
len = strlen (directory);
|
|
|
|
add_slash = (len == 0 || directory[len - 1] != '/');
|
|
|
|
cdir->directory = (char *) xmalloc (len + add_slash + 1);
|
|
|
|
memcpy (cdir->directory, directory, len);
|
|
|
|
if (add_slash)
|
|
|
|
cdir->directory[len] = '/';
|
|
|
|
cdir->directory[len + add_slash] = '\0';
|
|
|
|
cdir->directory_len = len + add_slash;
|
|
|
|
|
|
|
|
cdir->pathname = NULL;
|
|
|
|
cdir->pathname_size = 0;
|
|
|
|
|
|
|
|
return cdir;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reads the next directory entry.
|
|
|
|
Returns its charmap name, or NULL if past the last entry or upon error.
|
|
|
|
The storage returned may be overwritten by a later charmap_readdir
|
|
|
|
call on the same CHARMAP_DIR. */
|
|
|
|
const char *
|
|
|
|
charmap_readdir (CHARMAP_DIR *cdir)
|
|
|
|
{
|
|
|
|
for (;;)
|
|
|
|
{
|
2003-01-13 09:28:02 +00:00
|
|
|
struct dirent64 *dirent;
|
2000-10-01 19:15:29 +00:00
|
|
|
size_t len;
|
|
|
|
size_t size;
|
|
|
|
char *filename;
|
|
|
|
mode_t mode;
|
|
|
|
|
2003-01-13 09:28:02 +00:00
|
|
|
dirent = readdir64 (cdir->dir);
|
2000-10-01 19:15:29 +00:00
|
|
|
if (dirent == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (strcmp (dirent->d_name, ".") == 0)
|
|
|
|
continue;
|
|
|
|
if (strcmp (dirent->d_name, "..") == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
len = strlen (dirent->d_name);
|
|
|
|
|
|
|
|
size = cdir->directory_len + len + 1;
|
|
|
|
if (size > cdir->pathname_size)
|
|
|
|
{
|
|
|
|
free (cdir->pathname);
|
|
|
|
if (size < 2 * cdir->pathname_size)
|
|
|
|
size = 2 * cdir->pathname_size;
|
|
|
|
cdir->pathname = (char *) xmalloc (size);
|
|
|
|
cdir->pathname_size = size;
|
|
|
|
}
|
|
|
|
|
|
|
|
stpcpy (stpcpy (cdir->pathname, cdir->directory), dirent->d_name);
|
|
|
|
filename = cdir->pathname + cdir->directory_len;
|
|
|
|
|
|
|
|
if (dirent->d_type != DT_UNKNOWN && dirent->d_type != DT_LNK)
|
|
|
|
mode = DTTOIF (dirent->d_type);
|
|
|
|
else
|
|
|
|
{
|
2013-05-10 09:41:53 +00:00
|
|
|
struct stat64 statbuf;
|
2000-10-01 19:15:29 +00:00
|
|
|
|
2013-05-10 09:41:53 +00:00
|
|
|
if (stat64 (cdir->pathname, &statbuf) < 0)
|
2000-10-01 19:15:29 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
mode = statbuf.st_mode;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!S_ISREG (mode))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* For compressed charmaps, the canonical charmap name does not
|
|
|
|
include the extension. */
|
|
|
|
if (len > 3 && memcmp (&filename[len - 3], ".gz", 3) == 0)
|
|
|
|
filename[len - 3] = '\0';
|
|
|
|
else if (len > 4 && memcmp (&filename[len - 4], ".bz2", 4) == 0)
|
|
|
|
filename[len - 4] = '\0';
|
|
|
|
|
|
|
|
return filename;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Finishes a charmap directory traversal, and frees the resources
|
|
|
|
attached to the CHARMAP_DIR. */
|
|
|
|
int
|
|
|
|
charmap_closedir (CHARMAP_DIR *cdir)
|
|
|
|
{
|
|
|
|
DIR *dir = cdir->dir;
|
|
|
|
|
|
|
|
free (cdir->directory);
|
|
|
|
free (cdir->pathname);
|
|
|
|
free (cdir);
|
|
|
|
return closedir (dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Creates a subprocess decompressing the given pathname, and returns
|
|
|
|
a stream reading its output (the decompressed data). */
|
|
|
|
static
|
|
|
|
FILE *
|
* sysdeps/mach/hurd/Makefile ($(link-rpcuserlibs)): Don't append
options after $(build-module), which is no longer a single command.
(LDFLAGS-link-rpcuserlibs): New variable to hold those options.
(LDFLAGS-libmachuser-link.so, LDFLAGS-libhurduser-link.so): New
variables using it. Reported by Mark Kettenis <kettenis@gnu.org>.
2001-03-11 Roland McGrath <roland@frob.com>
* elf/rtld.c (dl_main): Add cast to quiet warning.
* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
* iconv/gconv_conf.c (__gconv_get_path): Likewise.
(__gconv_read_conf): Likewise.
* iconv/gconv_db.c (gen_steps): Likewise.
(__gconv_find_transform): Likewise.
* locale/programs/charmap-dir.c (fopen_uncompressed): Likewise.
(fopen_uncompressed): Use const in second argument's type.
2001-03-11 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/dl-sysdep.c (__writev): New function.
* mach/mach_error.h: Fix ancient #endif syntax.
* hurd/hurdmalloc.c: Likewise.
* sysdeps/generic/atomicity.h (exchange_and_add, atomic_add,
compare_and_swap): Add volatile qualifier to first arg, to bring
these prototypes in line with all the other implementations.
Add a #warning to remind the builder that these are not atomic.
2001-03-04 Roland McGrath <roland@frob.com>
* hurd/vpprintf.c (vpprintf) [USE_IN_LIBIO]: Use innermore first
member of TEMP_F so its type is _IO_FILE * as expected.
* hurd/fopenport.c (seekio): Conditionalize type of POS argument
on [USE_IN_LIBIO]. Check the value for overflow, since for libio
it might exceed off_t's range.
2001-02-25 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/sysd-stdio.c (__stdio_reopen): Use prototype.
* sysdeps/unix/bsd/getpt.c (__posix_openpt): Likewise.
* sysdeps/mach/hurd/i386/intr-msg.h (SYSCALL_EXAMINE): Make this a
macro instead of an inline function,
(MSG_EXAMINE): Likewise.
* hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS_1): Remove extraneous ##.
* hurd/get-host.c: Include <string.h> for decls of built-ins.
* hurd/hurdchdir.c: Likewise.
* sysdeps/mach/hurd/i386/sigreturn.c: Likweise.
* sysdeps/mach/hurd/opendir.c: Likewise.
* mach/mach_init.c: Include <unistd.h> for _exit decl.
* mach/errsystems.awk: Give output file a trailing newline.
* mach/Machrules (MIG): Prepend CC='${CC}' to the mig command, so that
the script will use our compiler for the cpp stage.
With --enable-all-warnings we get a whole bunch of warnings,
and these are just a few fixes; there are more needed to silence it.
* mach/mach/mig_support.h (__mig_strncpy, mig_strncpy): Add extern
decls before extern inline defns to quiet gcc warning.
* hurd/hurd/threadvar.h (__hurd_threadvar_location_from_sp): Likewise.
* sysdeps/mach/i386/machine-sp.h (__thread_stack_pointer): Likewise.
2001-04-01 05:04:31 +00:00
|
|
|
fopen_uncompressed (const char *pathname, const char *compressor)
|
2000-10-01 19:15:29 +00:00
|
|
|
{
|
|
|
|
int pfd;
|
|
|
|
|
|
|
|
pfd = open (pathname, O_RDONLY);
|
|
|
|
if (pfd >= 0)
|
|
|
|
{
|
2013-05-10 09:41:53 +00:00
|
|
|
struct stat64 statbuf;
|
2000-10-01 19:15:29 +00:00
|
|
|
int fd[2];
|
|
|
|
|
2013-05-10 09:41:53 +00:00
|
|
|
if (fstat64 (pfd, &statbuf) >= 0
|
2000-10-01 19:15:29 +00:00
|
|
|
&& S_ISREG (statbuf.st_mode)
|
|
|
|
&& pipe (fd) >= 0)
|
|
|
|
{
|
* sysdeps/mach/hurd/Makefile ($(link-rpcuserlibs)): Don't append
options after $(build-module), which is no longer a single command.
(LDFLAGS-link-rpcuserlibs): New variable to hold those options.
(LDFLAGS-libmachuser-link.so, LDFLAGS-libhurduser-link.so): New
variables using it. Reported by Mark Kettenis <kettenis@gnu.org>.
2001-03-11 Roland McGrath <roland@frob.com>
* elf/rtld.c (dl_main): Add cast to quiet warning.
* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
* iconv/gconv_conf.c (__gconv_get_path): Likewise.
(__gconv_read_conf): Likewise.
* iconv/gconv_db.c (gen_steps): Likewise.
(__gconv_find_transform): Likewise.
* locale/programs/charmap-dir.c (fopen_uncompressed): Likewise.
(fopen_uncompressed): Use const in second argument's type.
2001-03-11 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/dl-sysdep.c (__writev): New function.
* mach/mach_error.h: Fix ancient #endif syntax.
* hurd/hurdmalloc.c: Likewise.
* sysdeps/generic/atomicity.h (exchange_and_add, atomic_add,
compare_and_swap): Add volatile qualifier to first arg, to bring
these prototypes in line with all the other implementations.
Add a #warning to remind the builder that these are not atomic.
2001-03-04 Roland McGrath <roland@frob.com>
* hurd/vpprintf.c (vpprintf) [USE_IN_LIBIO]: Use innermore first
member of TEMP_F so its type is _IO_FILE * as expected.
* hurd/fopenport.c (seekio): Conditionalize type of POS argument
on [USE_IN_LIBIO]. Check the value for overflow, since for libio
it might exceed off_t's range.
2001-02-25 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/sysd-stdio.c (__stdio_reopen): Use prototype.
* sysdeps/unix/bsd/getpt.c (__posix_openpt): Likewise.
* sysdeps/mach/hurd/i386/intr-msg.h (SYSCALL_EXAMINE): Make this a
macro instead of an inline function,
(MSG_EXAMINE): Likewise.
* hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS_1): Remove extraneous ##.
* hurd/get-host.c: Include <string.h> for decls of built-ins.
* hurd/hurdchdir.c: Likewise.
* sysdeps/mach/hurd/i386/sigreturn.c: Likweise.
* sysdeps/mach/hurd/opendir.c: Likewise.
* mach/mach_init.c: Include <unistd.h> for _exit decl.
* mach/errsystems.awk: Give output file a trailing newline.
* mach/Machrules (MIG): Prepend CC='${CC}' to the mig command, so that
the script will use our compiler for the cpp stage.
With --enable-all-warnings we get a whole bunch of warnings,
and these are just a few fixes; there are more needed to silence it.
* mach/mach/mig_support.h (__mig_strncpy, mig_strncpy): Add extern
decls before extern inline defns to quiet gcc warning.
* hurd/hurd/threadvar.h (__hurd_threadvar_location_from_sp): Likewise.
* sysdeps/mach/i386/machine-sp.h (__thread_stack_pointer): Likewise.
2001-04-01 05:04:31 +00:00
|
|
|
char *argv[4]
|
|
|
|
= { (char *) compressor, (char *) "-d", (char *) "-c", NULL };
|
2000-10-01 19:15:29 +00:00
|
|
|
posix_spawn_file_actions_t actions;
|
|
|
|
|
|
|
|
if (posix_spawn_file_actions_init (&actions) == 0)
|
|
|
|
{
|
|
|
|
if (posix_spawn_file_actions_adddup2 (&actions,
|
|
|
|
fd[1], STDOUT_FILENO) == 0
|
|
|
|
&& posix_spawn_file_actions_addclose (&actions, fd[1]) == 0
|
|
|
|
&& posix_spawn_file_actions_addclose (&actions, fd[0]) == 0
|
|
|
|
&& posix_spawn_file_actions_adddup2 (&actions,
|
|
|
|
pfd, STDIN_FILENO) == 0
|
|
|
|
&& posix_spawn_file_actions_addclose (&actions, pfd) == 0
|
|
|
|
&& posix_spawnp (NULL, compressor, &actions, NULL,
|
|
|
|
argv, environ) == 0)
|
|
|
|
{
|
|
|
|
posix_spawn_file_actions_destroy (&actions);
|
|
|
|
close (fd[1]);
|
|
|
|
close (pfd);
|
|
|
|
return fdopen (fd[0], "r");
|
|
|
|
}
|
|
|
|
posix_spawn_file_actions_destroy (&actions);
|
|
|
|
}
|
|
|
|
close (fd[1]);
|
|
|
|
close (fd[0]);
|
|
|
|
}
|
|
|
|
close (pfd);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Opens a charmap for reading, given its name (not an alias name). */
|
|
|
|
FILE *
|
|
|
|
charmap_open (const char *directory, const char *name)
|
|
|
|
{
|
|
|
|
size_t dlen = strlen (directory);
|
|
|
|
int add_slash = (dlen == 0 || directory[dlen - 1] != '/');
|
|
|
|
size_t nlen = strlen (name);
|
|
|
|
char *pathname;
|
|
|
|
char *p;
|
|
|
|
FILE *stream;
|
|
|
|
|
|
|
|
pathname = alloca (dlen + add_slash + nlen + 5);
|
|
|
|
p = stpcpy (pathname, directory);
|
|
|
|
if (add_slash)
|
|
|
|
*p++ = '/';
|
|
|
|
p = stpcpy (p, name);
|
|
|
|
|
2002-10-17 18:04:06 +00:00
|
|
|
stream = fopen (pathname, "rm");
|
2000-10-01 19:15:29 +00:00
|
|
|
if (stream != NULL)
|
|
|
|
return stream;
|
|
|
|
|
|
|
|
memcpy (p, ".gz", 4);
|
|
|
|
stream = fopen_uncompressed (pathname, "gzip");
|
|
|
|
if (stream != NULL)
|
|
|
|
return stream;
|
|
|
|
|
|
|
|
memcpy (p, ".bz2", 5);
|
|
|
|
stream = fopen_uncompressed (pathname, "bzip2");
|
|
|
|
if (stream != NULL)
|
|
|
|
return stream;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* An empty alias list. Avoids the need to return NULL from
|
|
|
|
charmap_aliases. */
|
|
|
|
static char *empty[1];
|
|
|
|
|
|
|
|
/* Returns a NULL terminated list of alias names of a charmap. */
|
|
|
|
char **
|
|
|
|
charmap_aliases (const char *directory, const char *name)
|
|
|
|
{
|
|
|
|
FILE *stream;
|
|
|
|
char **aliases;
|
|
|
|
size_t naliases;
|
|
|
|
|
|
|
|
stream = charmap_open (directory, name);
|
|
|
|
if (stream == NULL)
|
|
|
|
return empty;
|
|
|
|
|
|
|
|
aliases = NULL;
|
|
|
|
naliases = 0;
|
|
|
|
|
|
|
|
while (!feof (stream))
|
|
|
|
{
|
|
|
|
char *alias = NULL;
|
|
|
|
char junk[BUFSIZ];
|
|
|
|
|
2007-09-18 19:31:02 +00:00
|
|
|
if (fscanf (stream, " <code_set_name> %ms", &alias) == 1
|
|
|
|
|| fscanf (stream, "%% alias %ms", &alias) == 1)
|
2000-10-01 19:15:29 +00:00
|
|
|
{
|
|
|
|
aliases = (char **) xrealloc (aliases,
|
|
|
|
(naliases + 2) * sizeof (char *));
|
|
|
|
aliases[naliases++] = alias;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the rest of the line. */
|
|
|
|
if (fgets (junk, sizeof junk, stream) != NULL)
|
|
|
|
{
|
|
|
|
if (strstr (junk, "CHARMAP") != NULL)
|
|
|
|
/* We cannot expect more aliases from now on. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
while (strchr (junk, '\n') == NULL
|
|
|
|
&& fgets (junk, sizeof junk, stream) != NULL)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fclose (stream);
|
|
|
|
|
|
|
|
if (naliases == 0)
|
|
|
|
return empty;
|
|
|
|
|
|
|
|
aliases[naliases] = NULL;
|
|
|
|
return aliases;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Frees an alias list returned by charmap_aliases. */
|
|
|
|
void
|
|
|
|
charmap_free_aliases (char **aliases)
|
|
|
|
{
|
|
|
|
if (aliases != empty)
|
|
|
|
{
|
|
|
|
char **p;
|
|
|
|
|
|
|
|
for (p = aliases; *p; p++)
|
|
|
|
free (*p);
|
|
|
|
|
|
|
|
free (aliases);
|
|
|
|
}
|
|
|
|
}
|