projects / platform / upstream / flac.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Huge Windows utf8 I/O patch.
[platform/upstream/flac.git] / src / metaflac / operations_shorthand_vorbiscomment.c
diff --git a/src/metaflac/operations_shorthand_vorbiscomment.c b/src/metaflac/operations_shorthand_vorbiscomment.c
index 610e972..61537bf 100644 (file)
--- a/src/metaflac/operations_shorthand_vorbiscomment.c
+++ b/src/metaflac/operations_shorthand_vorbiscomment.c
@@ -127,7 +127,7 @@ FLAC__bool remove_vc_all(const char *filename, FLAC__StreamMetadata *block, FLAC
        if(0 != block->data.vorbis_comment.comments) {
                FLAC__ASSERT(block->data.vorbis_comment.num_comments > 0);
                if(!FLAC__metadata_object_vorbiscomment_resize_comments(block, 0)) {
-                       fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
+                       flac_fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
                        return false;
                }
                *needs_write = true;
@@ -148,7 +148,7 @@ FLAC__bool remove_vc_field(const char *filename, FLAC__StreamMetadata *block, co
        n = FLAC__metadata_object_vorbiscomment_remove_entries_matching(block, field_name);
 
        if(n < 0) {
-               fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
+               flac_fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
                return false;
        }
        else if(n > 0)
@@ -166,7 +166,7 @@ FLAC__bool remove_vc_firstfield(const char *filename, FLAC__StreamMetadata *bloc
        n = FLAC__metadata_object_vorbiscomment_remove_entry_matching(block, field_name);
 
        if(n < 0) {
-               fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
+               flac_fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
                return false;
        }
        else if(n > 0)
@@ -191,18 +191,18 @@ FLAC__bool set_vc_field(const char *filename, FLAC__StreamMetadata *block, const
                char *data = 0;
                const FLAC__off_t size = grabbag__file_get_filesize(field->field_value);
                if(size < 0) {
-                       fprintf(stderr, "%s: ERROR: can't open file '%s' for '%s' tag value\n", filename, field->field_value, field->field_name);
+                       flac_fprintf(stderr, "%s: ERROR: can't open file '%s' for '%s' tag value\n", filename, field->field_value, field->field_name);
                        return false;
                }
                if(size >= 0x100000) { /* magic arbitrary limit, actual format limit is near 16MB */
-                       fprintf(stderr, "%s: ERROR: file '%s' for '%s' tag value is too large\n", filename, field->field_value, field->field_name);
+                       flac_fprintf(stderr, "%s: ERROR: file '%s' for '%s' tag value is too large\n", filename, field->field_value, field->field_name);
                        return false;
                }
                if(0 == (data = malloc(size+1)))
                        die("out of memory allocating tag value");
                data[size] = '\0';
-               if(0 == (f = fopen(field->field_value, "rb")) || fread(data, 1, size, f) != (size_t)size) {
-                       fprintf(stderr, "%s: ERROR: while reading file '%s' for '%s' tag value: %s\n", filename, field->field_value, field->field_name, strerror(errno));
+               if(0 == (f = flac_fopen(field->field_value, "rb")) || fread(data, 1, size, f) != (size_t)size) {
+                       flac_fprintf(stderr, "%s: ERROR: while reading file '%s' for '%s' tag value: %s\n", filename, field->field_value, field->field_name, strerror(errno));
                        free(data);
                        if(f)
                                fclose(f);
@@ -211,7 +211,7 @@ FLAC__bool set_vc_field(const char *filename, FLAC__StreamMetadata *block, const
                fclose(f);
                if(strlen(data) != (size_t)size) {
                        free(data);
-                       fprintf(stderr, "%s: ERROR: file '%s' for '%s' tag value has embedded NULs\n", filename, field->field_value, field->field_name);
+                       flac_fprintf(stderr, "%s: ERROR: file '%s' for '%s' tag value has embedded NULs\n", filename, field->field_value, field->field_name);
                        return false;
                }
 
@@ -224,19 +224,19 @@ FLAC__bool set_vc_field(const char *filename, FLAC__StreamMetadata *block, const
                }
                else {
                        free(data);
-                       fprintf(stderr, "%s: ERROR: converting file '%s' contents to UTF-8 for tag value\n", filename, field->field_value);
+                       flac_fprintf(stderr, "%s: ERROR: converting file '%s' contents to UTF-8 for tag value\n", filename, field->field_value);
                        return false;
                }
 
                /* create and entry and append it */
                if(!FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, field->field_name, converted)) {
                        free(converted);
-                       fprintf(stderr, "%s: ERROR: file '%s' for '%s' tag value is not valid UTF-8\n", filename, field->field_value, field->field_name);
+                       flac_fprintf(stderr, "%s: ERROR: file '%s' for '%s' tag value is not valid UTF-8\n", filename, field->field_value, field->field_name);
                        return false;
                }
                free(converted);
                if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/false)) {
-                       fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
+                       flac_fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
                        return false;
                }
 
@@ -245,6 +245,9 @@ FLAC__bool set_vc_field(const char *filename, FLAC__StreamMetadata *block, const
        }
        else {
                FLAC__bool needs_free = false;
+#ifdef FLAC__STRINGS_IN_UTF8 /* do not convert anything or things will break */
+               entry.entry = (FLAC__byte *)field->field;
+#else
                if(raw) {
                        entry.entry = (FLAC__byte *)field->field;
                }
@@ -253,9 +256,10 @@ FLAC__bool set_vc_field(const char *filename, FLAC__StreamMetadata *block, const
                        needs_free = true;
                }
                else {
-                       fprintf(stderr, "%s: ERROR: converting comment '%s' to UTF-8\n", filename, field->field);
+                       flac_fprintf(stderr, "%s: ERROR: converting comment '%s' to UTF-8\n", filename, field->field);
                        return false;
                }
+#endif
                entry.length = strlen((const char *)entry.entry);
                if(!FLAC__format_vorbiscomment_entry_is_legal(entry.entry, entry.length)) {
                        if(needs_free)
@@ -264,14 +268,14 @@ FLAC__bool set_vc_field(const char *filename, FLAC__StreamMetadata *block, const
                         * our previous parsing has already established that the field
                         * name is OK, so it must be the field value
                         */
-                       fprintf(stderr, "%s: ERROR: tag value for '%s' is not valid UTF-8\n", filename, field->field_name);
+                       flac_fprintf(stderr, "%s: ERROR: tag value for '%s' is not valid UTF-8\n", filename, field->field_name);
                        return false;
                }
 
                if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) {
                        if(needs_free)
                                free(converted);
-                       fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
+                       flac_fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
                        return false;
                }
 
@@ -289,16 +293,16 @@ FLAC__bool import_vc_from(const char *filename, FLAC__StreamMetadata *block, con
        FLAC__bool ret;
 
        if(0 == vc_filename->value || strlen(vc_filename->value) == 0) {
-               fprintf(stderr, "%s: ERROR: empty import file name\n", filename);
+               flac_fprintf(stderr, "%s: ERROR: empty import file name\n", filename);
                return false;
        }
        if(0 == strcmp(vc_filename->value, "-"))
                f = stdin;
        else
-               f = fopen(vc_filename->value, "r");
+               f = flac_fopen(vc_filename->value, "r");
 
        if(0 == f) {
-               fprintf(stderr, "%s: ERROR: can't open import file %s: %s\n", filename, vc_filename->value, strerror(errno));
+               flac_fprintf(stderr, "%s: ERROR: can't open import file %s: %s\n", filename, vc_filename->value, strerror(errno));
                return false;
        }
 
@@ -307,7 +311,7 @@ FLAC__bool import_vc_from(const char *filename, FLAC__StreamMetadata *block, con
                if(!feof(f)) {
                        char *p = strchr(line, '\n');
                        if(0 == p) {
-                               fprintf(stderr, "%s: ERROR: line too long, aborting\n", vc_filename->value);
+                               flac_fprintf(stderr, "%s: ERROR: line too long, aborting\n", vc_filename->value);
                                ret = false;
                        }
                        else {
@@ -318,7 +322,7 @@ FLAC__bool import_vc_from(const char *filename, FLAC__StreamMetadata *block, con
                                field.field_value_from_file = false;
                                if(!parse_vorbis_comment_field(line, &field.field, &field.field_name, &field.field_value, &field.field_value_length, &violation)) {
                                        FLAC__ASSERT(0 != violation);
-                                       fprintf(stderr, "%s: ERROR: malformed vorbis comment field \"%s\",\n       %s\n", vc_filename->value, line, violation);
+                                       flac_fprintf(stderr, "%s: ERROR: malformed vorbis comment field \"%s\",\n       %s\n", vc_filename->value, line, violation);
                                        ret = false;
                                }
                                else {
@@ -345,16 +349,16 @@ FLAC__bool export_vc_to(const char *filename, FLAC__StreamMetadata *block, const
        FLAC__bool ret;
 
        if(0 == vc_filename->value || strlen(vc_filename->value) == 0) {
-               fprintf(stderr, "%s: ERROR: empty export file name\n", filename);
+               flac_fprintf(stderr, "%s: ERROR: empty export file name\n", filename);
                return false;
        }
        if(0 == strcmp(vc_filename->value, "-"))
                f = stdout;
        else
-               f = fopen(vc_filename->value, "w");
+               f = flac_fopen(vc_filename->value, "w");
 
        if(0 == f) {
-               fprintf(stderr, "%s: ERROR: can't open export file %s: %s\n", filename, vc_filename->value, strerror(errno));
+               flac_fprintf(stderr, "%s: ERROR: can't open export file %s: %s\n", filename, vc_filename->value, strerror(errno));
                return false;
        }
 
Domain: Multimedia / Audio FW;