ba1ffaa1c6
Thu Oct 31 00:01:39 1996 Ulrich Drepper <drepper@cygnus.com> * signal/Makefile (routines): Add sigwait. * signal/signal.h: Add prototype for sigwait. * sysdeps/posix/sigwait.c: New file. Implementation of sigwait function from POSIX.1c. * sysdeps/stub/sigwait.c: New file. Stub version of sigwait. Wed Oct 30 02:01:17 1996 Richard Henderson <rth@tamu.edu> * sunrpc/xdr_float.c (xdr_float): Handle sizeof(float)!=sizeof(long), but don't bother going farther than sizeof(float)==sizeof(int). (xdr_double): Handle little-endian machines! Handle sizeof(double) != 2*sizeof(long), though again don't bother with more than int. Thu Oct 29 16:09:42 1996 Craig Metz <cmetz@inner.net> * sysdeps/posix/getaddrinfo.c: Use buffer limits for inet_ntop function. Tue Oct 29 12:37:22 1996 Ulrich Drepper <drepper@cygnus.com> * Makerules: Create symbolic links for linking in $(libdir). (make-link): Use absolute path for destination if this is not in the same directory. * elf/rtld.c (dl_main): When verifying don't check the name of the dynamic linker. * shlib-versions: Change entries for Hurd specific libs from *-*-gnu* to *-*-gnu?* so that i586-pc-linux-gnu does not match these entries. * assert/assert.h: Reformat copyright. Change reference to ANSI into reference to ISO C. * ctype/ctype.h: Likewise. * errno.h: Likewise. * limits.h: Likewise. * math/math.h: Likewise. * setjmp/setjmp.h: Likewise. * stdio/stdio.h: Likewise. * libio/stdio.h: Likewise. * stdlib/stdlib.h: Likewise. * string/string.h: Likewise. * time/time.h: Likewise. * string/argz.h: Use __const is definitions. * elf/dlfcn.h: Use __const and __P. Reformat copyright. * misc/err.h: Likewise. * wctype/wctype.h (wctrans_t): Use __const instead of const. * Makeconfig ($(common-objpfx)soversions.mk): Generate list of sonames for versioned libraries. * Makefile: Remove code to generate libc-version.h. Generate gnu/lib-names.h with info from soversions.mk. * features.h: Define __GLIBC__ and __GLIBC_MINOR__. * dirent/tst-seekdir.c: Initialize save3. * grp/testgrp.c: Initialize my_group. * grp/fgetgrent_r.c: Change interface to follow POSIX.1c. * grp/grp.h: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/pwd.h: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/sgetspent.c: Likewise. * shadow/sgetspent_r.c: Likewise. * grp/fgetgrent.c: Adapt for change in interface of fgetgrent_r. * pwd/fgetpwent.c: Likewise, for fgetpwent_r.c. * shadow/fgetspent.c: Likewise, for fgetpwent_r.c. * resolv/netdb.h: Adapt prototypes for reentrant functions to follow POSIX.1c. * sunrpc/rpc/netdb.h: Likewise, * shadow/shadow.h: Likewise. * inet/getnetgrent_r.c: Follow change in pwd/grp function interface. * sysdeps/unix/getlogin_r.c: Return ERANGE when buffer is too small. * inet/herrno.c: Don't define __h_errno. Only h_errno otherwise the ELF aliasing creates strange situations. * sysdeps/unix/sysv/linux/errnos.H: Define __set_errno as inline function. * sysdeps/unix/sysv/linux/i386/sysdep.S: Don't define __errno. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. * libio/libio.h: Don't declare _IO_flockfile and _IO_funlockfile weak. * locale/programs/charmap.c: Add casts to prevent warnings. * locale/programs/linereader.h: Likewise. * locale/programs/ld-collate.c: Likewise. * locale/programs/stringtrans.c: Likewise. Change types for various variables to prevent warnings. * locale/programs/ld-ctype.c: Likewise. * locale/programs/linereader.h (lr_ungetc): Likewise. * locale/programs/charset.h (struct charset): Use `unsigned int' as type for width_default. * posix/regex.c: Change type of `this_reg' variables. * stdio-common/Makefile: Use -Wno-format for tstdiomisc.c. * stdio-common/bug5.c: De-ANSI-fy. Use correct types for variables. * stdio-common/printf_fp.c: Initialize to_shift. * stdio-common/test_rdwr.c: Add cast. * stdio-common/vfprintf.c: Add casts and use correct types to prevent warnings. * stdio-common/vfscanf.c: Initialize str and strptr. * sysdeps/libm-ieee754/e_jnf.c: Use correct types to prevent warnings. * sysdeps/libm-ieee754/e_pow.c: Likewise. * sysdeps/libm-ieee754/e_powf.c: Likewise. * sysdeps/libm-ieee754/e_rem_pio2f.c: Likewise. * time/test-tz.c: Likewise. * manual/creature.texi: Document _REENTRANT and _THREAD_SAFE. * manual/libc.texinfo: Prevent makeinfo failure by avoiding libc.cp index. This must be fixed. * manual/nss.texi: Adapt for correct POSIX.1c interface of reentrant functions. * manual/users.texi: Document netgroup functions. * po/es.po: Updated. * po/fr.po: Updated. * posix/fnmatch.c: Change to match libit version. * posix/unistd.h: Change prototype for ttyname_r to match POSIX.1c. * sysdep/posix/ttyname_r.c: Likewise. * stdlib/atexit.h (__new_exitfn): Add internal locking. * stdlib/exit.c: De-ANSI-fy. Handle new ef_us value for flavor. * stdlib/exit.h: De-ANSI-fy. Define new ef_us value for flavor. * stdlib/random.c (__srandom): Add internal locking. (__initstate): Likewise. (__setstate): Likewise. (__random): Likewise. Mon Oct 28 22:28:37 1996 NIIBE Yutaka <gniibe@mri.co.jp> * sysdeps/generic/crypt-entry.c (crypt_r): Use __set_errno. (crypt): Likewise. * resolv/gethnamaddr.c (gethostbyname2): Likewise. * sysdeps/generic/uname.c: Likewise. * sysdeps/posix/rename.c: Likewise. * sysdeps/stub/setrlimit.c: Likewise. * nss/nss_db/db-netgrp.c (_nss_db_setnetgrent): Fix typo. Sun Oct 27 11:12:50 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locale/programs/ld-collate.c (collate_order_elem): Fix format string. (collate_element_to): Cast field width argument to `int' for format string. (collate_symbol): Likewise. (collate_order_elem): Likewise. (collate_weight_bsymbol): Likewise. (collate_simple_weight): Likewise. * locale/programs/ld-time.c (STRARR_ELEM): Fix format string. * locale/programs/ld-ctype.c (ctype_class_newP): Add missing argument for format string. (ctype_map_newP): Likewise. (set_class_defaults): Fix format string. * locale/programs/localedef.c (construct_output_path): Putting an explicit \0 into the format string does not work, use %c. Sat Oct 26 20:38:36 1996 Richard Henderson <rth@tamu.edu> * Makerules: Install all shared libraries in $(slibdir). * login/Makefile: Build libutil.so in others pass after libc.so is created. * misc/mntent.h: Include <paths.h> for _PATH_MNTTAB & _PATH_MOUNTED. * string/stratcliff.c: Allocate 3 pages instead of one, then use mprotect so that we know that the adjacent pages are inaccessible. * resource/sys/resource.h: Move all structures and enums to ... * sysdeps/generic/resourcebits.h: ... here ... * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: ... and here. * sysdeps/unix/sysv/linux/alpha/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/i386/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/m68k/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/mips/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/resourcebits.h: New file. Use kernel header for RLIMIT_* definitions. The members of struct rlimit are longs. Thu Oct 24 17:43:34 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * MakeTAGS (sysdep-dirs): Fix typo. Wed Oct 23 03:45:22 1996 Ulrich Drepper <drepper@cygnus.com> * Makefile (headers): Don't mention libc-version.h. (install-others): ...but here. * time/strptime.c: Recognize %s, %u, %g, and %G format. nothing is found. This guarantees all subsequent calls behave * sysdeps/unix/sysv/linux/syscalls.list: Change function name for * io/getwd.c (getwd) [! PATH_MAX]: Don't assume that the user's buffer is any longer than the amount necessary to hold the filename; the Hurd getcwd uses the *entire* contents of the buffer, however long it is specified to be. * posix/getconf.c: De-ANSI-fy. Recognize POSIX.2 constant names. since these do not depend on the platform.
493 lines
13 KiB
C
493 lines
13 KiB
C
/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
|
|
|
|
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. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <getopt.h>
|
|
#include <libintl.h>
|
|
#include <locale.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "error.h"
|
|
#include "charset.h"
|
|
#include "locfile.h"
|
|
#include "../intl/loadinfo.h"
|
|
|
|
/* Undefine the following line in the production version. */
|
|
/* #define NDEBUG 1 */
|
|
#include <assert.h>
|
|
|
|
|
|
/* List of locale definition files which are used in `copy' instructions. */
|
|
struct copy_def_list_t
|
|
{
|
|
struct copy_def_list_t *next;
|
|
|
|
const char *name;
|
|
int mask;
|
|
|
|
struct localedef_t *locale;
|
|
|
|
struct
|
|
{
|
|
void *data;
|
|
size_t len;
|
|
} binary[6];
|
|
};
|
|
|
|
|
|
/* List of copied locales. */
|
|
struct copy_def_list_t *copy_list;
|
|
|
|
/* If this is defined be POSIX conform. */
|
|
int posix_conformance;
|
|
|
|
/* If not zero give a lot more messages. */
|
|
int verbose;
|
|
|
|
|
|
|
|
/* Long options. */
|
|
static const struct option long_options[] =
|
|
{
|
|
{ "charmap", required_argument, NULL, 'f' },
|
|
{ "code-set-name", required_argument, NULL, 'u' },
|
|
{ "help", no_argument, NULL, 'h' },
|
|
{ "force", no_argument, NULL, 'c' },
|
|
{ "inputfile", required_argument, NULL, 'i' },
|
|
{ "posix", no_argument, &posix_conformance, 1 },
|
|
{ "verbose", no_argument, &verbose, 1},
|
|
{ "version", no_argument, NULL, 'V' },
|
|
{ NULL, 0, NULL, 0 }
|
|
};
|
|
|
|
|
|
/* Prototypes for global functions. */
|
|
void *xmalloc (size_t __n);
|
|
|
|
/* Prototypes for local functions. */
|
|
static void usage (int status) __attribute__ ((noreturn));
|
|
static void error_print (void);
|
|
static const char *construct_output_path (char *path);
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
int optchar;
|
|
int do_help = 0;
|
|
int do_version = 0;
|
|
int force_output = 0;
|
|
const char *charmap_file = NULL;
|
|
const char *input_file = NULL;
|
|
const char *ucs_csn = NULL;
|
|
const char *output_path;
|
|
int cannot_write_why;
|
|
struct charset_t *charset;
|
|
struct localedef_t *localedef;
|
|
struct copy_def_list_t *act_add_locdef;
|
|
|
|
/* Set initial values for global varaibles. */
|
|
copy_list = NULL;
|
|
posix_conformance = getenv ("POSIXLY_CORRECT") != NULL;
|
|
error_print_progname = error_print;
|
|
verbose = 0;
|
|
|
|
/* Set locale. Do not set LC_ALL because the other categories must
|
|
not be affected (acccording to POSIX.2). */
|
|
setlocale (LC_MESSAGES, "");
|
|
setlocale (LC_CTYPE, "");
|
|
|
|
/* Initialize the message catalog. */
|
|
textdomain (_libc_intl_domainname);
|
|
|
|
while ((optchar = getopt_long (argc, argv, "cf:hi:u:vV", long_options, NULL))
|
|
!= EOF)
|
|
switch (optchar)
|
|
{
|
|
case '\0': /* Long option. */
|
|
break;
|
|
|
|
case 'c':
|
|
force_output = 1;
|
|
break;
|
|
|
|
case 'f':
|
|
charmap_file = optarg;
|
|
break;
|
|
|
|
case 'h':
|
|
do_help = 1;
|
|
break;
|
|
|
|
case 'i':
|
|
input_file = optarg;
|
|
break;
|
|
|
|
case 'u':
|
|
ucs_csn = optarg;
|
|
break;
|
|
|
|
case 'v':
|
|
verbose = 1;
|
|
break;
|
|
|
|
case 'V':
|
|
do_version = 1;
|
|
break;
|
|
|
|
default:
|
|
usage (4); /* A value >3 is forced by POSIX. */
|
|
break;
|
|
}
|
|
|
|
/* POSIX.2 requires to be verbose about missing characters in the
|
|
character map. */
|
|
verbose |= posix_conformance;
|
|
|
|
/* Version information is requested. */
|
|
if (do_version)
|
|
{
|
|
printf ("localedef (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\
|
|
"), "1995, 1996");
|
|
printf (_("Written by %s.\n"), "Ulrich Drepper");
|
|
|
|
exit (0);
|
|
}
|
|
|
|
/* Help is requested. */
|
|
if (do_help)
|
|
/* Possible violation: POSIX.2 4.35.8 defines the return value 0 as
|
|
"No errors occured and the locale(s) were successfully created."
|
|
But giving a other value than 0 does not make sense here. It
|
|
is perhaps not that important because POSIX does not specify the
|
|
-h option for localedef. */
|
|
usage (0);
|
|
|
|
if (argc - optind != 1)
|
|
/* We need exactly one non-option parameter. */
|
|
usage (4);
|
|
|
|
/* The parameter describes the output path of the constructed files.
|
|
If the described files cannot be written return a NULL pointer. */
|
|
output_path = construct_output_path (argv[optind]);
|
|
cannot_write_why = errno;
|
|
|
|
/* Now that the parameters are processed we have to reset the local
|
|
ctype locale. (P1003.2 4.35.5.2) */
|
|
setlocale (LC_CTYPE, "POSIX");
|
|
|
|
/* Look whether the system really allows locale definitions. POSIX
|
|
defines error code 3 for this situation so I think it must be
|
|
a fatal error (see P1003.2 4.35.8). */
|
|
if (sysconf (_SC_2_LOCALEDEF) < 0)
|
|
error (3, 0, _("FATAL: system does not define `_POSIX2_LOCALEDEF'"));
|
|
|
|
/* Process charmap file. */
|
|
charset = charmap_read (charmap_file);
|
|
|
|
/* Now read the locale file. */
|
|
localedef = locfile_read (input_file, charset);
|
|
if (localedef->failed != 0)
|
|
error (4, errno, _("cannot open locale definition file `%s'"), input_file);
|
|
|
|
/* Perhaps we saw some `copy' instructions. Process the given list.
|
|
We use a very simple algorithm: we look up the list from the
|
|
beginning every time. */
|
|
do
|
|
{
|
|
int cat;
|
|
|
|
for (act_add_locdef = copy_list; act_add_locdef != NULL;
|
|
act_add_locdef = act_add_locdef->next)
|
|
{
|
|
for (cat = LC_CTYPE; cat <= LC_MESSAGES; ++cat)
|
|
if ((act_add_locdef->mask & (1 << cat)) != 0)
|
|
{
|
|
act_add_locdef->mask &= ~(1 << cat);
|
|
break;
|
|
}
|
|
if (cat <= LC_MESSAGES)
|
|
break;
|
|
}
|
|
|
|
if (act_add_locdef != NULL)
|
|
{
|
|
int avail = 0;
|
|
|
|
if (act_add_locdef->locale == NULL)
|
|
act_add_locdef->locale = locfile_read (act_add_locdef->name,
|
|
charset);
|
|
|
|
if (! act_add_locdef->locale->failed)
|
|
{
|
|
avail = act_add_locdef->locale->categories[cat].generic != NULL;
|
|
if (avail)
|
|
localedef->categories[cat].generic
|
|
= act_add_locdef->locale->categories[cat].generic;
|
|
}
|
|
|
|
if (! avail)
|
|
{
|
|
const char *locale_names[] = { "LC_COLLATE", "LC_CTYPE",
|
|
"LC_MONETARY", "LC_NUMERIC",
|
|
"LC_TIME", "LC_MESSAGES" };
|
|
char *fname;
|
|
int fd;
|
|
struct stat st;
|
|
|
|
asprintf (&fname, LOCALE_PATH "/%s/%s", act_add_locdef->name,
|
|
locale_names[cat]);
|
|
fd = open (fname, O_RDONLY);
|
|
if (fd == -1)
|
|
{
|
|
free (fname);
|
|
|
|
asprintf (&fname, LOCALE_PATH "/%s/%s/SYS_%s",
|
|
act_add_locdef->name, locale_names[cat],
|
|
locale_names[cat]);
|
|
|
|
fd = open (fname, O_RDONLY);
|
|
if (fd == -1)
|
|
error (5, 0, _("\
|
|
locale file `%s', used in `copy' statement, not found"),
|
|
act_add_locdef->name);
|
|
}
|
|
|
|
if (fstat (fd, &st) < 0)
|
|
error (5, errno, _("\
|
|
cannot `stat' locale file `%s'"),
|
|
fname);
|
|
|
|
localedef->len[cat] = st.st_size;
|
|
localedef->categories[cat].generic
|
|
= mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
|
|
|
|
if (localedef->categories[cat].generic == (void *) -1)
|
|
{
|
|
size_t left = st.st_size;
|
|
void *read_ptr;
|
|
|
|
localedef->categories[cat].generic
|
|
= xmalloc (st.st_size);
|
|
read_ptr = localedef->categories[cat].generic;
|
|
|
|
do
|
|
{
|
|
long int n;
|
|
n = read (fd, read_ptr, left);
|
|
if (n == -1)
|
|
error (5, errno, _("cannot read locale file `%s'"),
|
|
fname);
|
|
read_ptr += n;
|
|
left -= n;
|
|
}
|
|
while (left > 0);
|
|
}
|
|
|
|
close (fd);
|
|
free (fname);
|
|
|
|
localedef->binary |= 1 << cat;
|
|
}
|
|
}
|
|
}
|
|
while (act_add_locdef != NULL);
|
|
|
|
/* Check the categories we processed in source form. */
|
|
check_all_categories (localedef, charset);
|
|
|
|
/* We are now able to write the data files. If warning were given we
|
|
do it only if it is explicitly requested (--force). */
|
|
if (error_message_count == 0 || force_output != 0)
|
|
{
|
|
if (cannot_write_why != 0)
|
|
error (4, cannot_write_why, _("cannot write output files to `%s'"),
|
|
output_path);
|
|
else
|
|
write_all_categories (localedef, charset, output_path);
|
|
}
|
|
else
|
|
error (4, 0, _("no output file produced because warning were issued"));
|
|
|
|
/* This exit status is prescribed by POSIX.2 4.35.7. */
|
|
exit (error_message_count != 0);
|
|
}
|
|
|
|
|
|
void
|
|
def_to_process (const char *name, int category)
|
|
{
|
|
struct copy_def_list_t *new, **rp;
|
|
|
|
for (rp = ©_list; *rp != NULL; rp = &(*rp)->next)
|
|
if (strcmp (name, (*rp)->name) == 0)
|
|
break;
|
|
|
|
if (*rp == NULL)
|
|
{
|
|
size_t cnt;
|
|
|
|
*rp = (struct copy_def_list_t *) xmalloc (sizeof (**rp));
|
|
|
|
(*rp)->next = NULL;
|
|
(*rp)->name = name;
|
|
(*rp)->mask = 0;
|
|
(*rp)->locale = NULL;
|
|
|
|
for (cnt = 0; cnt < 6; ++cnt)
|
|
{
|
|
(*rp)->binary[cnt].data = NULL;
|
|
(*rp)->binary[cnt].len = 0;
|
|
}
|
|
}
|
|
new = *rp;
|
|
|
|
if ((new->mask & category) != 0)
|
|
/* We already have the information. This cannot happen. */
|
|
error (5, 0, _("\
|
|
category data requested more than once: should not happen"));
|
|
|
|
new->mask |= category;
|
|
}
|
|
|
|
|
|
/* Display usage information and exit. */
|
|
static void
|
|
usage (int status)
|
|
{
|
|
if (status != 0)
|
|
fprintf (stderr, _("Try `%s --help' for more information.\n"),
|
|
program_invocation_name);
|
|
else
|
|
{
|
|
printf (_("\
|
|
Usage: %s [OPTION]... name\n\
|
|
Mandatory arguments to long options are mandatory for short options too.\n\
|
|
-c, --force create output even if warning messages were issued\n\
|
|
-h, --help display this help and exit\n\
|
|
-f, --charmap=FILE symbolic character names defined in FILE\n\
|
|
-i, --inputfile=FILE source definitions are found in FILE\n\
|
|
-u, --code-set-name=NAME specify code set for mapping ISO 10646 elements\n\
|
|
-v, --verbose print more messages\n\
|
|
-V, --version output version information and exit\n\
|
|
--posix be strictly POSIX conform\n\
|
|
\n\
|
|
System's directory for character maps: %s\n\
|
|
locale files : %s\n"),
|
|
program_invocation_name, CHARMAP_PATH, LOCALE_PATH);
|
|
fputs (gettext ("Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
|
|
stdout);
|
|
}
|
|
|
|
exit (status);
|
|
}
|
|
|
|
|
|
/* The address of this function will be assigned to the hook in the error
|
|
functions. */
|
|
static void
|
|
error_print ()
|
|
{
|
|
/* We don't want the program name to be printed in messages. Emacs'
|
|
compile.el does not like this. */
|
|
}
|
|
|
|
|
|
/* The parameter to localedef describes the output path. If it does
|
|
contain a '/' character it is a relativ path. Otherwise it names the
|
|
locale this definition is for. */
|
|
static const char *
|
|
construct_output_path (char *path)
|
|
{
|
|
const char *normal = NULL;
|
|
char *result;
|
|
|
|
if (strchr (path, '/') == NULL)
|
|
{
|
|
/* This is a system path. First examine whether the locale name
|
|
contains a reference to the codeset. This should be
|
|
normalized. */
|
|
char *startp, *endp;
|
|
|
|
startp = path;
|
|
/* We must be prepared for finding a CEN name or a location of
|
|
the introducing `.' where it is not possible anymore. */
|
|
while (*startp != '\0' && *startp != '@' && *startp != '.'
|
|
&& *startp != '+' && *startp != ',')
|
|
++startp;
|
|
if (*startp == '.')
|
|
{
|
|
/* We found a codeset specification. Now find the end. */
|
|
endp = ++startp;
|
|
while (*endp != '\0' && *endp != '@')
|
|
++endp;
|
|
|
|
if (endp > startp)
|
|
normal = _nl_normalize_codeset (startp, endp - startp);
|
|
}
|
|
else
|
|
/* This is to keep gcc quiet. */
|
|
endp = NULL;
|
|
|
|
/* We put an additional '\0' at the end of the string because at
|
|
the end of the function we need another byte for the trailing
|
|
'/'. */
|
|
if (normal == NULL)
|
|
asprintf (&result, "%s/%s%c", LOCALE_PATH, path, '\0');
|
|
else
|
|
asprintf (&result, "%s/%.*s%s%s%c", LOCALE_PATH, startp - path, path,
|
|
normal, endp, '\0');
|
|
}
|
|
else
|
|
{
|
|
/* This is a user path. Please note the additional byte in the
|
|
memory allocation. */
|
|
result = xmalloc (strlen (path) + 2);
|
|
strcpy (result, path);
|
|
}
|
|
|
|
errno = 0;
|
|
|
|
if (euidaccess (result, W_OK) == -1)
|
|
/* Perhaps the directory does not exist now. Try to create it. */
|
|
if (errno == ENOENT)
|
|
{
|
|
errno = 0;
|
|
mkdir (result, 0777);
|
|
}
|
|
|
|
strcat (result, "/");
|
|
|
|
return result;
|
|
}
|