commit 123a7589de88c71168beb477c61b1f8b5a9e2f11
author Thomas Klausner <tk@giga.or.at> Mon Feb 20 01:42:13 2012 +0100
committer Thomas Klausner <tk@giga.or.at> Mon Feb 20 01:42:13 2012 +0100
tree 2c274b3eb8d89897f598d81abdc28a07a96b86a6
parent 40342b70db650827a10385b20a74bb38e8c1c7af

Add encoding support to zip_{get,set}_{file,archive}_comment,
and handle interaction in zip_{get,set}_name.
Set general purpose bit flag 11 when writing out UTF-8 names.
Add new error type ZIP_ER_ENCMISMATCH for the case where the
encoding of file name and file comment don't match.

Document changes and workaround for ZIP_ER_ENCMISMATCH.

Update copyright years.

--HG--
branch : HEAD

lib/zip_get_archive_comment.c

diff --git a/lib/zip_get_archive_comment.c b/lib/zip_get_archive_comment.c
index 669eb70..a2e219b 100644
--- a/lib/zip_get_archive_comment.c
+++ b/lib/zip_get_archive_comment.c
@@ -1,6 +1,6 @@
 /*
   zip_get_archive_comment.c -- get archive comment
-  Copyright (C) 2006-2007 Dieter Baron and Thomas Klausner
+  Copyright (C) 2006-2012 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
   The authors can be contacted at <libzip@nih.at>
@@ -33,6 +33,8 @@
 
 
 
+#include <string.h>
+
 #include "zipint.h"
 
 
@@ -40,12 +42,31 @@
 ZIP_EXTERN const char *
 zip_get_archive_comment(struct zip *za, int *lenp, int flags)
 {
+    const char *ret;
     if ((flags & ZIP_FL_UNCHANGED)
 	|| (za->ch_comment_len == -1)) {
 	if (za->cdir) {
 	    if (lenp != NULL)
 		*lenp = za->cdir->comment_len;
-	    return za->cdir->comment;
+	    ret = za->cdir->comment;
+	    
+	    if (flags & ZIP_FL_NAME_RAW)
+		return ret;
+
+	    /* start guessing */
+	    if (za->cdir->comment_type == ZIP_ENCODING_UNKNOWN)
+		za->cdir->comment_type = _zip_guess_encoding(ret, za->cdir->comment_len);
+
+	    if (((flags & ZIP_FL_NAME_STRICT) && (za->cdir->comment_type != ZIP_ENCODING_ASCII))
+		|| (za->cdir->comment_type == ZIP_ENCODING_CP437)) {
+		if (za->cdir->comment_converted == NULL)
+		    za->cdir->comment_converted = _zip_cp437_to_utf8(ret, za->cdir->comment_len, &za->error);
+		ret = za->cdir->comment_converted;
+		if (lenp != NULL)
+		    *lenp = strlen(ret);
+	    }
+
+	    return ret;
 	}
 	else {
 	    if (lenp != NULL)
@@ -53,7 +74,8 @@
 	    return NULL;
 	}
     }
-    
+
+    /* already UTF-8, no conversion needed */
     if (lenp != NULL)
 	*lenp = za->ch_comment_len;
     return za->ch_comment;