[COMMITTED] v3: Enhance localedef to accept file argument for --list-archive.

["Carlos O'Donell" <carlos at redhat dot com>]

On 10/03/2013 04:02 PM, Roland McGrath wrote:
>> 	* locale/programs/localedef.c (main): Pass argv[remaining]
> 
> caps

Fixed.
 
>> 	if an optional argument was specified to --list-archive
>> 	otherwise NULL.
> 
> run-on sentence: try a comma before "otherwise".

Fixed.

>> 	* locale/programs/localedef.h: Pass fname as first argument
>> 	for show_archive_content.
> 
> Usually you put this after the entry for the change to the funciton
> definition and just say, "Update decl."

Fixed.

>> 	* locale/programs/locarchive.c (show_archive_content): Pass fname 
>> 	via ah.fname to open_archive.
> 
> "Take new argument, pass it ..."

Fixed.

>> 	(open_archive): Use ah->fname as the locale archive otherwise
>> 	open the default locale archive. It's an error for a user specified
>> 	locale archive not to exist.
> 
> Two spaces; caps; punctuation: "If AH->fname is non-null, open that file
> rather than the default file name, and don't ignore ENOENT."

Fixed.

>> -/* 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 (char *fname, int verbose) __attribute__ ((noreturn));
> 
> Line too long.

Fixed.

>> +  bool defaultfname = false;
> 
> Why not just test archivefname == fname?

Sleep deprived?

> It would be clearer to change the names to "fname" and "default_fname", too.

Fixed.

>> +show_archive_content (char *fname, int verbose)
> 
> Might as well be const.

Agreed.

Tested on x86-64 by listing archives and the default archive.

I've checked in version 3.

v2
- Fix uninitialized uses of ah.fname.
v3
- Fixup ChangeLog.
- Remove defaultfname bool, rename fname to default_fname, and use
  `archivefname == default_fname' to detect the default archive being
  opened.
- Use const where possible.

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.

diff --git a/locale/locarchive.h b/locale/locarchive.h
index f2d8477..fec3b1a 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 8b9866a..d664232 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 e010c72..5a05a2e 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 e2a30b5..e796865 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 3e76ec9..ef7adbf 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)
---

Cheers,
Carlos.