claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

additions to metadata object api: more vorbiscomment functions, trailing-null on vorbis comment field values enforced everywhere

Browse Source
This commit is contained in:
Josh Coalson
2004-12-30 00:59:30 +00:00
parent 8ddf7fb278
commit def597ee59
20 changed files with 984 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/metaflac/utils.c
View File

@@ -220,24 +220,16 @@ void write_vc_field(const char *filename, const FLAC__StreamMetadata_VorbisComme
if(!raw) {
/*
* utf8_decode() works on NULL-terminated strings, so
* we append a null to the entry. @@@ Note, this means
* that comments that contain an embedded null will be
* truncated by utf_decode().
* WATCHOUT: comments that contain an embedded null will
* be truncated by utf_decode().
*/
char *terminated, *converted;
char *converted;
if(0 == (terminated = malloc(entry->length + 1)))
die("out of memory allocating space for vorbis comment");
memcpy(terminated, entry->entry, entry->length);
terminated[entry->length] = '\0';
if(utf8_decode(terminated, &converted) >= 0) {
if(utf8_decode(entry->entry, &converted) >= 0) {
(void) local_fwrite(converted, 1, strlen(converted), f);
free(terminated);
free(converted);
}
else {
free(terminated);
(void) local_fwrite(entry->entry, 1, entry->length, f);
}
}
@@ -246,7 +238,7 @@ void write_vc_field(const char *filename, const FLAC__StreamMetadata_VorbisComme
}
}
fprintf(f, "\n");
putc('\n', f);
}
void write_vc_fields(const char *filename, const char *field_name, const FLAC__StreamMetadata_VorbisComment_Entry entry[], unsigned num_entries, FLAC__bool raw, FILE *f)
@@ -255,7 +247,7 @@ void write_vc_fields(const char *filename, const char *field_name, const FLAC__S
const unsigned field_name_length = (0 != field_name)? strlen(field_name) : 0;
for(i = 0; i < num_entries; i++) {
if(0 == field_name || FLAC__metadata_object_vorbiscomment_entry_matches(entry + i, field_name, field_name_length))
if(0 == field_name || FLAC__metadata_object_vorbiscomment_entry_matches(entry[i], field_name, field_name_length))
write_vc_field(filename, entry + i, raw, f);
}
}