From: Michihiro NAKAJIMA Date: Wed, 6 Apr 2011 04:31:40 +0000 (-0400) Subject: Rename "charset" option to "hdrcharset" since the name "charset" is not clear, X-Git-Tag: v3.0.0a~521 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31afa18c998e2f488f4d07fdabe847ba2dcc441b;p=thirdparty%2Flibarchive.git Rename "charset" option to "hdrcharset" since the name "charset" is not clear, in particular reading or writing pax format, the "charset" option can be used to a content of the file stored in pax archive file, and then "hdrcharset" described for its metadata such as filename. SVN-Revision: 3165 --- diff --git a/libarchive/archive_read_support_format_cab.c b/libarchive/archive_read_support_format_cab.c index 79da9bb01..2d9bf2be5 100644 --- a/libarchive/archive_read_support_format_cab.c +++ b/libarchive/archive_read_support_format_cab.c @@ -455,10 +455,10 @@ archive_read_format_cab_options(struct archive_read *a, int ret = ARCHIVE_FAILED; cab = (struct cab *)(a->format->data); - if (strcmp(key, "charset") == 0) { + if (strcmp(key, "hdrcharset") == 0) { if (val == NULL || val[0] == 0) archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "cab: charset option needs a character-set name"); + "cab: hdrcharset option needs a character-set name"); else { cab->sconv = archive_string_conversion_from_charset( &a->archive, val, 0); diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c index bb482f912..667958655 100644 --- a/libarchive/archive_read_support_format_lha.c +++ b/libarchive/archive_read_support_format_lha.c @@ -417,10 +417,10 @@ archive_read_format_lha_options(struct archive_read *a, int ret = ARCHIVE_FAILED; lha = (struct lha *)(a->format->data); - if (strcmp(key, "charset") == 0) { + if (strcmp(key, "hdrcharset") == 0) { if (val == NULL || val[0] == 0) archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "lha: charset option needs a character-set name"); + "lha: hdrcharset option needs a character-set name"); else { lha->opt_sconv = archive_string_conversion_from_charset( diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c index 37e9f626d..7ad5358ad 100644 --- a/libarchive/archive_read_support_format_tar.c +++ b/libarchive/archive_read_support_format_tar.c @@ -357,10 +357,10 @@ archive_read_format_tar_options(struct archive_read *a, int ret = ARCHIVE_FAILED; tar = (struct tar *)(a->format->data); - if (strcmp(key, "charset") == 0) { + if (strcmp(key, "hdrcharset") == 0) { if (val == NULL || val[0] == 0) archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "tar: charset option needs a character-set name"); + "tar: hdrcharset option needs a character-set name"); else { tar->opt_sconv = archive_string_conversion_from_charset( diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c index ad59a4853..f660099b9 100644 --- a/libarchive/archive_read_support_format_xar.c +++ b/libarchive/archive_read_support_format_xar.c @@ -525,10 +525,10 @@ xar_options(struct archive_read *a, const char *key, const char *val) int ret = ARCHIVE_FAILED; xar = (struct xar *)(a->format->data); - if (strcmp(key, "charset") == 0) { + if (strcmp(key, "hdrcharset") == 0) { if (val == NULL || val[0] == 0) archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "xar: charset option needs a character-set name"); + "xar: hdrcharset option needs a character-set name"); else { struct archive_string_conv *sc; diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c index c146b9e89..eae96cfe8 100644 --- a/libarchive/archive_read_support_format_zip.c +++ b/libarchive/archive_read_support_format_zip.c @@ -250,10 +250,10 @@ archive_read_format_zip_options(struct archive_read *a, int ret = ARCHIVE_FAILED; zip = (struct zip *)(a->format->data); - if (strcmp(key, "charset") == 0) { + if (strcmp(key, "hdrcharset") == 0) { if (val == NULL || val[0] == 0) archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "zip: charset option needs a character-set name"); + "zip: hdrcharset option needs a character-set name"); else { zip->sconv = archive_string_conversion_from_charset( &a->archive, val, 0); diff --git a/libarchive/archive_write_set_format_gnutar.c b/libarchive/archive_write_set_format_gnutar.c index 7d8097dc5..140cd7f9e 100644 --- a/libarchive/archive_write_set_format_gnutar.c +++ b/libarchive/archive_write_set_format_gnutar.c @@ -193,10 +193,10 @@ archive_write_gnutar_options(struct archive_write *a, const char *key, struct gnutar *gnutar = (struct gnutar *)a->format_data; int ret = ARCHIVE_FAILED; - if (strcmp(key, "charset") == 0) { + if (strcmp(key, "hdrcharset") == 0) { if (val == NULL || val[0] == 0) archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "%s: charset option needs a character-set name", + "%s: hdrcharset option needs a character-set name", a->format_name); else { gnutar->opt_sconv = archive_string_conversion_to_charset( diff --git a/libarchive/archive_write_set_format_pax.c b/libarchive/archive_write_set_format_pax.c index 42b1056fa..b3f144c73 100644 --- a/libarchive/archive_write_set_format_pax.c +++ b/libarchive/archive_write_set_format_pax.c @@ -157,14 +157,14 @@ archive_write_pax_options(struct archive_write *a, const char *key, struct pax *pax = (struct pax *)a->format_data; int ret = ARCHIVE_FAILED; - if (strcmp(key, "charset") == 0) { + if (strcmp(key, "hdrcharset") == 0) { /* * The character-set we can use are defined in * IEEE Std 1003.1-2001 */ if (val == NULL || val[0] == 0) archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "pax: charset option needs a character-set name"); + "pax: hdrcharset option needs a character-set name"); else if (strcmp(val, "BINARY") == 0 || strcmp(val, "binary") == 0) { /* diff --git a/libarchive/archive_write_set_format_ustar.c b/libarchive/archive_write_set_format_ustar.c index b6ca61e7b..1957530ef 100644 --- a/libarchive/archive_write_set_format_ustar.c +++ b/libarchive/archive_write_set_format_ustar.c @@ -208,10 +208,10 @@ archive_write_ustar_options(struct archive_write *a, const char *key, struct ustar *ustar = (struct ustar *)a->format_data; int ret = ARCHIVE_FAILED; - if (strcmp(key, "charset") == 0) { + if (strcmp(key, "hdrcharset") == 0) { if (val == NULL || val[0] == 0) archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "%s: charset option needs a character-set name", + "%s: hdrcharset option needs a character-set name", a->format_name); else { ustar->opt_sconv = archive_string_conversion_to_charset( diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c index fe1e7f060..a12d52a42 100644 --- a/libarchive/archive_write_set_format_zip.c +++ b/libarchive/archive_write_set_format_zip.c @@ -235,10 +235,10 @@ archive_write_zip_options(struct archive_write *a, const char *key, zip->compression = COMPRESSION_STORE; ret = ARCHIVE_OK; } - } else if (strcmp(key, "charset") == 0) { + } else if (strcmp(key, "hdrcharset") == 0) { if (val == NULL || val[0] == 0) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "%s: charset option needs a character-set name", + "%s: hdrcharset option needs a character-set name", a->format_name); } else { zip->opt_sconv = archive_string_conversion_to_charset( diff --git a/libarchive/test/test_pax_filename_encoding.c b/libarchive/test/test_pax_filename_encoding.c index 56729a2ce..03d649aa8 100644 --- a/libarchive/test/test_pax_filename_encoding.c +++ b/libarchive/test/test_pax_filename_encoding.c @@ -345,7 +345,7 @@ test_pax_filename_encoding_ru_RU() a = archive_write_new(); assertEqualInt(ARCHIVE_OK, archive_write_set_format_pax(a)); - if (archive_write_set_options(a, "charset=UTF-8") != ARCHIVE_OK) { + if (archive_write_set_options(a, "hdrcharset=UTF-8") != ARCHIVE_OK) { skipping("This system cannot convert character-set" " from KOI8-R to UTF-8."); archive_write_free(a); @@ -384,7 +384,7 @@ test_pax_filename_encoding_ja_JP() a = archive_write_new(); assertEqualInt(ARCHIVE_OK, archive_write_set_format_pax(a)); - if (archive_write_set_options(a, "charset=UTF-8") != ARCHIVE_OK) { + if (archive_write_set_options(a, "hdrcharset=UTF-8") != ARCHIVE_OK) { skipping("This system cannot convert character-set" " from eucJP to UTF-8."); archive_write_free(a); diff --git a/libarchive/test/test_read_format_cab_filename.c b/libarchive/test/test_read_format_cab_filename.c index f3cf1089c..eb77e85b3 100644 --- a/libarchive/test/test_read_format_cab_filename.c +++ b/libarchive/test/test_read_format_cab_filename.c @@ -34,7 +34,7 @@ test_read_format_cab_filename_CP932_eucJP(const char *refname) struct archive_entry *ae; /* - * Read CAB filename in ja_JP.eucJP with "charset=CP932" option. + * Read CAB filename in ja_JP.eucJP with "hdrcharset=CP932" option. */ if (NULL == setlocale(LC_ALL, "ja_JP.eucJP")) { skipping("ja_JP.eucJP locale not available on this system."); @@ -44,7 +44,7 @@ test_read_format_cab_filename_CP932_eucJP(const char *refname) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - if (ARCHIVE_OK != archive_read_set_options(a, "charset=CP932")) { + if (ARCHIVE_OK != archive_read_set_options(a, "hdrcharset=CP932")) { skipping("This system cannot convert character-set" " from CP932 to eucJP."); goto cleanup; @@ -87,7 +87,7 @@ test_read_format_cab_filename_CP932_UTF8(const char *refname) struct archive_entry *ae; /* - * Read CAB filename in ja_JP.UTF-8 with "charset=CP932" option. + * Read CAB filename in ja_JP.UTF-8 with "hdrcharset=CP932" option. */ if (NULL == setlocale(LC_ALL, "ja_JP.UTF-8")) { skipping("ja_JP.UTF-8 locale not available on this system."); @@ -97,7 +97,7 @@ test_read_format_cab_filename_CP932_UTF8(const char *refname) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - if (ARCHIVE_OK != archive_read_set_options(a, "charset=CP932")) { + if (ARCHIVE_OK != archive_read_set_options(a, "hdrcharset=CP932")) { skipping("This system cannot convert character-set" " from CP932 to UTF-8."); goto cleanup; diff --git a/libarchive/test/test_read_format_lha_filename.c b/libarchive/test/test_read_format_lha_filename.c index 6028bc2f5..63a21269c 100644 --- a/libarchive/test/test_read_format_lha_filename.c +++ b/libarchive/test/test_read_format_lha_filename.c @@ -49,7 +49,7 @@ test_read_format_lha_filename_CP932_eucJP(const char *refname) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - if (ARCHIVE_OK != archive_read_set_options(a, "charset=CP932")) { + if (ARCHIVE_OK != archive_read_set_options(a, "hdrcharset=CP932")) { assertEqualInt(ARCHIVE_OK, archive_read_free(a)); skipping("This system cannot convert character-set" " from CP932 to eucJP."); @@ -108,7 +108,7 @@ test_read_format_lha_filename_CP932_UTF8(const char *refname) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - if (ARCHIVE_OK != archive_read_set_options(a, "charset=CP932")) { + if (ARCHIVE_OK != archive_read_set_options(a, "hdrcharset=CP932")) { assertEqualInt(ARCHIVE_OK, archive_read_free(a)); skipping("This system cannot convert character-set" " from CP932 to UTF-8."); diff --git a/libarchive/test/test_read_format_zip_filename.c b/libarchive/test/test_read_format_zip_filename.c index f51ae279a..a45953a5e 100644 --- a/libarchive/test/test_read_format_zip_filename.c +++ b/libarchive/test/test_read_format_zip_filename.c @@ -34,7 +34,7 @@ test_read_format_zip_filename_CP932_eucJP(const char *refname) struct archive_entry *ae; /* - * Read ZIP filename in ja_JP.eucJP with "charset=CP932" option. + * Read ZIP filename in ja_JP.eucJP with "hdrcharset=CP932" option. */ if (NULL == setlocale(LC_ALL, "ja_JP.eucJP")) { skipping("ja_JP.eucJP locale not available on this system."); @@ -44,7 +44,7 @@ test_read_format_zip_filename_CP932_eucJP(const char *refname) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - if (ARCHIVE_OK != archive_read_set_options(a, "charset=CP932")) { + if (ARCHIVE_OK != archive_read_set_options(a, "hdrcharset=CP932")) { skipping("This system cannot convert character-set" " from CP932 to eucJP."); goto cleanup; @@ -87,7 +87,7 @@ test_read_format_zip_filename_CP932_UTF8(const char *refname) struct archive_entry *ae; /* - * Read ZIP filename in ja_JP.UTF-8 with "charset=CP932" option. + * Read ZIP filename in ja_JP.UTF-8 with "hdrcharset=CP932" option. */ if (NULL == setlocale(LC_ALL, "ja_JP.UTF-8")) { skipping("ja_JP.UTF-8 locale not available on this system."); @@ -97,7 +97,7 @@ test_read_format_zip_filename_CP932_UTF8(const char *refname) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - if (ARCHIVE_OK != archive_read_set_options(a, "charset=CP932")) { + if (ARCHIVE_OK != archive_read_set_options(a, "hdrcharset=CP932")) { skipping("This system cannot convert character-set" " from CP932 to UTF-8."); goto cleanup; @@ -150,7 +150,7 @@ test_read_format_zip_filename_UTF8_eucJP(const char *refname) } assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a)); - if (ARCHIVE_OK != archive_read_set_options(a, "charset=UTF-8")) { + if (ARCHIVE_OK != archive_read_set_options(a, "hdrcharset=UTF-8")) { skipping("This system cannot convert character-set" " from UTF-8 to eucJP."); goto cleanup;