diff options
author | Roland McGrath <roland@gnu.org> | 1996-07-29 03:49:00 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-07-29 03:49:00 +0000 |
commit | ce7a5ef4bc04ee3ca9d2f42377ca6593d8492a52 (patch) | |
tree | efbd26a9837de025fc405475655d24d83761cfee /locale/programs/locfile.c | |
parent | cddcfecfd1a8f91ee1da1c0147a4f07aee1846a0 (diff) | |
download | glibc-ce7a5ef4bc04ee3ca9d2f42377ca6593d8492a52.zip glibc-ce7a5ef4bc04ee3ca9d2f42377ca6593d8492a52.tar.gz glibc-ce7a5ef4bc04ee3ca9d2f42377ca6593d8492a52.tar.bz2 |
Sun Jul 28 23:46:14 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* time/strftime.c (strftime: do_number): Initialize PRINTED to
MAXDIGITS in case P is null and so sprintf is never actually called.
Mon Jul 29 02:46:23 1996 Ulrich Drepper <drepper@cygnus.com>
Add support for the to-be-written internationalized regexp.
This code must be able to use collation symbols and collation
equivalent classes.
* locale/C-collate.c (_nl_C_LC_COLLATE_symbol_hash,
_nl_C_LC_COLLATE_symbol_strings, _nl_C_LC_COLLATE_symbol_classes):
New global variables for collation classes.
* locale/categories.def: Add new descriptions for collation symbols
and collation classes.
* locale/langinfo.h: Add constants for collation symbols and
collation classes.
* locale/lc-collate.c: Add new global variables for collation symbols
and collation classes.
(_nl_postload_collate): Initialize new variables.
* locale/programs/ld-collate.c: Add code to emit tables for
collation symbols and collation classes.
* locale/programs/locales.h: Change prototype for `collate_output'.
* locale/programs/locfile.c (write_all_categories): Call
`collate_output' with new argument.
* locale/localeinfo.h: Add declaration for new global vars.
(union locale_data_value): New member wstr for `wchar_t' strings.
* locale/programs/locale-spec.c: Handle `collate-classes'
keyword and print information about available collation classes.
* locale/strlen-hash.h: New file. Simple hashing function which
takes a string with known length.
* locale/Makefile (distribute): Add strlen-hash.h.
(locale-modules): New var. Additional files for `locale' program.
* locale/C-ctype.c: Rewrite to avoid using string for giving values
which are of type `u_int32_t'.
Correct entry for EOF in toupper and tolower tables.
* locale/loadlocale.c (_nl_load_locale): Add cast to prevent
warning.
* locale/programs/ld-ctype.c (ctype_output): Add code to make
sure that all tables in binary file are words aligned.
* locale/programs/locfile.c (write_locale_data): Correct handling
of LC_MESSAGES locale. Create directory if necessary.
* locale/setlocale.c (setlocale): Add cast to avoid warning.
* string/string.h: Add prototype for `__strndup'.
Wed Jul 24 19:10:00 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* wcsmbs/mbrtowc.c: Remove unused variable.
Sun Jul 28 22:40:25 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/configure.in (LIBC_LINUX_VERSION): Update to
2.0.10; some problems were reported with an earlier version, and this
one is known to work.
* sysdeps/generic/dl-sysdep.c (__libc_enable_secure): New variable.
* sysdeps/mach/hurd/dl-sysdep.c: Likewise.
Diffstat (limited to 'locale/programs/locfile.c')
-rw-r--r-- | locale/programs/locfile.c | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c index 436df2e..63ebc4b 100644 --- a/locale/programs/locfile.c +++ b/locale/programs/locfile.c @@ -919,7 +919,7 @@ write_all_categories (struct localedef_t *locale, struct charset_t *charset, { /* Call all functions to write locale data. */ ctype_output (locale, charset, output_path); - collate_output (locale, output_path); + collate_output (locale, charset, output_path); monetary_output (locale, output_path); numeric_output (locale, output_path); time_output (locale, output_path); @@ -943,13 +943,31 @@ write_locale_data (const char *output_path, const char *category, But for LC_MESSAGES we have to take care for the translation data. This means we need to have a directory LC_MESSAGES in which we place the file under the name SYS_LC_MESSAGES. */ + sprintf (fname, "%s%s", output_path, category); if (strcmp (category, "LC_MESSAGES") == 0) - fd = -1; - else { - sprintf (fname, "%s%s", output_path, category); - fd = creat (fname, 0666); + struct stat st; + + if (stat (fname, &st) < 0) + { + if (mkdir (fname, 0777) < 0) + fd = creat (fname, 0666); + else + { + fd = -1; + errno = EISDIR; + } + } + else if (S_ISREG (st.st_mode)) + fd = creat (fname, 0666); + else + { + fd = -1; + errno = EISDIR; + } } + else + fd = creat (fname, 0666); if (fd == -1) { @@ -965,8 +983,9 @@ write_locale_data (const char *output_path, const char *category, if (fd == -1) { - error (0, save_err, _("cannot open output file for category `%s'"), - category); + error (0, save_err, _("\ +cannot open output file `%s' for category `%s'"), + fname, category); return; } } |