diff options
Diffstat (limited to 'locale/programs/localedef.c')
| -rw-r--r-- | locale/programs/localedef.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 2a0f2aa709..6becd9aa2e 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995. @@ -286,7 +286,7 @@ cannot open locale definition file `%s'"), runp->name)); { if (cannot_write_why != 0) WITH_CUR_LOCALE (error (4, cannot_write_why, _("\ -cannot write output files to `%s'"), output_path)); +cannot write output files to `%s'"), output_path ? : argv[remaining])); else write_all_categories (locales, charmap, argv[remaining], output_path); } @@ -403,7 +403,7 @@ print_version (FILE *stream, struct argp_state *state) 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\ -"), "2015"); +"), "2016"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } @@ -457,11 +457,11 @@ construct_output_path (char *path) '/'. */ ssize_t n; if (normal == NULL) - n = asprintf (&result, "%s%s/%s%c", - output_prefix ?: "", LOCALEDIR, path, '\0'); + n = asprintf (&result, "%s%s/%s%c", output_prefix ?: "", + COMPLOCALEDIR, path, '\0'); else n = asprintf (&result, "%s%s/%.*s%s%s%c", - output_prefix ?: "", LOCALEDIR, + output_prefix ?: "", COMPLOCALEDIR, (int) (startp - path), path, normal, endp, '\0'); if (n < 0) @@ -504,9 +504,7 @@ construct_output_path (char *path) names. Normalization allows the user to use any of the common names. */ static const char * -normalize_codeset (codeset, name_len) - const char *codeset; - size_t name_len; +normalize_codeset (const char *codeset, size_t name_len) { int len = 0; int only_digit = 1; |