diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | locale/locarchive.h | 2 | ||||
| -rw-r--r-- | locale/programs/localedef.c | 2 | ||||
| -rw-r--r-- | locale/programs/localedef.h | 6 | ||||
| -rw-r--r-- | locale/programs/locarchive.c | 27 | ||||
| -rw-r--r-- | locale/programs/locfile.c | 1 |
6 files changed, 44 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index cb3651ac88..c72611ef3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2013-10-18 Carlos O'Donell <carlos@redhat.com> + + * locale/locarchive.h (struct locarhandle): Add fname. + * locale/programs/localedef.c (main): Pass ARGV[remaining] + if an optional argument was specified to --list-archive, + otherwise NULL. + * locale/programs/locarchive.c (show_archive_content): Take new + argument fname and pass it via ah.fname to open_archive. + * locale/programs/localedef.h: Update decl. + (open_archive): If AH->fname is non-null, open that file + rather than the default file name, and don't ignore ENOENT. + (create_archive): Set AH.fname to NULL. + (delete_locales_from_archive): Likewise. + (add_locales_to_archive): Likewise. + * locale/programs/locfile.c (write_all_categories): Likewise. + 2013-10-18 Joseph Myers <joseph@codesourcery.com> Aldy Hernandez <aldyh@redhat.com> diff --git a/locale/locarchive.h b/locale/locarchive.h index f2d84771ab..fec3b1a4f7 100644 --- a/locale/locarchive.h +++ b/locale/locarchive.h @@ -80,6 +80,8 @@ struct locrecent struct locarhandle { + /* Full path to the locale archive file. */ + const char *fname; int fd; void *addr; size_t mmaped; diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 8b9866ab29..d664232473 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -209,7 +209,7 @@ main (int argc, char *argv[]) /* Handle a few special cases. */ if (list_archive) - show_archive_content (verbose); + show_archive_content (remaining > 1 ? argv[remaining] : NULL, verbose); if (add_to_archive) return add_locales_to_archive (argc - remaining, &argv[remaining], replace_archive); diff --git a/locale/programs/localedef.h b/locale/programs/localedef.h index e010c72983..5a05a2e382 100644 --- a/locale/programs/localedef.h +++ b/locale/programs/localedef.h @@ -170,7 +170,9 @@ extern int add_locales_to_archive (size_t nlist, char *list[], bool replace); /* Removed named locales from archive. */ extern int delete_locales_from_archive (size_t nlist, char *list[]); -/* List content of locale archive. */ -extern void show_archive_content (int verbose) __attribute__ ((noreturn)); +/* List content of locale archive. If FNAME is non-null use that as + the locale archive to list, otherwise the default. */ +extern void show_archive_content (const char *fname, + int verbose) __attribute__ ((noreturn)); #endif /* localedef.h */ diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index e2a30b5682..e796865a75 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -223,6 +223,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) _("cannot change mode of new locale archive")); } + ah->fname = NULL; ah->fd = fd; ah->mmap_base = mmap_base; ah->mmap_len = mmap_len; @@ -562,11 +563,17 @@ open_archive (struct locarhandle *ah, bool readonly) struct locarhead head; int retry = 0; size_t prefix_len = output_prefix ? strlen (output_prefix) : 0; - char archivefname[prefix_len + sizeof (ARCHIVE_NAME)]; + char default_fname[prefix_len + sizeof (ARCHIVE_NAME)]; + char *archivefname = ah->fname; - if (output_prefix) - memcpy (archivefname, output_prefix, prefix_len); - strcpy (archivefname + prefix_len, ARCHIVE_NAME); + /* If ah has a non-NULL fname open that otherwise open the default. */ + if (archivefname == NULL) + { + archivefname = default_fname; + if (output_prefix) + memcpy (archivefname, output_prefix, prefix_len); + strcpy (archivefname + prefix_len, ARCHIVE_NAME); + } while (1) { @@ -574,8 +581,11 @@ open_archive (struct locarhandle *ah, bool readonly) fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); if (fd == -1) { - /* Maybe the file does not yet exist. */ - if (errno == ENOENT) + /* Maybe the file does not yet exist? If we are opening + the default locale archive we ignore the failure and + list an empty archive, otherwise we print an error + and exit. */ + if (errno == ENOENT && archivefname == default_fname) { if (readonly) { @@ -1329,6 +1339,7 @@ add_locales_to_archive (nlist, list, replace) /* Open the archive. This call never returns if we cannot successfully open the archive. */ + ah.fname = NULL; open_archive (&ah, false); while (nlist-- > 0) @@ -1528,6 +1539,7 @@ delete_locales_from_archive (nlist, list) /* Open the archive. This call never returns if we cannot successfully open the archive. */ + ah.fname = NULL; open_archive (&ah, false); head = ah.addr; @@ -1617,7 +1629,7 @@ dataentcmp (const void *a, const void *b) void -show_archive_content (int verbose) +show_archive_content (const char *fname, int verbose) { struct locarhandle ah; struct locarhead *head; @@ -1627,6 +1639,7 @@ show_archive_content (int verbose) /* Open the archive. This call never returns if we cannot successfully open the archive. */ + ah.fname = fname; open_archive (&ah, true); head = ah.addr; diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c index 3e76ec92a0..ef7adbff8d 100644 --- a/locale/programs/locfile.c +++ b/locale/programs/locfile.c @@ -343,6 +343,7 @@ write_all_categories (struct localedef_t *definitions, /* Open the archive. This call never returns if we cannot successfully open the archive. */ + ah.fname = NULL; open_archive (&ah, false); if (add_locale_to_archive (&ah, locname, to_archive, true) != 0) |