API cleanup, be less strict with file name arguments.
diff --git a/lib/zip_set_file_comment.c b/lib/zip_set_file_comment.c
index 0621ad2..654c64f 100644
--- a/lib/zip_set_file_comment.c
+++ b/lib/zip_set_file_comment.c
@@ -41,77 +41,7 @@
ZIP_EXTERN int
-zip_set_file_comment(struct zip *za, zip_uint64_t idx,
- const char *comment, int len)
+zip_set_file_comment(struct zip *za, zip_uint64_t idx, const char *comment, int len)
{
- struct zip_entry *e;
- struct zip_string *cstr;
- struct zip_dirent *de;
- enum zip_encoding_type com_enc, name_enc;
- int changed;
-
- if ((de=_zip_get_dirent(za, idx, 0, NULL)) == NULL)
- return -1;
-
- if (ZIP_IS_RDONLY(za)) {
- _zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
- return -1;
- }
-
- if (len < 0 || len > MAXCOMLEN
- || (len > 0 && comment == NULL)) {
- _zip_error_set(&za->error, ZIP_ER_INVAL, 0);
- return -1;
- }
-
- if (len > 0) {
- if ((cstr=_zip_string_new((const zip_uint8_t *)comment, len, &za->error)) == NULL)
- return -1;
-
- if ((com_enc=_zip_guess_encoding(cstr, ZIP_ENCODING_UTF8_KNOWN)) == ZIP_ENCODING_ERROR) {
- _zip_string_free(cstr);
- _zip_error_set(&za->error, ZIP_ER_INVAL, 0);
- return -1;
- }
- }
- else {
- cstr = NULL;
- com_enc = ZIP_ENCODING_ASCII;
- }
-
- name_enc = _zip_guess_encoding(de->filename, ZIP_ENCODING_UNKNOWN);
-
- if (name_enc == ZIP_ENCODING_CP437 && com_enc == ZIP_ENCODING_UTF8_KNOWN) {
- _zip_error_set(&za->error, ZIP_ER_ENCMISMATCH, 0);
- return -1;
- }
-
- e = za->entry+idx;
-
- if (e->changes) {
- _zip_string_free(e->changes->comment);
- e->changes->comment = NULL;
- e->changes->changed &= ~ZIP_DIRENT_COMMENT;
- }
-
- if (e->orig && e->orig->comment)
- changed = !_zip_string_equal(e->orig->comment, cstr);
- else
- changed = (cstr != NULL);
-
- if (changed) {
- if (e->changes == NULL)
- e->changes = _zip_dirent_clone(e->orig);
- e->changes->comment = cstr;
- e->changes->changed |= ZIP_DIRENT_COMMENT;
- }
- else {
- _zip_string_free(cstr);
- if (e->changes && e->changes->changed == 0) {
- _zip_dirent_free(e->changes);
- e->changes = NULL;
- }
- }
-
- return 0;
+ return zip_file_set_comment(za, idx, comment, len, 0);
}
