Fix build warning in locarchive.c

git-mirror · Nov 20, 2013 · 4712799 · 4712799
1 parent 0417b20
commit 4712799
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
 2013-11-20  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+	* locale/programs/locarchive.c (open_archive): Add const
+	qualifier to ARCHIVEFNAME and copy default fname to
+	DEFAULT_FNAME.
+
 	[BZ #15601]
 	* libio/tst-widetext.input: Rename Oriya to Odia.
 	* locale/iso-639.def: Likewise.

diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
@@ -564,15 +564,15 @@ open_archive (struct locarhandle *ah, bool readonly)
   int retry = 0;
   size_t prefix_len = output_prefix ? strlen (output_prefix) : 0;
   char default_fname[prefix_len + sizeof (ARCHIVE_NAME)];
-  char *archivefname = ah->fname;
+  const char *archivefname = ah->fname;
 
   /* 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);
+        memcpy (default_fname, output_prefix, prefix_len);
+      strcpy (default_fname + prefix_len, ARCHIVE_NAME);
     }
 
   while (1)