summaryrefslogtreecommitdiffabout
path: root/libid3tag
authorSergey Poznyakoff <gray@gnu.org.ua>2011-03-20 11:33:11 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2011-03-20 12:01:39 (GMT)
commit58bc8166fca5ba0f86c07636a7ad71ee1457ec38 (patch) (side-by-side diff)
treeb66816aae86afb8b0a5cf784cd89f9abdea776aa /libid3tag
parent929d8a0d47e8741093bbfd024715a1c7a08cae9e (diff)
downloadidest-58bc8166fca5ba0f86c07636a7ad71ee1457ec38.tar.gz
idest-58bc8166fca5ba0f86c07636a7ad71ee1457ec38.tar.bz2
Reindent libid3tag sources.
Diffstat (limited to 'libid3tag') (more/less context) (ignore whitespace changes)
-rw-r--r--libid3tag/compat.h4
-rw-r--r--libid3tag/crc.c66
-rw-r--r--libid3tag/crc.h4
-rw-r--r--libid3tag/debug.c272
-rw-r--r--libid3tag/debug.h4
-rw-r--r--libid3tag/field.c1333
-rw-r--r--libid3tag/field.h4
-rw-r--r--libid3tag/file.c1221
-rw-r--r--libid3tag/file.h4
-rw-r--r--libid3tag/frame.c1036
-rw-r--r--libid3tag/frame.h4
-rw-r--r--libid3tag/frametype.h4
-rw-r--r--libid3tag/genre.c174
-rw-r--r--libid3tag/genre.h4
-rw-r--r--libid3tag/global.h4
-rw-r--r--libid3tag/id3tag.h4
-rw-r--r--libid3tag/latin1.c239
-rw-r--r--libid3tag/latin1.h4
-rw-r--r--libid3tag/parse.c297
-rw-r--r--libid3tag/parse.h4
-rw-r--r--libid3tag/render.c278
-rw-r--r--libid3tag/render.h4
-rw-r--r--libid3tag/tag.c1478
-rw-r--r--libid3tag/tag.h4
-rw-r--r--libid3tag/ucs4.c250
-rw-r--r--libid3tag/ucs4.h4
-rw-r--r--libid3tag/utf16.c383
-rw-r--r--libid3tag/utf16.h4
-rw-r--r--libid3tag/utf8.c556
-rw-r--r--libid3tag/utf8.h4
-rw-r--r--libid3tag/util.c200
-rw-r--r--libid3tag/util.h4
-rw-r--r--libid3tag/version.c38
-rw-r--r--libid3tag/version.h4
34 files changed, 4168 insertions, 3729 deletions
diff --git a/libid3tag/compat.h b/libid3tag/compat.h
index 8af71ec..eb51f44 100644
--- a/libid3tag/compat.h
+++ b/libid3tag/compat.h
@@ -19,7 +19,7 @@
* $Id: compat.h,v 1.8 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_COMPAT_H
+#ifndef LIBID3TAG_COMPAT_H
# define LIBID3TAG_COMPAT_H
# include "id3tag.h"
@@ -38,4 +38,4 @@ struct id3_compat const *id3_compat_lookup(register char const *,
int id3_compat_fixup(struct id3_tag *);
-# endif
+#endif
diff --git a/libid3tag/crc.c b/libid3tag/crc.c
index 742a5d8..de56ecd 100644
--- a/libid3tag/crc.c
+++ b/libid3tag/crc.c
@@ -19,17 +19,16 @@
* $Id: crc.c,v 1.11 2004/02/17 02:04:10 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include "id3tag.h"
-# include "crc.h"
+#include "id3tag.h"
+#include "crc.h"
-static
-unsigned long const crc_table[256] = {
+static unsigned long const crc_table[256] = {
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL,
0x076dc419L, 0x706af48fL, 0xe963a535L, 0x9e6495a3L,
0x0edb8832L, 0x79dcb8a4L, 0xe0d5e91eL, 0x97d2d988L,
@@ -107,31 +106,32 @@ unsigned long const crc_table[256] = {
* NAME: crc->compute()
* DESCRIPTION: calculate CRC-32 value (ISO 3309)
*/
-unsigned long id3_crc_compute(id3_byte_t const *data, id3_length_t length)
+unsigned long
+id3_crc_compute(id3_byte_t const *data, id3_length_t length)
{
- register unsigned long crc;
+ register unsigned long crc;
- for (crc = 0xffffffffL; length >= 8; length -= 8) {
- crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- }
-
- switch (length) {
- case 7: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- case 6: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- case 5: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- case 4: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- case 3: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- case 2: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- case 1: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
- case 0: break;
- }
-
- return crc ^ 0xffffffffL;
+ for (crc = 0xffffffffL; length >= 8; length -= 8) {
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ }
+
+ switch (length) {
+ case 7: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 6: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 5: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 4: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 3: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 2: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 1: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 0: break;
+ }
+
+ return crc ^ 0xffffffffL;
}
diff --git a/libid3tag/crc.h b/libid3tag/crc.h
index 89a5a39..055be13 100644
--- a/libid3tag/crc.h
+++ b/libid3tag/crc.h
@@ -19,11 +19,11 @@
* $Id: crc.h,v 1.8 2004/02/17 02:04:10 rob Exp $
*/
-# ifndef LIBID3TAG_CRC_H
+#ifndef LIBID3TAG_CRC_H
# define LIBID3TAG_CRC_H
# include "id3tag.h"
unsigned long id3_crc_compute(id3_byte_t const *, id3_length_t);
-# endif
+#endif
diff --git a/libid3tag/debug.c b/libid3tag/debug.c
index d91a2c5..a8933be 100644
--- a/libid3tag/debug.c
+++ b/libid3tag/debug.c
@@ -19,204 +19,212 @@
* $Id: debug.c,v 1.8 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# undef malloc
-# undef calloc
-# undef realloc
-# undef free
+#undef malloc
+#undef calloc
+#undef realloc
+#undef free
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
-# include "debug.h"
+#include "debug.h"
-# if defined(DEBUG)
+#if defined(DEBUG)
# define DEBUG_MAGIC 0xdeadbeefL
struct debug {
- char const *file;
- unsigned int line;
- size_t size;
- struct debug *next;
- struct debug *prev;
- long int magic;
+ char const *file;
+ unsigned int line;
+ size_t size;
+ struct debug *next;
+ struct debug *prev;
+ long int magic;
};
static struct debug *allocated;
static int registered;
-static
-void check(void)
+static void
+check(void)
{
- struct debug *debug;
+ struct debug *debug;
- for (debug = allocated; debug; debug = debug->next) {
- if (debug->magic != DEBUG_MAGIC) {
- fprintf(stderr, "memory corruption\n");
- break;
- }
+ for (debug = allocated; debug; debug = debug->next) {
+ if (debug->magic != DEBUG_MAGIC) {
+ fprintf(stderr, "memory corruption\n");
+ break;
+ }
- fprintf(stderr, "%s:%u: leaked %lu bytes\n",
- debug->file, debug->line, debug->size);
- }
+ fprintf(stderr, "%s:%u: leaked %lu bytes\n",
+ debug->file, debug->line, debug->size);
+ }
}
-void *id3_debug_malloc(size_t size, char const *file, unsigned int line)
+void *
+id3_debug_malloc(size_t size, char const *file, unsigned int line)
{
- struct debug *debug;
+ struct debug *debug;
- if (!registered) {
- atexit(check);
- registered = 1;
- }
+ if (!registered) {
+ atexit(check);
+ registered = 1;
+ }
- if (size == 0)
- fprintf(stderr, "%s:%u: malloc(0)\n", file, line);
+ if (size == 0)
+ fprintf(stderr, "%s:%u: malloc(0)\n", file, line);
- debug = malloc(sizeof(*debug) + size);
- if (debug == 0) {
- fprintf(stderr, "%s:%u: malloc(%lu) failed\n", file, line, size);
- return 0;
- }
+ debug = malloc(sizeof(*debug) + size);
+ if (debug == 0) {
+ fprintf(stderr, "%s:%u: malloc(%lu) failed\n", file, line,
+ size);
+ return 0;
+ }
- debug->magic = DEBUG_MAGIC;
+ debug->magic = DEBUG_MAGIC;
- debug->file = file;
- debug->line = line;
- debug->size = size;
+ debug->file = file;
+ debug->line = line;
+ debug->size = size;
- debug->next = allocated;
- debug->prev = 0;
+ debug->next = allocated;
+ debug->prev = 0;
- if (allocated)
- allocated->prev = debug;
+ if (allocated)
+ allocated->prev = debug;
- allocated = debug;
+ allocated = debug;
- return ++debug;
+ return ++debug;
}
-void *id3_debug_calloc(size_t nmemb, size_t size,
- char const *file, unsigned int line)
+void *
+id3_debug_calloc(size_t nmemb, size_t size,
+ char const *file, unsigned int line)
{
- void *ptr;
+ void *ptr;
- ptr = id3_debug_malloc(nmemb * size, file, line);
- if (ptr)
- memset(ptr, 0, nmemb * size);
+ ptr = id3_debug_malloc(nmemb * size, file, line);
+ if (ptr)
+ memset(ptr, 0, nmemb * size);
- return ptr;
+ return ptr;
}
-void *id3_debug_realloc(void *ptr, size_t size,
- char const *file, unsigned int line)
+void *
+id3_debug_realloc(void *ptr, size_t size,
+ char const *file, unsigned int line)
{
- struct debug *debug, *new;
+ struct debug *debug, *new;
- if (size == 0) {
- id3_debug_free(ptr, file, line);
- return 0;
- }
+ if (size == 0) {
+ id3_debug_free(ptr, file, line);
+ return 0;
+ }
- if (ptr == 0)
- return id3_debug_malloc(size, file, line);
+ if (ptr == 0)
+ return id3_debug_malloc(size, file, line);
- debug = ptr;
- --debug;
+ debug = ptr;
+ --debug;
- if (debug->magic != DEBUG_MAGIC) {
- fprintf(stderr, "%s:%u: realloc(%p, %lu) memory not allocated\n",
- file, line, ptr, size);
- return 0;
- }
+ if (debug->magic != DEBUG_MAGIC) {
+ fprintf(stderr, "%s:%u: realloc(%p, %lu) memory not allocated\n",
+ file, line, ptr, size);
+ return 0;
+ }
- new = realloc(debug, sizeof(*debug) + size);
- if (new == 0) {
- fprintf(stderr, "%s:%u: realloc(%p, %lu) failed\n", file, line, ptr, size);
- return 0;
- }
+ new = realloc(debug, sizeof(*debug) + size);
+ if (new == 0) {
+ fprintf(stderr, "%s:%u: realloc(%p, %lu) failed\n",
+ file, line, ptr, size);
+ return 0;
+ }
- if (allocated == debug)
- allocated = new;
+ if (allocated == debug)
+ allocated = new;
- debug = new;
+ debug = new;
- debug->file = file;
- debug->line = line;
- debug->size = size;
+ debug->file = file;
+ debug->line = line;
+ debug->size = size;
- if (debug->next)
- debug->next->prev = debug;
- if (debug->prev)
- debug->prev->next = debug;
+ if (debug->next)
+ debug->next->prev = debug;
+ if (debug->prev)
+ debug->prev->next = debug;
- return ++debug;
+ return ++debug;
}
-void id3_debug_free(void *ptr, char const *file, unsigned int line)
+void
+id3_debug_free(void *ptr, char const *file, unsigned int line)
{
- struct debug *debug;
+ struct debug *debug;
- if (ptr == 0) {
- fprintf(stderr, "%s:%u: free(0)\n", file, line);
- return;
- }
+ if (ptr == 0) {
+ fprintf(stderr, "%s:%u: free(0)\n", file, line);
+ return;
+ }
- debug = ptr;
- --debug;
+ debug = ptr;
+ --debug;
- if (debug->magic != DEBUG_MAGIC) {
- fprintf(stderr, "%s:%u: free(%p) memory not allocated\n", file, line, ptr);
- return;
- }
+ if (debug->magic != DEBUG_MAGIC) {
+ fprintf(stderr, "%s:%u: free(%p) memory not allocated\n",
+ file, line, ptr);
+ return;
+ }
- debug->magic = 0;
+ debug->magic = 0;
- if (debug->next)
- debug->next->prev = debug->prev;
- if (debug->prev)
- debug->prev->next = debug->next;
+ if (debug->next)
+ debug->next->prev = debug->prev;
+ if (debug->prev)
+ debug->prev->next = debug->next;
- if (allocated == debug)
- allocated = debug->next;
+ if (allocated == debug)
+ allocated = debug->next;
- free(debug);
+ free(debug);
}
-void *id3_debug_release(void *ptr, char const *file, unsigned int line)
+void *
+id3_debug_release(void *ptr, char const *file, unsigned int line)
{
- struct debug *debug;
+ struct debug *debug;
- if (ptr == 0)
- return 0;
+ if (ptr == 0)
+ return 0;
- debug = ptr;
- --debug;
+ debug = ptr;
+ --debug;
- if (debug->magic != DEBUG_MAGIC) {
- fprintf(stderr, "%s:%u: release(%p) memory not allocated\n",
- file, line, ptr);
- return ptr;
- }
+ if (debug->magic != DEBUG_MAGIC) {
+ fprintf(stderr, "%s:%u: release(%p) memory not allocated\n",
+ file, line, ptr);
+ return ptr;
+ }
- if (debug->next)
- debug->next->prev = debug->prev;
- if (debug->prev)
- debug->prev->next = debug->next;
+ if (debug->next)
+ debug->next->prev = debug->prev;
+ if (debug->prev)
+ debug->prev->next = debug->next;
- if (allocated == debug)
- allocated = debug->next;
+ if (allocated == debug)
+ allocated = debug->next;
- memmove(debug, debug + 1, debug->size);
+ memmove(debug, debug + 1, debug->size);
- return debug;
+ return debug;
}
-# endif
+#endif
diff --git a/libid3tag/debug.h b/libid3tag/debug.h
index a9b4ce0..c2979ae 100644
--- a/libid3tag/debug.h
+++ b/libid3tag/debug.h
@@ -19,7 +19,7 @@
* $Id: debug.h,v 1.8 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_DEBUG_H
+#ifndef LIBID3TAG_DEBUG_H
# define LIBID3TAG_DEBUG_H
# include <stdlib.h>
@@ -31,4 +31,4 @@ void id3_debug_free(void *, char const *, unsigned int);
void *id3_debug_release(void *, char const *, unsigned int);
-# endif
+#endif
diff --git a/libid3tag/field.c b/libid3tag/field.c
index f2ecc0f..b334b0c 100644
--- a/libid3tag/field.c
+++ b/libid3tag/field.c
@@ -19,872 +19,929 @@
* $Id: field.c,v 1.16 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include <stdlib.h>
-# include <string.h>
+#include <stdlib.h>
+#include <string.h>
-# ifdef HAVE_ASSERT_H
-# include <assert.h>
-# endif
+#ifdef HAVE_ASSERT_H
+# include <assert.h>
+#endif
-# include "id3tag.h"
-# include "field.h"
-# include "frame.h"
-# include "render.h"
-# include "ucs4.h"
-# include "latin1.h"
-# include "parse.h"
+#include "id3tag.h"
+#include "field.h"
+#include "frame.h"
+#include "render.h"
+#include "ucs4.h"
+#include "latin1.h"
+#include "parse.h"
/*
- * NAME: field->init()
- * DESCRIPTION: initialize a field to a default value for the given type
+ * NAME: field->init()
+ * DESCRIPTION: initialize a field to a default value for the given type
*/
-void id3_field_init(union id3_field *field, enum id3_field_type type)
+void
+id3_field_init(union id3_field *field, enum id3_field_type type)
{
- assert(field);
-
- switch (field->type = type) {
- case ID3_FIELD_TYPE_TEXTENCODING:
- case ID3_FIELD_TYPE_INT8:
- case ID3_FIELD_TYPE_INT16:
- case ID3_FIELD_TYPE_INT24:
- case ID3_FIELD_TYPE_INT32:
- field->number.value = 0;
- break;
-
- case ID3_FIELD_TYPE_LATIN1:
- case ID3_FIELD_TYPE_LATIN1FULL:
- field->latin1.ptr = 0;
- break;
-
- case ID3_FIELD_TYPE_LATIN1LIST:
- field->latin1list.nstrings = 0;
- field->latin1list.strings = 0;
-
- case ID3_FIELD_TYPE_STRING:
- case ID3_FIELD_TYPE_STRINGFULL:
- field->string.ptr = 0;
- break;
-
- case ID3_FIELD_TYPE_STRINGLIST:
- field->stringlist.nstrings = 0;
- field->stringlist.strings = 0;
- break;
-
- case ID3_FIELD_TYPE_LANGUAGE:
- strcpy(field->immediate.value, "XXX");
- break;
-
- case ID3_FIELD_TYPE_FRAMEID:
- strcpy(field->immediate.value, "XXXX");
- break;
-
- case ID3_FIELD_TYPE_DATE:
- memset(field->immediate.value, 0, sizeof(field->immediate.value));
- break;
-
- case ID3_FIELD_TYPE_INT32PLUS:
- case ID3_FIELD_TYPE_BINARYDATA:
- field->binary.data = 0;
- field->binary.length = 0;
- break;
- }
+ assert(field);
+
+ switch (field->type = type) {
+ case ID3_FIELD_TYPE_TEXTENCODING:
+ case ID3_FIELD_TYPE_INT8:
+ case ID3_FIELD_TYPE_INT16:
+ case ID3_FIELD_TYPE_INT24:
+ case ID3_FIELD_TYPE_INT32:
+ field->number.value = 0;
+ break;
+
+ case ID3_FIELD_TYPE_LATIN1:
+ case ID3_FIELD_TYPE_LATIN1FULL:
+ field->latin1.ptr = 0;
+ break;
+
+ case ID3_FIELD_TYPE_LATIN1LIST:
+ field->latin1list.nstrings = 0;
+ field->latin1list.strings = 0;
+
+ case ID3_FIELD_TYPE_STRING:
+ case ID3_FIELD_TYPE_STRINGFULL:
+ field->string.ptr = 0;
+ break;
+
+ case ID3_FIELD_TYPE_STRINGLIST:
+ field->stringlist.nstrings = 0;
+ field->stringlist.strings = 0;
+ break;
+
+ case ID3_FIELD_TYPE_LANGUAGE:
+ strcpy(field->immediate.value, "XXX");
+ break;
+
+ case ID3_FIELD_TYPE_FRAMEID:
+ strcpy(field->immediate.value, "XXXX");
+ break;
+
+ case ID3_FIELD_TYPE_DATE:
+ memset(field->immediate.value, 0,
+ sizeof(field->immediate.value));
+ break;
+
+ case ID3_FIELD_TYPE_INT32PLUS:
+ case ID3_FIELD_TYPE_BINARYDATA:
+ field->binary.data = 0;
+ field->binary.length = 0;
+ break;
+ }
}
/*
- * NAME: field->finish()
- * DESCRIPTION: reset a field, deallocating memory if necessary
+ * NAME: field->finish()
+ * DESCRIPTION: reset a field, deallocating memory if necessary
*/
-void id3_field_finish(union id3_field *field)
+void
+id3_field_finish(union id3_field *field)
{
- unsigned int i;
-
- assert(field);
-
- switch (field->type) {
- case ID3_FIELD_TYPE_TEXTENCODING:
- case ID3_FIELD_TYPE_INT8:
- case ID3_FIELD_TYPE_INT16:
- case ID3_FIELD_TYPE_INT24:
- case ID3_FIELD_TYPE_INT32:
- case ID3_FIELD_TYPE_LANGUAGE:
- case ID3_FIELD_TYPE_FRAMEID:
- case ID3_FIELD_TYPE_DATE:
- break;
-
- case ID3_FIELD_TYPE_LATIN1:
- case ID3_FIELD_TYPE_LATIN1FULL:
- if (field->latin1.ptr)
- free(field->latin1.ptr);
- break;
-
- case ID3_FIELD_TYPE_LATIN1LIST:
- for (i = 0; i < field->latin1list.nstrings; ++i)
- free(field->latin1list.strings[i]);
-
- if (field->latin1list.strings)
- free(field->latin1list.strings);
- break;
-
- case ID3_FIELD_TYPE_STRING:
- case ID3_FIELD_TYPE_STRINGFULL:
- if (field->string.ptr)
- free(field->string.ptr);
- break;
-
- case ID3_FIELD_TYPE_STRINGLIST:
- for (i = 0; i < field->stringlist.nstrings; ++i)
- free(field->stringlist.strings[i]);
-
- if (field->stringlist.strings)
- free(field->stringlist.strings);
- break;
-
- case ID3_FIELD_TYPE_INT32PLUS:
- case ID3_FIELD_TYPE_BINARYDATA:
- if (field->binary.data)
- free(field->binary.data);
- break;
- }
-
- id3_field_init(field, field->type);
+ unsigned int i;
+
+ assert(field);
+
+ switch (field->type) {
+ case ID3_FIELD_TYPE_TEXTENCODING:
+ case ID3_FIELD_TYPE_INT8:
+ case ID3_FIELD_TYPE_INT16:
+ case ID3_FIELD_TYPE_INT24:
+ case ID3_FIELD_TYPE_INT32:
+ case ID3_FIELD_TYPE_LANGUAGE:
+ case ID3_FIELD_TYPE_FRAMEID:
+ case ID3_FIELD_TYPE_DATE:
+ break;
+
+ case ID3_FIELD_TYPE_LATIN1:
+ case ID3_FIELD_TYPE_LATIN1FULL:
+ if (field->latin1.ptr)
+ free(field->latin1.ptr);
+ break;
+
+ case ID3_FIELD_TYPE_LATIN1LIST:
+ for (i = 0; i < field->latin1list.nstrings; ++i)
+ free(field->latin1list.strings[i]);
+
+ if (field->latin1list.strings)
+ free(field->latin1list.strings);
+ break;
+
+ case ID3_FIELD_TYPE_STRING:
+ case ID3_FIELD_TYPE_STRINGFULL:
+ if (field->string.ptr)
+ free(field->string.ptr);
+ break;
+
+ case ID3_FIELD_TYPE_STRINGLIST:
+ for (i = 0; i < field->stringlist.nstrings; ++i)
+ free(field->stringlist.strings[i]);
+
+ if (field->stringlist.strings)
+ free(field->stringlist.strings);
+ break;
+
+ case ID3_FIELD_TYPE_INT32PLUS:
+ case ID3_FIELD_TYPE_BINARYDATA:
+ if (field->binary.data)
+ free(field->binary.data);
+ break;
+ }
+
+ id3_field_init(field, field->type);
}
/*
- * NAME: field->type()
- * DESCRIPTION: return the value type of a field
+ * NAME: field->type()
+ * DESCRIPTION: return the value type of a field
*/
-enum id3_field_type id3_field_type(union id3_field const *field)
+enum id3_field_type
+id3_field_type(union id3_field const *field)
{
- assert(field);
+ assert(field);
- return field->type;
+ return field->type;
}
/*
- * NAME: field->parse()
- * DESCRIPTION: parse a field value
+ * NAME: field->parse()
+ * DESCRIPTION: parse a field value
*/
-int id3_field_parse(union id3_field *field, id3_byte_t const **ptr,
- id3_length_t length, enum id3_field_textencoding *encoding)
+int
+id3_field_parse(union id3_field *field, id3_byte_t const **ptr,
+ id3_length_t length, enum id3_field_textencoding *encoding)
{
- assert(field);
-
- id3_field_finish(field);
-
- switch (field->type) {
- case ID3_FIELD_TYPE_INT32:
- if (length < 4)
- goto fail;
-
- field->number.value = id3_parse_uint(ptr, 4);
- break;
-
- case ID3_FIELD_TYPE_INT24:
- if (length < 3)
- goto fail;
-
- field->number.value = id3_parse_uint(ptr, 3);
- break;
-
- case ID3_FIELD_TYPE_INT16:
- if (length < 2)
- goto fail;
-
- field->number.value = id3_parse_uint(ptr, 2);
- break;
-
- case ID3_FIELD_TYPE_INT8:
- case ID3_FIELD_TYPE_TEXTENCODING:
- if (length < 1)
- goto fail;
-
- field->number.value = id3_parse_uint(ptr, 1);
-
- if (field->type == ID3_FIELD_TYPE_TEXTENCODING)
- *encoding = field->number.value;
- break;
-
- case ID3_FIELD_TYPE_LANGUAGE:
- if (length < 3)
- goto fail;
-
- id3_parse_immediate(ptr, 3, field->immediate.value);
- break;
-
- case ID3_FIELD_TYPE_FRAMEID:
- if (length < 4)
- goto fail;
-
- id3_parse_immediate(ptr, 4, field->immediate.value);
- break;
-
- case ID3_FIELD_TYPE_DATE:
- if (length < 8)
- goto fail;
-
- id3_parse_immediate(ptr, 8, field->immediate.value);
- break;
-
- case ID3_FIELD_TYPE_LATIN1:
- case ID3_FIELD_TYPE_LATIN1FULL:
- {
- id3_latin1_t *latin1;
-
- latin1 = id3_parse_latin1(ptr, length,
- field->type == ID3_FIELD_TYPE_LATIN1FULL);
- if (latin1 == 0)
- goto fail;
-
- field->latin1.ptr = latin1;
- }
- break;
-
- case ID3_FIELD_TYPE_LATIN1LIST:
- {
- id3_byte_t const *end;
- id3_latin1_t *latin1, **strings;
-
- end = *ptr + length;
-
- while (end - *ptr > 0) {
- latin1 = id3_parse_latin1(ptr, end - *ptr, 0);
- if (latin1 == 0)
- goto fail;
-
- strings = realloc(field->latin1list.strings,
- (field->latin1list.nstrings + 1) * sizeof(*strings));
- if (strings == 0) {
- free(latin1);
- goto fail;
+ assert(field);
+
+ id3_field_finish(field);
+
+ switch (field->type) {
+ case ID3_FIELD_TYPE_INT32:
+ if (length < 4)
+ goto fail;
+
+ field->number.value = id3_parse_uint(ptr, 4);
+ break;
+
+ case ID3_FIELD_TYPE_INT24:
+ if (length < 3)
+ goto fail;
+
+ field->number.value = id3_parse_uint(ptr, 3);
+ break;
+
+ case ID3_FIELD_TYPE_INT16:
+ if (length < 2)
+ goto fail;
+
+ field->number.value = id3_parse_uint(ptr, 2);
+ break;
+
+ case ID3_FIELD_TYPE_INT8:
+ case ID3_FIELD_TYPE_TEXTENCODING:
+ if (length < 1)
+ goto fail;
+
+ field->number.value = id3_parse_uint(ptr, 1);
+
+ if (field->type == ID3_FIELD_TYPE_TEXTENCODING)
+ *encoding = field->number.value;
+ break;
+
+ case ID3_FIELD_TYPE_LANGUAGE:
+ if (length < 3)
+ goto fail;
+
+ id3_parse_immediate(ptr, 3, field->immediate.value);
+ break;
+
+ case ID3_FIELD_TYPE_FRAMEID:
+ if (length < 4)
+ goto fail;
+
+ id3_parse_immediate(ptr, 4, field->immediate.value);
+ break;
+
+ case ID3_FIELD_TYPE_DATE:
+ if (length < 8)
+ goto fail;
+
+ id3_parse_immediate(ptr, 8, field->immediate.value);
+ break;
+
+ case ID3_FIELD_TYPE_LATIN1:
+ case ID3_FIELD_TYPE_LATIN1FULL:
+ {
+ id3_latin1_t *latin1;
+
+ latin1 = id3_parse_latin1(ptr, length,
+ field->type ==
+ ID3_FIELD_TYPE_LATIN1FULL);
+ if (latin1 == 0)
+ goto fail;
+
+ field->latin1.ptr = latin1;
+ }
+ break;
+
+ case ID3_FIELD_TYPE_LATIN1LIST:
+ {
+ id3_byte_t const *end;
+ id3_latin1_t *latin1,
+ **strings;
+
+ end = *ptr + length;
+
+ while (end - *ptr > 0) {
+ latin1 =
+ id3_parse_latin1(ptr, end - *ptr, 0);
+ if (latin1 == 0)
+ goto fail;
+
+ strings =
+ realloc(field->latin1list.strings,
+ (field->latin1list.nstrings +
+ 1) * sizeof(*strings));
+ if (strings == 0) {
+ free(latin1);
+ goto fail;
+ }
+
+ field->latin1list.strings = strings;
+ field->latin1list.strings
+ [field->latin1list.nstrings++] = latin1;
+ }
+ }
+ break;
+
+ case ID3_FIELD_TYPE_STRING:
+ case ID3_FIELD_TYPE_STRINGFULL:
+ {
+ id3_ucs4_t *ucs4;
+
+ ucs4 = id3_parse_string(ptr, length, *encoding,
+ field->type ==
+ ID3_FIELD_TYPE_STRINGFULL);
+ if (ucs4 == 0)
+ goto fail;
+
+ field->string.ptr = ucs4;
+ }
+ break;
+
+ case ID3_FIELD_TYPE_STRINGLIST:
+ {
+ id3_byte_t const *end;
+ id3_ucs4_t *ucs4,
+ **strings;
+
+ end = *ptr + length;
+
+ while (end - *ptr > 0) {
+ ucs4 =
+ id3_parse_string(ptr, end - *ptr,
+ *encoding, 0);
+ if (ucs4 == 0)
+ goto fail;
+
+ strings =
+ realloc(field->stringlist.strings,
+ (field->stringlist.nstrings +
+ 1) * sizeof(*strings));
+ if (strings == 0) {
+ free(ucs4);
+ goto fail;
+ }
+
+ field->stringlist.strings = strings;
+ field->stringlist.strings
+ [field->stringlist.nstrings++] = ucs4;
+ }
+ }
+ break;
+
+ case ID3_FIELD_TYPE_INT32PLUS:
+ case ID3_FIELD_TYPE_BINARYDATA:
+ {
+ id3_byte_t *data;
+
+ data = id3_parse_binary(ptr, length);
+ if (data == 0)
+ goto fail;
+
+ field->binary.data = data;
+ field->binary.length = length;
+ }
+ break;
}
- field->latin1list.strings = strings;
- field->latin1list.strings[field->latin1list.nstrings++] = latin1;
- }
- }
- break;
-
- case ID3_FIELD_TYPE_STRING:
- case ID3_FIELD_TYPE_STRINGFULL:
- {
- id3_ucs4_t *ucs4;
-
- ucs4 = id3_parse_string(ptr, length, *encoding,
- field->type == ID3_FIELD_TYPE_STRINGFULL);
- if (ucs4 == 0)
- goto fail;
-
- field->string.ptr = ucs4;
- }
- break;
-
- case ID3_FIELD_TYPE_STRINGLIST:
- {
- id3_byte_t const *end;
- id3_ucs4_t *ucs4, **strings;
-
- end = *ptr + length;
+ return 0;
- while (end - *ptr > 0) {
- ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0);
- if (ucs4 == 0)
- goto fail;
-
- strings = realloc(field->stringlist.strings,
- (field->stringlist.nstrings + 1) * sizeof(*strings));
- if (strings == 0) {
- free(ucs4);
- goto fail;
- }
-
- field->stringlist.strings = strings;
- field->stringlist.strings[field->stringlist.nstrings++] = ucs4;
- }
- }
- break;
-
- case ID3_FIELD_TYPE_INT32PLUS:
- case ID3_FIELD_TYPE_BINARYDATA:
- {
- id3_byte_t *data;
-
- data = id3_parse_binary(ptr, length);
- if (data == 0)
- goto fail;
-
- field->binary.data = data;
- field->binary.length = length;
- }
- break;
- }
-
- return 0;
-
- fail:
- return -1;
+ fail:
+ return -1;
}
/*
- * NAME: field->render()
- * DESCRIPTION: render a field value
+ * NAME: field->render()
+ * DESCRIPTION: render a field value
*/
-id3_length_t id3_field_render(union id3_field const *field, id3_byte_t **ptr,
- enum id3_field_textencoding *encoding,
- int terminate)
+id3_length_t
+id3_field_render(union id3_field const *field,
+ id3_byte_t ** ptr,
+ enum id3_field_textencoding * encoding, int terminate)
{
- id3_length_t size;
- unsigned int i;
-
- assert(field && encoding);
-
- switch (field->type) {
- case ID3_FIELD_TYPE_INT32:
- return id3_render_int(ptr, field->number.value, 4);
-
- case ID3_FIELD_TYPE_INT24:
- return id3_render_int(ptr, field->number.value, 3);
-
- case ID3_FIELD_TYPE_INT16:
- return id3_render_int(ptr, field->number.value, 2);
-
- case ID3_FIELD_TYPE_TEXTENCODING:
- *encoding = field->number.value;
- case ID3_FIELD_TYPE_INT8:
- return id3_render_int(ptr, field->number.value, 1);
-
- case ID3_FIELD_TYPE_LATIN1:
- case ID3_FIELD_TYPE_LATIN1FULL:
- return id3_render_latin1(ptr, field->latin1.ptr, terminate);
-
- case ID3_FIELD_TYPE_LATIN1LIST:
- size = 0;
- for (i = 0; i < field->latin1list.nstrings; ++i) {
- size += id3_render_latin1(ptr, field->latin1list.strings[i],
- (i < field->latin1list.nstrings - 1) ||
- terminate);
- }
- return size;
-
- case ID3_FIELD_TYPE_STRING:
- case ID3_FIELD_TYPE_STRINGFULL:
- return id3_render_string(ptr, field->string.ptr, *encoding, terminate);
-
- case ID3_FIELD_TYPE_STRINGLIST:
- size = 0;
- for (i = 0; i < field->stringlist.nstrings; ++i) {
- size += id3_render_string(ptr, field->stringlist.strings[i], *encoding,
- (i < field->stringlist.nstrings - 1) ||
- terminate);
- }
- return size;
-
- case ID3_FIELD_TYPE_LANGUAGE:
- return id3_render_immediate(ptr, field->immediate.value, 3);
-
- case ID3_FIELD_TYPE_FRAMEID:
- return id3_render_immediate(ptr, field->immediate.value, 4);
-
- case ID3_FIELD_TYPE_DATE:
- return id3_render_immediate(ptr, field->immediate.value, 8);
-
- case ID3_FIELD_TYPE_INT32PLUS:
- case ID3_FIELD_TYPE_BINARYDATA:
- return id3_render_binary(ptr, field->binary.data, field->binary.length);
- }
-
- return 0;
+ id3_length_t size;
+ unsigned int i;
+
+ assert(field && encoding);
+
+ switch (field->type) {
+ case ID3_FIELD_TYPE_INT32:
+ return id3_render_int(ptr, field->number.value, 4);
+
+ case ID3_FIELD_TYPE_INT24:
+ return id3_render_int(ptr, field->number.value, 3);
+
+ case ID3_FIELD_TYPE_INT16:
+ return id3_render_int(ptr, field->number.value, 2);
+
+ case ID3_FIELD_TYPE_TEXTENCODING:
+ *encoding = field->number.value;
+ case ID3_FIELD_TYPE_INT8:
+ return id3_render_int(ptr, field->number.value, 1);
+
+ case ID3_FIELD_TYPE_LATIN1:
+ case ID3_FIELD_TYPE_LATIN1FULL:
+ return id3_render_latin1(ptr, field->latin1.ptr,
+ terminate);
+
+ case ID3_FIELD_TYPE_LATIN1LIST:
+ size = 0;
+ for (i = 0; i < field->latin1list.nstrings; ++i) {
+ size +=
+ id3_render_latin1(ptr,
+ field->latin1list.strings[i],
+ (i <
+ field->latin1list.nstrings -
+ 1)
+ || terminate);
+ }
+ return size;
+
+ case ID3_FIELD_TYPE_STRING:
+ case ID3_FIELD_TYPE_STRINGFULL:
+ return id3_render_string(ptr, field->string.ptr, *encoding,
+ terminate);
+
+ case ID3_FIELD_TYPE_STRINGLIST:
+ size = 0;
+ for (i = 0; i < field->stringlist.nstrings; ++i) {
+ size +=
+ id3_render_string(ptr,
+ field->stringlist.strings[i],
+ *encoding,
+ (i <
+ field->stringlist.nstrings -
+ 1)
+ || terminate);
+ }
+ return size;
+
+ case ID3_FIELD_TYPE_LANGUAGE:
+ return id3_render_immediate(ptr, field->immediate.value,
+ 3);
+
+ case ID3_FIELD_TYPE_FRAMEID:
+ return id3_render_immediate(ptr, field->immediate.value,
+ 4);
+
+ case ID3_FIELD_TYPE_DATE:
+ return id3_render_immediate(ptr, field->immediate.value,
+ 8);
+
+ case ID3_FIELD_TYPE_INT32PLUS:
+ case ID3_FIELD_TYPE_BINARYDATA:
+ return id3_render_binary(ptr, field->binary.data,
+ field->binary.length);
+ }
+
+ return 0;
}
/*
- * NAME: field->setint()
- * DESCRIPTION: set the value of an int field
+ * NAME: field->setint()
+ * DESCRIPTION: set the value of an int field
*/
-int id3_field_setint(union id3_field *field, signed long number)
+int
+id3_field_setint(union id3_field *field, signed long number)
{
- assert(field);
-
- switch (field->type) {
- case ID3_FIELD_TYPE_INT8:
- if (number > 0x7f || number < -0x80)
- return -1;
- break;
-
- case ID3_FIELD_TYPE_INT16:
- if (number > 0x7fff || number < -0x8000)
- return -1;
- break;
-
- case ID3_FIELD_TYPE_INT24:
- if (number > 0x7fffffL || number < -0x800000L)
- return -1;
- break;
-
- case ID3_FIELD_TYPE_INT32:
- if (number > 0x7fffffffL || number < -0x80000000L)
- return -1;
- break;
-
- default:
- return -1;
- }
+ assert(field);
+
+ switch (field->type) {
+ case ID3_FIELD_TYPE_INT8:
+ if (number > 0x7f || number < -0x80)
+ return -1;
+ break;
+
+ case ID3_FIELD_TYPE_INT16:
+ if (number > 0x7fff || number < -0x8000)
+ return -1;
+ break;
+
+ case ID3_FIELD_TYPE_INT24:
+ if (number > 0x7fffffL || number < -0x800000L)
+ return -1;
+ break;
+
+ case ID3_FIELD_TYPE_INT32:
+ if (number > 0x7fffffffL || number < -0x80000000L)
+ return -1;
+ break;
+
+ default:
+ return -1;
+ }
- id3_field_finish(field);
+ id3_field_finish(field);
- field->number.value = number;
+ field->number.value = number;
- return 0;
+ return 0;
}
/*
- * NAME: field->settextencoding()
- * DESCRIPTION: set the value of a textencoding field
+ * NAME: field->settextencoding()
+ * DESCRIPTION: set the value of a textencoding field
*/
-int id3_field_settextencoding(union id3_field *field,
- enum id3_field_textencoding encoding)
+int
+id3_field_settextencoding(union id3_field *field,
+ enum id3_field_textencoding encoding)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_TEXTENCODING)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_TEXTENCODING)
+ return -1;
- id3_field_finish(field);
+ id3_field_finish(field);
- field->number.value = encoding;
+ field->number.value = encoding;
- return 0;
+ return 0;
}
-static
-int set_latin1(union id3_field *field, id3_latin1_t const *latin1)
+static int
+set_latin1(union id3_field *field, id3_latin1_t const *latin1)
{
- id3_latin1_t *data;
-
- if (latin1 == 0 || *latin1 == 0)
- data = 0;
- else {
- data = id3_latin1_duplicate(latin1);
- if (data == 0)
- return -1;
- }
+ id3_latin1_t *data;
+
+ if (latin1 == 0 || *latin1 == 0)
+ data = 0;
+ else {
+ data = id3_latin1_duplicate(latin1);
+ if (data == 0)
+ return -1;
+ }
- field->latin1.ptr = data;
+ field->latin1.ptr = data;
- return 0;
+ return 0;
}
/*
- * NAME: field->setlatin1()
- * DESCRIPTION: set the value of a latin1 field
+ * NAME: field->setlatin1()
+ * DESCRIPTION: set the value of a latin1 field
*/
-int id3_field_setlatin1(union id3_field *field, id3_latin1_t const *latin1)
+int
+id3_field_setlatin1(union id3_field *field, id3_latin1_t const *latin1)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_LATIN1)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_LATIN1)
+ return -1;
- id3_field_finish(field);
+ id3_field_finish(field);
- if (latin1) {
- id3_latin1_t const *ptr;
+ if (latin1) {
+ id3_latin1_t const *ptr;
- for (ptr = latin1; *ptr; ++ptr) {
- if (*ptr == '\n')
- return -1;
- }
- }
+ for (ptr = latin1; *ptr; ++ptr) {
+ if (*ptr == '\n')
+ return -1;
+ }
+ }
- return set_latin1(field, latin1);
+ return set_latin1(field, latin1);
}
/*
- * NAME: field->setfulllatin1()
- * DESCRIPTION: set the value of a full latin1 field
+ * NAME: field->setfulllatin1()
+ * DESCRIPTION: set the value of a full latin1 field
*/
-int id3_field_setfulllatin1(union id3_field *field, id3_latin1_t const *latin1)
+int
+id3_field_setfulllatin1(union id3_field *field, id3_latin1_t const *latin1)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_LATIN1FULL)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_LATIN1FULL)
+ return -1;
- id3_field_finish(field);
+ id3_field_finish(field);
- return set_latin1(field, latin1);
+ return set_latin1(field, latin1);
}
-static
-int set_string(union id3_field *field, id3_ucs4_t const *string)
+static int
+set_string(union id3_field *field, id3_ucs4_t const *string)
{
- id3_ucs4_t *data;
-
- if (string == 0 || *string == 0)
- data = 0;
- else {
- data = id3_ucs4_duplicate(string);
- if (data == 0)
- return -1;
- }
+ id3_ucs4_t *data;
+
+ if (string == 0 || *string == 0)
+ data = 0;
+ else {
+ data = id3_ucs4_duplicate(string);
+ if (data == 0)
+ return -1;
+ }
- field->string.ptr = data;
+ field->string.ptr = data;
- return 0;
+ return 0;
}
/*
- * NAME: field->setstring()
- * DESCRIPTION: set the value of a string field
+ * NAME: field->setstring()
+ * DESCRIPTION: set the value of a string field
*/
-int id3_field_setstring(union id3_field *field, id3_ucs4_t const *string)
+int
+id3_field_setstring(union id3_field *field, id3_ucs4_t const *string)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_STRING)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_STRING)
+ return -1;
- id3_field_finish(field);
+ id3_field_finish(field);
- if (string) {
- id3_ucs4_t const *ptr;
+ if (string) {
+ id3_ucs4_t const *ptr;
- for (ptr = string; *ptr; ++ptr) {
- if (*ptr == '\n')
- return -1;
- }
- }
+ for (ptr = string; *ptr; ++ptr) {
+ if (*ptr == '\n')
+ return -1;
+ }
+ }
- return set_string(field, string);
+ return set_string(field, string);
}
/*
- * NAME: field->setfullstring()
- * DESCRIPTION: set the value of a full string field
+ * NAME: field->setfullstring()
+ * DESCRIPTION: set the value of a full string field
*/
-int id3_field_setfullstring(union id3_field *field, id3_ucs4_t const *string)
+int
+id3_field_setfullstring(union id3_field *field, id3_ucs4_t const *string)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_STRINGFULL)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_STRINGFULL)
+ return -1;
- id3_field_finish(field);
+ id3_field_finish(field);
- return set_string(field, string);
+ return set_string(field, string);
}
/*
- * NAME: field->setstrings()
- * DESCRIPTION: set the value of a stringlist field
+ * NAME: field->setstrings()
+ * DESCRIPTION: set the value of a stringlist field
*/
-int id3_field_setstrings(union id3_field *field,
- unsigned int length, id3_ucs4_t **ptrs)
+int
+id3_field_setstrings(union id3_field *field,
+ unsigned int length, id3_ucs4_t ** ptrs)
{
- id3_ucs4_t **strings;
- unsigned int i;
+ id3_ucs4_t **strings;
+ unsigned int i;
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_STRINGLIST)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_STRINGLIST)
+ return -1;
- id3_field_finish(field);
+ id3_field_finish(field);
- if (length == 0)
- return 0;
+ if (length == 0)
+ return 0;
- strings = malloc(length * sizeof(*strings));
- if (strings == 0)
- return -1;
+ strings = malloc(length * sizeof(*strings));
+ if (strings == 0)
+ return -1;
- for (i = 0; i < length; ++i) {
- strings[i] = id3_ucs4_duplicate(ptrs[i]);
- if (strings[i] == 0) {
- while (i--)
- free(strings[i]);
+ for (i = 0; i < length; ++i) {
+ strings[i] = id3_ucs4_duplicate(ptrs[i]);
+ if (strings[i] == 0) {
+ while (i--)
+ free(strings[i]);
- free(strings);
- return -1;
- }
- }
+ free(strings);
+ return -1;
+ }
+ }
- field->stringlist.strings = strings;
- field->stringlist.nstrings = length;
+ field->stringlist.strings = strings;
+ field->stringlist.nstrings = length;
- return 0;
+ return 0;
}
/*
- * NAME: field->addstring()
- * DESCRIPTION: add a string to a stringlist field
+ * NAME: field->addstring()
+ * DESCRIPTION: add a string to a stringlist field
*/
-int id3_field_addstring(union id3_field *field, id3_ucs4_t const *string)
+int
+id3_field_addstring(union id3_field *field, id3_ucs4_t const *string)
{
- id3_ucs4_t *new, **strings;
+ id3_ucs4_t *new,
+ **strings;
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_STRINGLIST)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_STRINGLIST)
+ return -1;
- if (string == 0)
- string = id3_ucs4_empty;
+ if (string == 0)
+ string = id3_ucs4_empty;
- new = id3_ucs4_duplicate(string);
- if (new == 0)
- return -1;
+ new = id3_ucs4_duplicate(string);
+ if (new == 0)
+ return -1;
- strings = realloc(field->stringlist.strings,
- (field->stringlist.nstrings + 1) * sizeof(*strings));
- if (strings == 0) {
- free(new);
- return -1;
- }
+ strings = realloc(field->stringlist.strings,
+ (field->stringlist.nstrings +
+ 1) * sizeof(*strings));
+ if (strings == 0) {
+ free(new);
+ return -1;
+ }
- field->stringlist.strings = strings;
- field->stringlist.strings[field->stringlist.nstrings++] = new;
+ field->stringlist.strings = strings;
+ field->stringlist.strings[field->stringlist.nstrings++] = new;
- return 0;
+ return 0;
}
/*
- * NAME: field->setlanguage()
- * DESCRIPTION: set the value of a language field
+ * NAME: field->setlanguage()
+ * DESCRIPTION: set the value of a language field
*/
-int id3_field_setlanguage(union id3_field *field, char const *language)
+int
+id3_field_setlanguage(union id3_field *field, char const *language)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_LANGUAGE)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_LANGUAGE)
+ return -1;
- id3_field_finish(field);
+ id3_field_finish(field);
- if (language) {
- if (strlen(language) != 3)
- return -1;
+ if (language) {
+ if (strlen(language) != 3)
+ return -1;
- strcpy(field->immediate.value, language);
- }
+ strcpy(field->immediate.value, language);
+ }
- return 0;
+ return 0;
}
/*
- * NAME: field->setframeid()
- * DESCRIPTION: set the value of a frameid field
+ * NAME: field->setframeid()
+ * DESCRIPTION: set the value of a frameid field
*/
-int id3_field_setframeid(union id3_field *field, char const *id)
+int
+id3_field_setframeid(union id3_field *field, char const *id)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_FRAMEID ||
- !id3_frame_validid(id))
- return -1;
+ if (field->type != ID3_FIELD_TYPE_FRAMEID
+ || !id3_frame_validid(id))
+ return -1;
- id3_field_finish(field);
+ id3_field_finish(field);
- field->immediate.value[0] = id[0];
- field->immediate.value[1] = id[1];
- field->immediate.value[2] = id[2];
- field->immediate.value[3] = id[3];
- field->immediate.value[4] = 0;
+ field->immediate.value[0] = id[0];
+ field->immediate.value[1] = id[1];
+ field->immediate.value[2] = id[2];
+ field->immediate.value[3] = id[3];
+ field->immediate.value[4] = 0;
- return 0;
+ return 0;
}
/*
- * NAME: field->setbinarydata()
- * DESCRIPTION: set the value of a binarydata field
+ * NAME: field->setbinarydata()
+ * DESCRIPTION: set the value of a binarydata field
*/
-int id3_field_setbinarydata(union id3_field *field,
- id3_byte_t const *data, id3_length_t length)
+int
+id3_field_setbinarydata(union id3_field *field,
+ id3_byte_t const *data, id3_length_t length)
{
- id3_byte_t *mem;
+ id3_byte_t *mem;
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_BINARYDATA)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_BINARYDATA)
+ return -1;
- id3_field_finish(field);
+ id3_field_finish(field);
- if (length == 0)
- mem = 0;
- else {
- mem = malloc(length);
- if (mem == 0)
- return -1;
+ if (length == 0)
+ mem = 0;
+ else {
+ mem = malloc(length);
+ if (mem == 0)
+ return -1;
- assert(data);
+ assert(data);
- memcpy(mem, data, length);
- }
+ memcpy(mem, data, length);
+ }
- field->binary.data = mem;
- field->binary.length = length;
+ field->binary.data = mem;
+ field->binary.length = length;
- return 0;
+ return 0;
}
/*
- * NAME: field->getint()
- * DESCRIPTION: return the value of an integer field
+ * NAME: field->getint()
+ * DESCRIPTION: return the value of an integer field
*/
-signed long id3_field_getint(union id3_field const *field)
+signed long
+id3_field_getint(union id3_field const *field)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_INT8 &&
- field->type != ID3_FIELD_TYPE_INT16 &&
- field->type != ID3_FIELD_TYPE_INT24 &&
- field->type != ID3_FIELD_TYPE_INT32)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_INT8 &&
+ field->type != ID3_FIELD_TYPE_INT16 &&
+ field->type != ID3_FIELD_TYPE_INT24 &&
+ field->type != ID3_FIELD_TYPE_INT32)
+ return -1;
- return field->number.value;
+ return field->number.value;
}
/*
- * NAME: field->gettextencoding()
- * DESCRIPTION: return the value of a text encoding field
+ * NAME: field->gettextencoding()
+ * DESCRIPTION: return the value of a text encoding field
*/
enum id3_field_textencoding
id3_field_gettextencoding(union id3_field const *field)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_TEXTENCODING)
- return -1;
+ if (field->type != ID3_FIELD_TYPE_TEXTENCODING)
+ return -1;
- return field->number.value;
+ return field->number.value;
}
/*
- * NAME: field->getlatin1()
- * DESCRIPTION: return the value of a latin1 field
+ * NAME: field->getlatin1()
+ * DESCRIPTION: return the value of a latin1 field
*/
-id3_latin1_t const *id3_field_getlatin1(union id3_field const *field)
+id3_latin1_t const *
+id3_field_getlatin1(union id3_field const *field)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_LATIN1)
- return 0;
+ if (field->type != ID3_FIELD_TYPE_LATIN1)
+ return 0;
- return field->latin1.ptr ? field->latin1.ptr : (id3_latin1_t const *) "";
+ return field->latin1.ptr ? field->latin1.
+ ptr : (id3_latin1_t const *) "";
}
/*
- * NAME: field->getfulllatin1()
- * DESCRIPTION: return the value of a full latin1 field
+ * NAME: field->getfulllatin1()
+ * DESCRIPTION: return the value of a full latin1 field
*/
-id3_latin1_t const *id3_field_getfulllatin1(union id3_field const *field)
+id3_latin1_t const *
+id3_field_getfulllatin1(union id3_field const *field)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_LATIN1FULL)
- return 0;
+ if (field->type != ID3_FIELD_TYPE_LATIN1FULL)
+ return 0;
- return field->latin1.ptr ? field->latin1.ptr : (id3_latin1_t const *) "";
+ return field->latin1.ptr ? field->latin1.
+ ptr : (id3_latin1_t const *) "";
}
/*
- * NAME: field->getstring()
- * DESCRIPTION: return the value of a string field
+ * NAME: field->getstring()
+ * DESCRIPTION: return the value of a string field
*/
-id3_ucs4_t const *id3_field_getstring(union id3_field const *field)
+id3_ucs4_t const *
+id3_field_getstring(union id3_field const *field)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_STRING)
- return 0;
+ if (field->type != ID3_FIELD_TYPE_STRING)
+ return 0;
- return field->string.ptr ? field->string.ptr : id3_ucs4_empty;
+ return field->string.ptr ? field->string.ptr : id3_ucs4_empty;
}
/*
- * NAME: field->getfullstring()
- * DESCRIPTION: return the value of a fullstring field
+ * NAME: field->getfullstring()
+ * DESCRIPTION: return the value of a fullstring field
*/
-id3_ucs4_t const *id3_field_getfullstring(union id3_field const *field)
+id3_ucs4_t const *
+id3_field_getfullstring(union id3_field const *field)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_STRINGFULL)
- return 0;
+ if (field->type != ID3_FIELD_TYPE_STRINGFULL)
+ return 0;
- return field->string.ptr ? field->string.ptr : id3_ucs4_empty;
+ return field->string.ptr ? field->string.ptr : id3_ucs4_empty;
}
/*
- * NAME: field->getnstrings()
- * DESCRIPTION: return the number of strings in a stringlist field
+ * NAME: field->getnstrings()
+ * DESCRIPTION: return the number of strings in a stringlist field
*/
-unsigned int id3_field_getnstrings(union id3_field const *field)
+unsigned int
+id3_field_getnstrings(union id3_field const *field)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_STRINGLIST)
- return 0;
+ if (field->type != ID3_FIELD_TYPE_STRINGLIST)
+ return 0;
- return field->stringlist.nstrings;
+ return field->stringlist.nstrings;
}
/*
- * NAME: field->getstrings()
- * DESCRIPTION: return one value of a stringlist field
+ * NAME: field->getstrings()
+ * DESCRIPTION: return one value of a stringlist field
*/
-id3_ucs4_t const *id3_field_getstrings(union id3_field const *field,
- unsigned int index)
+id3_ucs4_t const *
+id3_field_getstrings(union id3_field const *field, unsigned int index)
{
- id3_ucs4_t const *string;
+ id3_ucs4_t const *string;
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_STRINGLIST ||
- index >= field->stringlist.nstrings)
- return 0;
+ if (field->type != ID3_FIELD_TYPE_STRINGLIST ||
+ index >= field->stringlist.nstrings)
+ return 0;
- string = field->stringlist.strings[index];
+ string = field->stringlist.strings[index];
- return string ? string : id3_ucs4_empty;
+ return string ? string : id3_ucs4_empty;
}
/*
- * NAME: field->getframeid()
- * DESCRIPTION: return the value of a frameid field
+ * NAME: field->getframeid()
+ * DESCRIPTION: return the value of a frameid field
*/
-char const *id3_field_getframeid(union id3_field const *field)
+char const *
+id3_field_getframeid(union id3_field const *field)
{
- assert(field);
+ assert(field);
- if (field->type != ID3_FIELD_TYPE_FRAMEID)
- return 0;
+ if (field->type != ID3_FIELD_TYPE_FRAMEID)
+ return 0;
- return field->immediate.value;
+ return field->immediate.value;
}
/*
- * NAME: field->getbinarydata()
- * DESCRIPTION: return the value of a binarydata field
+ * NAME: field->getbinarydata()
+ * DESCRIPTION: return the value of a binarydata field
*/
-id3_byte_t const *id3_field_getbinarydata(union id3_field const *field,
- id3_length_t *length)
+id3_byte_t const *
+id3_field_getbinarydata(union id3_field const *field,
+ id3_length_t * length)
{
- static id3_byte_t const empty;
+ static id3_byte_t const empty;
- assert(field && length);
+ assert(field && length);
- if (field->type != ID3_FIELD_TYPE_BINARYDATA)
- return 0;
+ if (field->type != ID3_FIELD_TYPE_BINARYDATA)
+ return 0;
- assert(field->binary.length == 0 || field->binary.data);
+ assert(field->binary.length == 0 || field->binary.data);
- *length = field->binary.length;
+ *length = field->binary.length;
- return field->binary.data ? field->binary.data : &empty;
+ return field->binary.data ? field->binary.data : &empty;
}
diff --git a/libid3tag/field.h b/libid3tag/field.h
index 2cf42b9..4d1d84c 100644
--- a/libid3tag/field.h
+++ b/libid3tag/field.h
@@ -19,7 +19,7 @@
* $Id: field.h,v 1.9 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_FIELD_H
+#ifndef LIBID3TAG_FIELD_H
# define LIBID3TAG_FIELD_H
# include "id3tag.h"
@@ -33,4 +33,4 @@ int id3_field_parse(union id3_field *, id3_byte_t const **,
id3_length_t id3_field_render(union id3_field const *, id3_byte_t **,
enum id3_field_textencoding *, int);
-# endif
+#endif
diff --git a/libid3tag/file.c b/libid3tag/file.c
index dcd5a7c..8c1aa54 100644
--- a/libid3tag/file.c
+++ b/libid3tag/file.c
@@ -19,566 +19,614 @@
* $Id: file.c,v 1.21 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
-# ifdef HAVE_UNISTD_H
-# include <unistd.h>
-# endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
-# ifdef HAVE_ASSERT_H
-# include <assert.h>
-# endif
+#ifdef HAVE_ASSERT_H
+# include <assert.h>
+#endif
-# include "id3tag.h"
-# include "file.h"
-# include "tag.h"
-# include "field.h"
+#include "id3tag.h"
+#include "file.h"
+#include "tag.h"
+#include "field.h"
struct filetag {
- struct id3_tag *tag;
- unsigned long location;
- id3_length_t length;
+ struct id3_tag *tag;
+ unsigned long location;
+ id3_length_t length;
};
struct id3_file {
- FILE *iofile;
- enum id3_file_mode mode;
- char *path;
+ FILE *iofile;
+ enum id3_file_mode mode;
+ char *path;
- int flags;
+ int flags;
- struct id3_tag *primary;
+ struct id3_tag *primary;
- unsigned int ntags;
- struct filetag *tags;
+ unsigned int ntags;
+ struct filetag *tags;
};
enum {
- ID3_FILE_FLAG_ID3V1 = 0x0001
+ ID3_FILE_FLAG_ID3V1 = 0x0001
};
/*
- * NAME: query_tag()
- * DESCRIPTION: check for a tag at a file's current position
+ * NAME: query_tag()
+ * DESCRIPTION: check for a tag at a file's current position
*/
-static
-signed long query_tag(FILE *iofile)
+static signed long
+query_tag(FILE * iofile)
{
- fpos_t save_position;
- id3_byte_t query[ID3_TAG_QUERYSIZE];
- signed long size;
+ fpos_t save_position;
+ id3_byte_t query[ID3_TAG_QUERYSIZE];
+ signed long size;
- if (fgetpos(iofile, &save_position) == -1)
- return 0;
+ if (fgetpos(iofile, &save_position) == -1)
+ return 0;
- size = id3_tag_query(query, fread(query, 1, sizeof(query), iofile));
+ size =
+ id3_tag_query(query, fread(query, 1, sizeof(query), iofile));
- if (fsetpos(iofile, &save_position) == -1)
- return 0;
+ if (fsetpos(iofile, &save_position) == -1)
+ return 0;
- return size;
+ return size;
}
/*
- * NAME: read_tag()
- * DESCRIPTION: read and parse a tag at a file's current position
+ * NAME: read_tag()
+ * DESCRIPTION: read and parse a tag at a file's current position
*/
-static
-struct id3_tag *read_tag(FILE *iofile, id3_length_t size)
+static struct id3_tag *
+read_tag(FILE * iofile, id3_length_t size)
{
- id3_byte_t *data;
- struct id3_tag *tag = 0;
+ id3_byte_t *data;
+ struct id3_tag *tag = 0;
- data = malloc(size);
- if (data) {
- if (fread(data, size, 1, iofile) == 1)
- tag = id3_tag_parse(data, size);
+ data = malloc(size);
+ if (data) {
+ if (fread(data, size, 1, iofile) == 1)
+ tag = id3_tag_parse(data, size);
- free(data);
- }
+ free(data);
+ }
- return tag;
+ return tag;
}
/*
- * NAME: update_primary()
- * DESCRIPTION: update the primary tag with data from a new tag
+ * NAME: update_primary()
+ * DESCRIPTION: update the primary tag with data from a new tag
*/
-static
-int update_primary(struct id3_tag *tag, struct id3_tag const *new)
+static int
+update_primary(struct id3_tag *tag, struct id3_tag const *new)
{
- unsigned int i;
- struct id3_frame *frame;
-
- if (new) {
- if (!(new->extendedflags & ID3_TAG_EXTENDEDFLAG_TAGISANUPDATE))
- id3_tag_clearframes(tag);
-
- i = 0;
- while ((frame = id3_tag_findframe(new, 0, i++))) {
- if (id3_tag_attachframe(tag, frame) == -1)
- return -1;
- }
- }
+ unsigned int i;
+ struct id3_frame *frame;
+
+ if (new) {
+ if (!
+ (new->extendedflags & ID3_TAG_EXTENDEDFLAG_TAGISANUPDATE))
+ id3_tag_clearframes(tag);
+
+ i = 0;
+ while ((frame = id3_tag_findframe(new, 0, i++))) {
+ if (id3_tag_attachframe(tag, frame) == -1)
+ return -1;
+ }
+ }
- return 0;
+ return 0;
}
/*
- * NAME: tag_compare()
- * DESCRIPTION: tag sort function for qsort()
+ * NAME: tag_compare()
+ * DESCRIPTION: tag sort function for qsort()
*/
-static
-int tag_compare(const void *a, const void *b)
+static int
+tag_compare(const void *a, const void *b)
{
- struct filetag const *tag1 = a, *tag2 = b;
+ struct filetag const *tag1 = a,
+ *tag2 = b;
- if (tag1->location < tag2->location)
- return -1;
- else if (tag1->location > tag2->location)
- return +1;
+ if (tag1->location < tag2->location)
+ return -1;
+ else if (tag1->location > tag2->location)
+ return +1;
- return 0;
+ return 0;
}
/*
- * NAME: add_filetag()
- * DESCRIPTION: add a new file tag entry
+ * NAME: add_filetag()
+ * DESCRIPTION: add a new file tag entry
*/
-static
-int add_filetag(struct id3_file *file, struct filetag const *filetag)
+static int
+add_filetag(struct id3_file *file, struct filetag const *filetag)
{
- struct filetag *tags;
+ struct filetag *tags;
- tags = realloc(file->tags, (file->ntags + 1) * sizeof(*tags));
- if (tags == 0)
- return -1;
+ tags = realloc(file->tags, (file->ntags + 1) * sizeof(*tags));
+ if (tags == 0)
+ return -1;
- file->tags = tags;
- file->tags[file->ntags++] = *filetag;
+ file->tags = tags;
+ file->tags[file->ntags++] = *filetag;
- /* sort tags by location */
+ /*
+ * sort tags by location
+ */
- if (file->ntags > 1)
- qsort(file->tags, file->ntags, sizeof(file->tags[0]), tag_compare);
+ if (file->ntags > 1)
+ qsort(file->tags, file->ntags, sizeof(file->tags[0]),
+ tag_compare);
- return 0;
+ return 0;
}
/*
- * NAME: del_filetag()
- * DESCRIPTION: delete a file tag entry
+ * NAME: del_filetag()
+ * DESCRIPTION: delete a file tag entry
*/
-static
-void del_filetag(struct id3_file *file, unsigned int index)
+static void
+del_filetag(struct id3_file *file, unsigned int index)
{
- assert(index < file->ntags);
+ assert(index < file->ntags);
- while (index < file->ntags - 1) {
- file->tags[index] = file->tags[index + 1];
- ++index;
- }
+ while (index < file->ntags - 1) {
+ file->tags[index] = file->tags[index + 1];
+ ++index;
+ }
- --file->ntags;
+ --file->ntags;
}
/*
- * NAME: add_tag()
- * DESCRIPTION: read, parse, and add a tag to a file structure
+ * NAME: add_tag()
+ * DESCRIPTION: read, parse, and add a tag to a file structure
*/
-static
-struct id3_tag *add_tag(struct id3_file *file, id3_length_t length)
+static struct id3_tag *
+add_tag(struct id3_file *file, id3_length_t length)
{
- long location;
- unsigned int i;
- struct filetag filetag;
- struct id3_tag *tag;
-
- location = ftell(file->iofile);
- if (location == -1)
- return 0;
-
- /* check for duplication/overlap */
- {
- unsigned long begin1, end1, begin2, end2;
-
- begin1 = location;
- end1 = begin1 + length;
-
- for (i = 0; i < file->ntags; ++i) {
- begin2 = file->tags[i].location;
- end2 = begin2 + file->tags[i].length;
-
- if (begin1 == begin2 && end1 == end2)
- return file->tags[i].tag; /* duplicate */
-
- if (begin1 < end2 && end1 > begin2)
- return 0; /* overlap */
- }
- }
+ long location;
+ unsigned int i;
+ struct filetag filetag;
+ struct id3_tag *tag;
+
+ location = ftell(file->iofile);
+ if (location == -1)
+ return 0;
+
+ /*
+ * check for duplication/overlap
+ */
+ {
+ unsigned long begin1,
+ end1,
+ begin2,
+ end2;
+
+ begin1 = location;
+ end1 = begin1 + length;
+
+ for (i = 0; i < file->ntags; ++i) {
+ begin2 = file->tags[i].location;
+ end2 = begin2 + file->tags[i].length;
+
+ if (begin1 == begin2 && end1 == end2)
+ return file->tags[i].tag; /* duplicate
+ */
+
+ if (begin1 < end2 && end1 > begin2)
+ return 0; /* overlap */
+ }
+ }
- tag = read_tag(file->iofile, length);
+ tag = read_tag(file->iofile, length);
- filetag.tag = tag;
- filetag.location = location;
- filetag.length = length;
+ filetag.tag = tag;
+ filetag.location = location;
+ filetag.length = length;
- if (add_filetag(file, &filetag) == -1 ||
- update_primary(file->primary, tag) == -1) {
- if (tag)
- id3_tag_delete(tag);
- return 0;
- }
+ if (add_filetag(file, &filetag) == -1 ||
+ update_primary(file->primary, tag) == -1) {
+ if (tag)
+ id3_tag_delete(tag);
+ return 0;
+ }
- if (tag)
- id3_tag_addref(tag);
+ if (tag)
+ id3_tag_addref(tag);
- return tag;
+ return tag;
}
/*
- * NAME: search_tags()
- * DESCRIPTION: search for tags in a file
+ * NAME: search_tags()
+ * DESCRIPTION: search for tags in a file
*/
-static
-int search_tags(struct id3_file *file)
+static int
+search_tags(struct id3_file *file)
{
- fpos_t save_position;
- signed long size;
-
- /*
- * save the current seek position
- *
- * We also verify the stream is seekable by calling fsetpos(), since
- * fgetpos() alone is not reliable enough for this purpose.
- *
- * [Apparently not even fsetpos() is sufficient under Win32.]
- */
-
- if (fgetpos(file->iofile, &save_position) == -1 ||
- fsetpos(file->iofile, &save_position) == -1)
- return -1;
-
- /* look for an ID3v1 tag */
-
- if (fseek(file->iofile, -128, SEEK_END) == 0) {
- size = query_tag(file->iofile);
- if (size > 0) {
- struct id3_tag const *tag;
-
- tag = add_tag(file, size);
-
- /* if this is indeed an ID3v1 tag, mark the file so */
-
- if (tag && (ID3_TAG_VERSION_MAJOR(id3_tag_version(tag)) == 1))
- file->flags |= ID3_FILE_FLAG_ID3V1;
- }
- }
-
- /* look for a tag at the beginning of the file */
+ fpos_t save_position;
+ signed long size;
+
+ /*
+ * save the current seek position
+ *
+ * We also verify the stream is seekable by calling fsetpos(), since
+ * fgetpos() alone is not reliable enough for this purpose.
+ *
+ * [Apparently not even fsetpos() is sufficient under Win32.]
+ */
+
+ if (fgetpos(file->iofile, &save_position) == -1 ||
+ fsetpos(file->iofile, &save_position) == -1)
+ return -1;
+
+ /*
+ * look for an ID3v1 tag
+ */
+
+ if (fseek(file->iofile, -128, SEEK_END) == 0) {
+ size = query_tag(file->iofile);
+ if (size > 0) {
+ struct id3_tag const *tag;
+
+ tag = add_tag(file, size);
+
+ /*
+ * if this is indeed an ID3v1 tag, mark the file
+ * so
+ */
+
+ if (tag
+ && (ID3_TAG_VERSION_MAJOR(id3_tag_version(tag))
+ == 1))
+ file->flags |= ID3_FILE_FLAG_ID3V1;
+ }
+ }
- rewind(file->iofile);
+ /*
+ * look for a tag at the beginning of the file
+ */
- size = query_tag(file->iofile);
- if (size > 0) {
- struct id3_tag const *tag;
- struct id3_frame const *frame;
+ rewind(file->iofile);
- tag = add_tag(file, size);
+ size = query_tag(file->iofile);
+ if (size > 0) {
+ struct id3_tag const *tag;
+ struct id3_frame const *frame;
- /* locate tags indicated by SEEK frames */
+ tag = add_tag(file, size);
- while (tag && (frame = id3_tag_findframe(tag, "SEEK", 0))) {
- long seek;
+ /*
+ * locate tags indicated by SEEK frames
+ */
- seek = id3_field_getint(id3_frame_field(frame, 0));
- if (seek < 0 || fseek(file->iofile, seek, SEEK_CUR) == -1)
- break;
+ while (tag && (frame = id3_tag_findframe(tag, "SEEK", 0))) {
+ long seek;
- size = query_tag(file->iofile);
- tag = (size > 0) ? add_tag(file, size) : 0;
- }
- }
+ seek = id3_field_getint(id3_frame_field(frame, 0));
+ if (seek < 0
+ || fseek(file->iofile, seek, SEEK_CUR) == -1)
+ break;
- /* look for a tag at the end of the file (before any ID3v1 tag) */
+ size = query_tag(file->iofile);
+ tag = (size > 0) ? add_tag(file, size) : 0;
+ }
+ }
- if (fseek(file->iofile, ((file->flags & ID3_FILE_FLAG_ID3V1) ? -128 : 0) +
- -10, SEEK_END) == 0) {
- size = query_tag(file->iofile);
- if (size < 0 && fseek(file->iofile, size, SEEK_CUR) == 0) {
- size = query_tag(file->iofile);
- if (size > 0)
- add_tag(file, size);
- }
- }
+ /*
+ * look for a tag at the end of the file (before any ID3v1 tag)
+ */
+
+ if (fseek
+ (file->iofile,
+ ((file->flags & ID3_FILE_FLAG_ID3V1) ? -128 : 0) + -10,
+ SEEK_END) == 0) {
+ size = query_tag(file->iofile);
+ if (size < 0 && fseek(file->iofile, size, SEEK_CUR) == 0) {
+ size = query_tag(file->iofile);
+ if (size > 0)
+ add_tag(file, size);
+ }
+ }
- clearerr(file->iofile);
+ clearerr(file->iofile);
- /* restore seek position */
+ /*
+ * restore seek position
+ */
- if (fsetpos(file->iofile, &save_position) == -1)
- return -1;
+ if (fsetpos(file->iofile, &save_position) == -1)
+ return -1;
- /* set primary tag options and target padded length for convenience */
+ /*
+ * set primary tag options and target padded length for
+ * convenience
+ */
- if ((file->ntags > 0 && !(file->flags & ID3_FILE_FLAG_ID3V1)) ||
- (file->ntags > 1 && (file->flags & ID3_FILE_FLAG_ID3V1))) {
- if (file->tags[0].location == 0)
- id3_tag_setlength(file->primary, file->tags[0].length);
- else
- id3_tag_options(file->primary, ID3_TAG_OPTION_APPENDEDTAG, ~0);
- }
+ if ((file->ntags > 0 && !(file->flags & ID3_FILE_FLAG_ID3V1)) ||
+ (file->ntags > 1 && (file->flags & ID3_FILE_FLAG_ID3V1))) {
+ if (file->tags[0].location == 0)
+ id3_tag_setlength(file->primary,
+ file->tags[0].length);
+ else
+ id3_tag_options(file->primary,
+ ID3_TAG_OPTION_APPENDEDTAG, ~0);
+ }
- return 0;
+ return 0;
}
/*
- * NAME: finish_file()
- * DESCRIPTION: release memory associated with a file
+ * NAME: finish_file()
+ * DESCRIPTION: release memory associated with a file
*/
-static
-void finish_file(struct id3_file *file)
+static void
+finish_file(struct id3_file *file)
{
- unsigned int i;
+ unsigned int i;
- if (file->path)
- free(file->path);
+ if (file->path)
+ free(file->path);
- if (file->primary) {
- id3_tag_delref(file->primary);
- id3_tag_delete(file->primary);
- }
+ if (file->primary) {
+ id3_tag_delref(file->primary);
+ id3_tag_delete(file->primary);
+ }
- for (i = 0; i < file->ntags; ++i) {
- struct id3_tag *tag;
+ for (i = 0; i < file->ntags; ++i) {
+ struct id3_tag *tag;
- tag = file->tags[i].tag;
- if (tag) {
- id3_tag_delref(tag);
- id3_tag_delete(tag);
- }
- }
+ tag = file->tags[i].tag;
+ if (tag) {
+ id3_tag_delref(tag);
+ id3_tag_delete(tag);
+ }
+ }
- if (file->tags)
- free(file->tags);
+ if (file->tags)
+ free(file->tags);
- free(file);
+ free(file);
}
/*
- * NAME: new_file()
- * DESCRIPTION: create a new file structure and load tags
+ * NAME: new_file()
+ * DESCRIPTION: create a new file structure and load tags
*/
-static
-struct id3_file *new_file(FILE *iofile, enum id3_file_mode mode,
- char const *path)
+static struct id3_file *
+new_file(FILE * iofile, enum id3_file_mode mode, char const *path)
{
- struct id3_file *file;
+ struct id3_file *file;
- file = malloc(sizeof(*file));
- if (file == 0)
- goto fail;
+ file = malloc(sizeof(*file));
+ if (file == 0)
+ goto fail;
- file->iofile = iofile;
- file->mode = mode;
- file->path = path ? strdup(path) : 0;
+ file->iofile = iofile;
+ file->mode = mode;
+ file->path = path ? strdup(path) : 0;
- file->flags = 0;
+ file->flags = 0;
- file->ntags = 0;
- file->tags = 0;
+ file->ntags = 0;
+ file->tags = 0;
- file->primary = id3_tag_new();
- if (file->primary == 0)
- goto fail;
+ file->primary = id3_tag_new();
+ if (file->primary == 0)
+ goto fail;
- id3_tag_addref(file->primary);
+ id3_tag_addref(file->primary);
- /* load tags from the file */
+ /*
+ * load tags from the file
+ */
- if (search_tags(file) == -1)
- goto fail;
+ if (search_tags(file) == -1)
+ goto fail;
- id3_tag_options(file->primary, ID3_TAG_OPTION_ID3V1,
- (file->flags & ID3_FILE_FLAG_ID3V1) ? ~0 : 0);
+ id3_tag_options(file->primary, ID3_TAG_OPTION_ID3V1,
+ (file->flags & ID3_FILE_FLAG_ID3V1) ? ~0 : 0);
- if (0) {
- fail:
- if (file) {
- finish_file(file);
- file = 0;
- }
- }
+ if (0) {
+ fail:
+ if (file) {
+ finish_file(file);
+ file = 0;
+ }
+ }
- return file;
+ return file;
}
/*
- * NAME: file->open()
- * DESCRIPTION: open a file given its pathname
+ * NAME: file->open()
+ * DESCRIPTION: open a file given its pathname
*/
-struct id3_file *id3_file_open(char const *path, enum id3_file_mode mode)
+struct id3_file *
+id3_file_open(char const *path, enum id3_file_mode mode)
{
- FILE *iofile;
- struct id3_file *file;
+ FILE *iofile;
+ struct id3_file *file;
- assert(path);
+ assert(path);
- iofile = fopen(path, (mode == ID3_FILE_MODE_READWRITE) ? "r+b" : "rb");
- if (iofile == 0)
- return 0;
+ iofile =
+ fopen(path, (mode == ID3_FILE_MODE_READWRITE) ? "r+b" : "rb");
+ if (iofile == 0)
+ return 0;
- file = new_file(iofile, mode, path);
- if (file == 0)
- fclose(iofile);
+ file = new_file(iofile, mode, path);
+ if (file == 0)
+ fclose(iofile);
- return file;
+ return file;
}
/*
- * NAME: file->fdopen()
- * DESCRIPTION: open a file using an existing file descriptor
+ * NAME: file->fdopen()
+ * DESCRIPTION: open a file using an existing file descriptor
*/
-struct id3_file *id3_file_fdopen(int fd, enum id3_file_mode mode)
+struct id3_file *
+id3_file_fdopen(int fd, enum id3_file_mode mode)
{
-# if 1 || defined(HAVE_UNISTD_H)
- FILE *iofile;
- struct id3_file *file;
+#if 1 || defined(HAVE_UNISTD_H)
+ FILE *iofile;
+ struct id3_file *file;
- iofile = fdopen(fd, (mode == ID3_FILE_MODE_READWRITE) ? "r+b" : "rb");
- if (iofile == 0)
- return 0;
+ iofile =
+ fdopen(fd, (mode == ID3_FILE_MODE_READWRITE) ? "r+b" : "rb");
+ if (iofile == 0)
+ return 0;
- file = new_file(iofile, mode, 0);
- if (file == 0) {
- int save_fd;
+ file = new_file(iofile, mode, 0);
+ if (file == 0) {
+ int save_fd;
- /* close iofile without closing fd */
+ /*
+ * close iofile without closing fd
+ */
- save_fd = dup(fd);
+ save_fd = dup(fd);
- fclose(iofile);
+ fclose(iofile);
- dup2(save_fd, fd);
- close(save_fd);
- }
+ dup2(save_fd, fd);
+ close(save_fd);
+ }
- return file;
-# else
- return 0;
-# endif
+ return file;
+#else
+ return 0;
+#endif
}
/*
- * NAME: file->close()
- * DESCRIPTION: close a file and delete its associated tags
+ * NAME: file->close()
+ * DESCRIPTION: close a file and delete its associated tags
*/
-int id3_file_close(struct id3_file *file)
+int
+id3_file_close(struct id3_file *file)
{
- int result = 0;
+ int result = 0;
- assert(file);
+ assert(file);
- if (fclose(file->iofile) == EOF)
- result = -1;
+ if (fclose(file->iofile) == EOF)
+ result = -1;
- finish_file(file);
+ finish_file(file);
- return result;
+ return result;
}
/*
- * NAME: file->tag()
- * DESCRIPTION: return the primary tag structure for a file
+ * NAME: file->tag()
+ * DESCRIPTION: return the primary tag structure for a file
*/
-struct id3_tag *id3_file_tag(struct id3_file const *file)
+struct id3_tag *
+id3_file_tag(struct id3_file const *file)
{
- assert(file);
+ assert(file);
- return file->primary;
+ return file->primary;
}
/*
- * NAME: v1_write()
- * DESCRIPTION: write ID3v1 tag modifications to a file
+ * NAME: v1_write()
+ * DESCRIPTION: write ID3v1 tag modifications to a file
*/
-static
-int v1_write(struct id3_file *file,
- id3_byte_t const *data, id3_length_t length)
+static int
+v1_write(struct id3_file *file,
+ id3_byte_t const *data, id3_length_t length)
{
- assert(!data || length == 128);
+ assert(!data || length == 128);
- if (data) {
- long location;
+ if (data) {
+ long location;
- if (fseek(file->iofile, (file->flags & ID3_FILE_FLAG_ID3V1) ? -128 : 0,
- SEEK_END) == -1 ||
- (location = ftell(file->iofile)) == -1 ||
- fwrite(data, 128, 1, file->iofile) != 1 ||
- fflush(file->iofile) == EOF)
- return -1;
+ if (fseek
+ (file->iofile,
+ (file->flags & ID3_FILE_FLAG_ID3V1) ? -128 : 0,
+ SEEK_END) == -1
+ || (location = ftell(file->iofile)) == -1
+ || fwrite(data, 128, 1, file->iofile) != 1
+ || fflush(file->iofile) == EOF)
+ return -1;
- /* add file tag reference */
+ /*
+ * add file tag reference
+ */
- if (!(file->flags & ID3_FILE_FLAG_ID3V1)) {
- struct filetag filetag;
+ if (!(file->flags & ID3_FILE_FLAG_ID3V1)) {
+ struct filetag filetag;
- filetag.tag = 0;
- filetag.location = location;
- filetag.length = 128;
+ filetag.tag = 0;
+ filetag.location = location;
+ filetag.length = 128;
- if (add_filetag(file, &filetag) == -1)
- return -1;
+ if (add_filetag(file, &filetag) == -1)
+ return -1;
- file->flags |= ID3_FILE_FLAG_ID3V1;
- }
- }
-# if defined(HAVE_FTRUNCATE)
- else if (file->flags & ID3_FILE_FLAG_ID3V1) {
- long length;
+ file->flags |= ID3_FILE_FLAG_ID3V1;
+ }
+ }
+#if defined(HAVE_FTRUNCATE)
+ else if (file->flags & ID3_FILE_FLAG_ID3V1) {
+ long length;
- if (fseek(file->iofile, 0, SEEK_END) == -1)
- return -1;
+ if (fseek(file->iofile, 0, SEEK_END) == -1)
+ return -1;
- length = ftell(file->iofile);
- if (length == -1 ||
- (length >= 0 && length < 128))
- return -1;
+ length = ftell(file->iofile);
+ if (length == -1 || (length >= 0 && length < 128))
+ return -1;
- if (ftruncate(fileno(file->iofile), length - 128) == -1)
- return -1;
+ if (ftruncate(fileno(file->iofile), length - 128) == -1)
+ return -1;
- /* delete file tag reference */
+ /*
+ * delete file tag reference
+ */
- del_filetag(file, file->ntags - 1);
+ del_filetag(file, file->ntags - 1);
- file->flags &= ~ID3_FILE_FLAG_ID3V1;
- }
-# endif
+ file->flags &= ~ID3_FILE_FLAG_ID3V1;
+ }
+#endif
- return 0;
+ return 0;
}
static char *
-alloc_buf(size_t *pbufsize)
+alloc_buf(size_t * pbufsize)
{
char *buf = NULL;
size_t bufsize;
-
+
for (bufsize = *pbufsize;
- bufsize > 0 && (buf = malloc(bufsize)) == NULL;
- bufsize /= 2);
+ bufsize > 0 && (buf = malloc(bufsize)) == NULL; bufsize /= 2);
*pbufsize = bufsize;
return buf;
}
@@ -591,226 +639,247 @@ alloc_buf(size_t *pbufsize)
static FILE *
make_temp_file(struct id3_file *file, char **pname)
{
- char *template;
- char *p;
- int save_mask;
- int fd;
- int ec;
- FILE *fp;
-
- p = strrchr(file->path, '/');
- if (p) {
- size_t len = p - file->path + 1;
- template = malloc(len + sizeof(TNAME));
- if (!template)
- return NULL;
- memcpy(template, file->path, len);
- strcpy(template + len, TNAME);
- } else {
- template = strdup(TNAME);
- if (!template)
- return NULL;
- }
-
- save_mask = umask(077);
- fd = mkstemp(template);
- ec = errno;
- umask(save_mask);
-
- if (fd == -1) {
- errno = ec;
- return NULL;
- }
-
- fp = fdopen(fd, "w");
- if (!fp) {
- ec = errno;
- close(fd);
- unlink(template);
- free(template);
- errno = ec;
- } else
- *pname = template;
- return fp;
+ char *template;
+ char *p;
+ int save_mask;
+ int fd;
+ int ec;
+ FILE *fp;
+
+ p = strrchr(file->path, '/');
+ if (p) {
+ size_t len = p - file->path + 1;
+ template = malloc(len + sizeof(TNAME));
+ if (!template)
+ return NULL;
+ memcpy(template, file->path, len);
+ strcpy(template + len, TNAME);
+ } else {
+ template = strdup(TNAME);
+ if (!template)
+ return NULL;
+ }
+
+ save_mask = umask(077);
+ fd = mkstemp(template);
+ ec = errno;
+ umask(save_mask);
+
+ if (fd == -1) {
+ errno = ec;
+ return NULL;
+ }
+
+ fp = fdopen(fd, "w");
+ if (!fp) {
+ ec = errno;
+ close(fd);
+ unlink(template);
+ free(template);
+ errno = ec;
+ } else
+ *pname = template;
+ return fp;
}
static int
-copy_block(FILE *inf, FILE *outf, off_t start, off_t size)
+copy_block(FILE * inf, FILE * outf, off_t start, off_t size)
{
- char *buf;
- size_t bufsize;
-
- if (fseek(inf, start, SEEK_SET) < 0)
- return -1;
- if (size == 0)
- return 0;
-
- if (size < 0 || size > MALLOC_MAX)
- bufsize = MALLOC_MAX;
- else
- bufsize = size;
-
- buf = alloc_buf(&bufsize);
- while (1) {
- size_t rdbytes;
-
- rdbytes = fread(buf, 1, bufsize, inf);
- if (rdbytes == 0)
- break;
- if (fwrite(buf, rdbytes, 1, outf) != 1)
- break;
- if (size > 0) {
- size -= rdbytes;
- if (size == 0)
- break;
- }
- }
- free(buf);
- return size > 0 ? 1 : 0;
+ char *buf;
+ size_t bufsize;
+
+ if (fseek(inf, start, SEEK_SET) < 0)
+ return -1;
+ if (size == 0)
+ return 0;
+
+ if (size < 0 || size > MALLOC_MAX)
+ bufsize = MALLOC_MAX;
+ else
+ bufsize = size;
+
+ buf = alloc_buf(&bufsize);
+ while (1) {
+ size_t rdbytes;
+
+ rdbytes = fread(buf, 1, bufsize, inf);
+ if (rdbytes == 0)
+ break;
+ if (fwrite(buf, rdbytes, 1, outf) != 1)
+ break;
+ if (size > 0) {
+ size -= rdbytes;
+ if (size == 0)
+ break;
+ }
+ }
+ free(buf);
+ return size > 0 ? 1 : 0;
}
/*
- * NAME: v2_write()
- * DESCRIPTION: write ID3v2 tag modifications to a file
+ * NAME: v2_write()
+ * DESCRIPTION: write ID3v2 tag modifications to a file
*/
-static
-int v2_write(struct id3_file *file,
- id3_byte_t const *data, id3_length_t length)
+static int
+v2_write(struct id3_file *file,
+ id3_byte_t const *data, id3_length_t length)
{
- int rc;
-
- if (file->ntags == 0)
- return 0;
- if (data &&
- ((file->ntags == 1 && !(file->flags & ID3_FILE_FLAG_ID3V1)) ||
- (file->ntags == 2 && (file->flags & ID3_FILE_FLAG_ID3V1))) &&
- file->tags[0].length == length) {
- /* easy special case: rewrite existing tag in-place */
-
- if (fseek(file->iofile, file->tags[0].location, SEEK_SET) == -1 ||
- fwrite(data, length, 1, file->iofile) != 1 ||
- fflush(file->iofile) == EOF)
- rc = -1;
- else
- rc = 0;
- } else {
- /* hard general case: rewrite entire file */
- char *tmpname;
- FILE *tmp;
- struct stat st;
-
- if (stat(file->path, &st))
- return -1;
-
- tmp = make_temp_file(file, &tmpname);
- if (!tmp)
- return -1;
-
- if (data && length)
- rc = fwrite(data, length, 1, tmp) != 1;
- else
- rc = 0;
-
- if (rc == 0)
- rc = copy_block(file->iofile, tmp,
- /* FIXME: Should I check tag->version instead? */
- (file->tags[0].location == 0) ?
- file->tags[0].length : 0, -1);
-
- fclose(tmp);
- if (rc)
- unlink(tmpname);
- else {
- file->tags[0].length = length;
- fclose(file->iofile);
- rc = unlink(file->path);
- if (rc == 0) {
- rc = rename(tmpname, file->path);
- chmod(file->path, st.st_mode & 0777);
- chown(file->path, st.st_uid, st.st_gid);
- file->iofile = fopen(file->path, "r+b");
- }
- }
- free(tmpname);
- }
- return rc;
+ int rc;
+
+ if (file->ntags == 0)
+ return 0;
+ if (data &&
+ ((file->ntags == 1 && !(file->flags & ID3_FILE_FLAG_ID3V1)) ||
+ (file->ntags == 2 && (file->flags & ID3_FILE_FLAG_ID3V1))) &&
+ file->tags[0].length == length) {
+ /*
+ * easy special case: rewrite existing tag in-place
+ */
+
+ if (fseek(file->iofile, file->tags[0].location, SEEK_SET)
+ == -1 || fwrite(data, length, 1, file->iofile) != 1
+ || fflush(file->iofile) == EOF)
+ rc = -1;
+ else
+ rc = 0;
+ } else {
+ /*
+ * hard general case: rewrite entire file
+ */
+ char *tmpname;
+ FILE *tmp;
+ struct stat st;
+
+ if (stat(file->path, &st))
+ return -1;
+
+ tmp = make_temp_file(file, &tmpname);
+ if (!tmp)
+ return -1;
+
+ if (data && length)
+ rc = fwrite(data, length, 1, tmp) != 1;
+ else
+ rc = 0;
+
+ if (rc == 0)
+ rc = copy_block(file->iofile, tmp,
+ /*
+ * FIXME: Should I check
+ * tag->version instead?
+ */
+ (file->tags[0].location == 0) ?
+ file->tags[0].length : 0, -1);
+
+ fclose(tmp);
+ if (rc)
+ unlink(tmpname);
+ else {
+ file->tags[0].length = length;
+ fclose(file->iofile);
+ rc = unlink(file->path);
+ if (rc == 0) {
+ rc = rename(tmpname, file->path);
+ chmod(file->path, st.st_mode & 0777);
+ chown(file->path, st.st_uid, st.st_gid);
+ file->iofile = fopen(file->path, "r+b");
+ }
+ }
+ free(tmpname);
+ }
+ return rc;
}
/*
- * NAME: file->update()
- * DESCRIPTION: rewrite tag(s) to a file
+ * NAME: file->update()
+ * DESCRIPTION: rewrite tag(s) to a file
*/
-int id3_file_update(struct id3_file *file)
+int
+id3_file_update(struct id3_file *file)
{
- int options, result = 0;
- id3_length_t v1size = 0, v2size = 0;
- id3_byte_t id3v1_data[128], *id3v1 = 0, *id3v2 = 0;
-
- assert(file);
-
- if (file->mode != ID3_FILE_MODE_READWRITE)
- return -1;
-
- options = id3_tag_options(file->primary, 0, 0);
-
- /* render ID3v1 */
-
- if (options & ID3_TAG_OPTION_ID3V1) {
- v1size = id3_tag_render(file->primary, 0);
- if (v1size) {
- assert(v1size == sizeof(id3v1_data));
-
- v1size = id3_tag_render(file->primary, id3v1_data);
- if (v1size) {
- assert(v1size == sizeof(id3v1_data));
- id3v1 = id3v1_data;
- }
- }
- }
-
- /* render ID3v2 */
-
- if (options & ID3_TAG_OPTION_NO_ID3V2)
- id3v2 = NULL;
- else
- {
- id3_tag_options(file->primary, ID3_TAG_OPTION_ID3V1, 0);
-
- v2size = id3_tag_render(file->primary, 0);
- if (v2size) {
- id3v2 = malloc(v2size);
- if (id3v2 == 0)
- goto fail;
-
- v2size = id3_tag_render(file->primary, id3v2);
- if (v2size == 0) {
- free(id3v2);
- id3v2 = 0;
+ int options,
+ result = 0;
+ id3_length_t v1size = 0,
+ v2size = 0;
+ id3_byte_t id3v1_data[128],
+ *id3v1 = 0,
+ *id3v2 = 0;
+
+ assert(file);
+
+ if (file->mode != ID3_FILE_MODE_READWRITE)
+ return -1;
+
+ options = id3_tag_options(file->primary, 0, 0);
+
+ /*
+ * render ID3v1
+ */
+
+ if (options & ID3_TAG_OPTION_ID3V1) {
+ v1size = id3_tag_render(file->primary, 0);
+ if (v1size) {
+ assert(v1size == sizeof(id3v1_data));
+
+ v1size = id3_tag_render(file->primary, id3v1_data);
+ if (v1size) {
+ assert(v1size == sizeof(id3v1_data));
+ id3v1 = id3v1_data;
+ }
+ }
}
- }
- }
- /* write tags */
+ /*
+ * render ID3v2
+ */
+
+ if (options & ID3_TAG_OPTION_NO_ID3V2)
+ id3v2 = NULL;
+ else {
+ id3_tag_options(file->primary, ID3_TAG_OPTION_ID3V1, 0);
+
+ v2size = id3_tag_render(file->primary, 0);
+ if (v2size) {
+ id3v2 = malloc(v2size);
+ if (id3v2 == 0)
+ goto fail;
+
+ v2size = id3_tag_render(file->primary, id3v2);
+ if (v2size == 0) {
+ free(id3v2);
+ id3v2 = 0;
+ }
+ }
+ }
+
+ /*
+ * write tags
+ */
- if (v2_write(file, id3v2, v2size) == -1 ||
- v1_write(file, id3v1, v1size) == -1)
- goto fail;
+ if (v2_write(file, id3v2, v2size) == -1 ||
+ v1_write(file, id3v1, v1size) == -1)
+ goto fail;
- rewind(file->iofile);
+ rewind(file->iofile);
- /* update file tags array? ... */
+ /*
+ * update file tags array? ...
+ */
- if (0) {
- fail:
- result = -1;
- }
+ if (0) {
+ fail:
+ result = -1;
+ }
- /* clean up; restore tag options */
+ /*
+ * clean up; restore tag options
+ */
- if (id3v2)
- free(id3v2);
+ if (id3v2)
+ free(id3v2);
- id3_tag_options(file->primary, ~0, options);
+ id3_tag_options(file->primary, ~0, options);
- return result;
+ return result;
}
diff --git a/libid3tag/file.h b/libid3tag/file.h
index 032b189..c948b84 100644
--- a/libid3tag/file.h
+++ b/libid3tag/file.h
@@ -19,7 +19,7 @@
* $Id: file.h,v 1.8 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_FILE_H
+#ifndef LIBID3TAG_FILE_H
# define LIBID3TAG_FILE_H
-# endif
+#endif
diff --git a/libid3tag/frame.c b/libid3tag/frame.c
index 1c680d9..bf4e7a4 100644
--- a/libid3tag/frame.c
+++ b/libid3tag/frame.c
@@ -19,608 +19,668 @@
* $Id: frame.c,v 1.15 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
-
-# include "global.h"
-
-# include <stdlib.h>
-# include <string.h>
-
-# ifdef HAVE_ASSERT_H
-# include <assert.h>
-# endif
-
-# include "id3tag.h"
-# include "frame.h"
-# include "frametype.h"
-# include "compat.h"
-# include "field.h"
-# include "render.h"
-# include "parse.h"
-# include "util.h"
-
-static
-int valid_idchar(char c)
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "global.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_ASSERT_H
+# include <assert.h>
+#endif
+
+#include "id3tag.h"
+#include "frame.h"
+#include "frametype.h"
+#include "compat.h"
+#include "field.h"
+#include "render.h"
+#include "parse.h"
+#include "util.h"
+
+static int
+valid_idchar(char c)
{
- return (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9');
+ return (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9');
}
/*
- * NAME: frame->validid()
- * DESCRIPTION: return true if the parameter string is a legal frame ID
+ * NAME: frame->validid()
+ * DESCRIPTION: return true if the parameter string is a legal frame ID
*/
-int id3_frame_validid(char const *id)
+int
+id3_frame_validid(char const *id)
{
- return id &&
- valid_idchar(id[0]) &&
- valid_idchar(id[1]) &&
- valid_idchar(id[2]) &&
- valid_idchar(id[3]);
+ return id &&
+ valid_idchar(id[0]) &&
+ valid_idchar(id[1]) &&
+ valid_idchar(id[2]) && valid_idchar(id[3]);
}
/*
- * NAME: frame->new()
- * DESCRIPTION: allocate and return a new frame
+ * NAME: frame->new()
+ * DESCRIPTION: allocate and return a new frame
*/
-struct id3_frame *id3_frame_new(char const *id)
+struct id3_frame *
+id3_frame_new(char const *id)
{
- struct id3_frametype const *frametype;
- struct id3_frame *frame;
- unsigned int i;
-
- if (!id3_frame_validid(id))
- return 0;
-
- frametype = id3_frametype_lookup(id, 4);
- if (frametype == 0) {
- switch (id[0]) {
- case 'T':
- frametype = &id3_frametype_text;
- break;
-
- case 'W':
- frametype = &id3_frametype_url;
- break;
-
- case 'X':
- case 'Y':
- case 'Z':
- frametype = &id3_frametype_experimental;
- break;
-
- default:
- frametype = &id3_frametype_unknown;
- if (id3_compat_lookup(id, 4))
- frametype = &id3_frametype_obsolete;
- break;
- }
- }
-
- frame = malloc(sizeof(*frame) + frametype->nfields * sizeof(*frame->fields));
- if (frame) {
- frame->id[0] = id[0];
- frame->id[1] = id[1];
- frame->id[2] = id[2];
- frame->id[3] = id[3];
- frame->id[4] = 0;
-
- frame->description = frametype->description;
- frame->refcount = 0;
- frame->flags = frametype->defaultflags;
- frame->group_id = 0;
- frame->encryption_method = 0;
- frame->encoded = 0;
- frame->encoded_length = 0;
- frame->decoded_length = 0;
- frame->nfields = frametype->nfields;
- frame->fields = (union id3_field *) &frame[1];
-
- for (i = 0; i < frame->nfields; ++i)
- id3_field_init(&frame->fields[i], frametype->fields[i]);
- }
-
- return frame;
+ struct id3_frametype const *frametype;
+ struct id3_frame *frame;
+ unsigned int i;
+
+ if (!id3_frame_validid(id))
+ return 0;
+
+ frametype = id3_frametype_lookup(id, 4);
+ if (frametype == 0) {
+ switch (id[0]) {
+ case 'T':
+ frametype = &id3_frametype_text;
+ break;
+
+ case 'W':
+ frametype = &id3_frametype_url;
+ break;
+
+ case 'X':
+ case 'Y':
+ case 'Z':
+ frametype = &id3_frametype_experimental;
+ break;
+
+ default:
+ frametype = &id3_frametype_unknown;
+ if (id3_compat_lookup(id, 4))
+ frametype = &id3_frametype_obsolete;
+ break;
+ }
+ }
+
+ frame =
+ malloc(sizeof(*frame) +
+ frametype->nfields * sizeof(*frame->fields));
+ if (frame) {
+ frame->id[0] = id[0];
+ frame->id[1] = id[1];
+ frame->id[2] = id[2];
+ frame->id[3] = id[3];
+ frame->id[4] = 0;
+
+ frame->description = frametype->description;
+ frame->refcount = 0;
+ frame->flags = frametype->defaultflags;
+ frame->group_id = 0;
+ frame->encryption_method = 0;
+ frame->encoded = 0;
+ frame->encoded_length = 0;
+ frame->decoded_length = 0;
+ frame->nfields = frametype->nfields;
+ frame->fields = (union id3_field *) &frame[1];
+
+ for (i = 0; i < frame->nfields; ++i)
+ id3_field_init(&frame->fields[i],
+ frametype->fields[i]);
+ }
+
+ return frame;
}
-void id3_frame_delete(struct id3_frame *frame)
+void
+id3_frame_delete(struct id3_frame *frame)
{
- assert(frame);
+ assert(frame);
- if (frame->refcount == 0) {
- unsigned int i;
+ if (frame->refcount == 0) {
+ unsigned int i;
- for (i = 0; i < frame->nfields; ++i)
- id3_field_finish(&frame->fields[i]);
+ for (i = 0; i < frame->nfields; ++i)
+ id3_field_finish(&frame->fields[i]);
- if (frame->encoded)
- free(frame->encoded);
+ if (frame->encoded)
+ free(frame->encoded);
- free(frame);
- }
+ free(frame);
+ }
}
/*
- * NAME: frame->addref()
- * DESCRIPTION: add an external reference to a frame
+ * NAME: frame->addref()
+ * DESCRIPTION: add an external reference to a frame
*/
-void id3_frame_addref(struct id3_frame *frame)
+void
+id3_frame_addref(struct id3_frame *frame)
{
- assert(frame);
+ assert(frame);
- ++frame->refcount;
+ ++frame->refcount;
}
/*
- * NAME: frame->delref()
- * DESCRIPTION: remove an external reference to a frame
+ * NAME: frame->delref()
+ * DESCRIPTION: remove an external reference to a frame
*/
-void id3_frame_delref(struct id3_frame *frame)
+void
+id3_frame_delref(struct id3_frame *frame)
{
- assert(frame && frame->refcount > 0);
+ assert(frame && frame->refcount > 0);
- --frame->refcount;
+ --frame->refcount;
}
/*
- * NAME: frame->field()
- * DESCRIPTION: return a pointer to a field in a frame
+ * NAME: frame->field()
+ * DESCRIPTION: return a pointer to a field in a frame
*/
-union id3_field *id3_frame_field(struct id3_frame const *frame,
- unsigned int index)
+union id3_field *
+id3_frame_field(struct id3_frame const *frame, unsigned int index)
{
- assert(frame);
-
- return (index < frame->nfields) ? &frame->fields[index] : 0;
-}
+ assert(frame);
-static
-struct id3_frame *obsolete(char const *id, id3_byte_t const *data,
- id3_length_t length)
-{
- struct id3_frame *frame;
-
- frame = id3_frame_new(ID3_FRAME_OBSOLETE);
- if (frame) {
- if (id3_field_setframeid(&frame->fields[0], id) == -1 ||
- id3_field_setbinarydata(&frame->fields[1], data, length) == -1)
- goto fail;
- }
-
- if (0) {
- fail:
- if (frame) {
- id3_frame_delete(frame);
- frame = 0;
- }
- }
-
- return frame;
+ return (index < frame->nfields) ? &frame->fields[index] : 0;
}
-static
-struct id3_frame *unparseable(char const *id, id3_byte_t const **ptr,
- id3_length_t length, int flags,
- int group_id, int encryption_method,
- id3_length_t decoded_length)
+static struct id3_frame *
+obsolete(char const *id, id3_byte_t const *data, id3_length_t length)
{
- struct id3_frame *frame = 0;
- id3_byte_t *mem;
-
- mem = malloc(length ? length : 1);
- if (mem == 0)
- goto fail;
-
- frame = id3_frame_new(id);
- if (frame == 0)
- free(mem);
- else {
- memcpy(mem, *ptr, length);
-
- frame->flags = flags;
- frame->group_id = group_id;
- frame->encryption_method = encryption_method;
- frame->encoded = mem;
- frame->encoded_length = length;
- frame->decoded_length = decoded_length;
- }
-
- if (0) {
- fail:
- ;
- }
-
- *ptr += length;
-
- return frame;
-}
-
-static
-int parse_data(struct id3_frame *frame,
- id3_byte_t const *data, id3_length_t length)
-{
- enum id3_field_textencoding encoding;
- id3_byte_t const *end;
- unsigned int i;
-
- encoding = ID3_FIELD_TEXTENCODING_ISO_8859_1;
-
- end = data + length;
+ struct id3_frame *frame;
+
+ frame = id3_frame_new(ID3_FRAME_OBSOLETE);
+ if (frame) {
+ if (id3_field_setframeid(&frame->fields[0], id) == -1 ||
+ id3_field_setbinarydata(&frame->fields[1], data,
+ length) == -1)
+ goto fail;
+ }
- for (i = 0; i < frame->nfields; ++i) {
- if (id3_field_parse(&frame->fields[i], &data, end - data, &encoding) == -1)
- return -1;
- }
+ if (0) {
+ fail:
+ if (frame) {
+ id3_frame_delete(frame);
+ frame = 0;
+ }
+ }
- return 0;
+ return frame;
}
-/*
- * NAME: frame->parse()
- * DESCRIPTION: parse raw frame data according to the specified ID3 tag version
- */
-struct id3_frame *id3_frame_parse(id3_byte_t const **ptr, id3_length_t length,
- unsigned int version)
+static struct id3_frame *
+unparseable(char const *id, id3_byte_t const **ptr,
+ id3_length_t length, int flags,
+ int group_id, int encryption_method,
+ id3_length_t decoded_length)
{
- struct id3_frame *frame = 0;
- id3_byte_t const *id, *end, *data;
- id3_length_t size, decoded_length = 0;
- int flags = 0, group_id = 0, encryption_method = 0;
- struct id3_compat const *compat = 0;
- id3_byte_t *mem = 0;
- char xid[4];
-
- id = *ptr;
- end = *ptr + length;
-
- if (ID3_TAG_VERSION_MAJOR(version) < 4) {
- switch (ID3_TAG_VERSION_MAJOR(version)) {
- case 2:
- if (length < 6)
- goto fail;
-
- compat = id3_compat_lookup(id, 3);
-
- *ptr += 3;
- size = id3_parse_uint(ptr, 3);
-
- if (size > end - *ptr)
- goto fail;
-
- end = *ptr + size;
-
- break;
-
- case 3:
- if (length < 10)
- goto fail;
-
- compat = id3_compat_lookup(id, 4);
-
- *ptr += 4;
- size = id3_parse_uint(ptr, 4);
- flags = id3_parse_uint(ptr, 2);
-
- if (size > end - *ptr)
- goto fail;
-
- end = *ptr + size;
-
- if (flags & (ID3_FRAME_FLAG_FORMATFLAGS & ~0x00e0)) {
- frame = unparseable(id, ptr, end - *ptr, 0, 0, 0, 0);
- goto done;
- }
+ struct id3_frame *frame = 0;
+ id3_byte_t *mem;
- flags =
- ((flags >> 1) & ID3_FRAME_FLAG_STATUSFLAGS) |
- ((flags >> 4) & (ID3_FRAME_FLAG_COMPRESSION |
- ID3_FRAME_FLAG_ENCRYPTION)) |
- ((flags << 1) & ID3_FRAME_FLAG_GROUPINGIDENTITY);
+ mem = malloc(length ? length : 1);
+ if (mem == 0)
+ goto fail;
- if (flags & ID3_FRAME_FLAG_COMPRESSION) {
- if (end - *ptr < 4)
- goto fail;
-
- decoded_length = id3_parse_uint(ptr, 4);
- }
+ frame = id3_frame_new(id);
+ if (frame == 0)
+ free(mem);
+ else {
+ memcpy(mem, *ptr, length);
+
+ frame->flags = flags;
+ frame->group_id = group_id;
+ frame->encryption_method = encryption_method;
+ frame->encoded = mem;
+ frame->encoded_length = length;
+ frame->decoded_length = decoded_length;
+ }
- if (flags & ID3_FRAME_FLAG_ENCRYPTION) {
- if (end - *ptr < 1)
- goto fail;
+ if (0) {
+ fail:
+ ;
+ }
- encryption_method = id3_parse_uint(ptr, 1);
- }
+ *ptr += length;
- if (flags & ID3_FRAME_FLAG_GROUPINGIDENTITY) {
- if (end - *ptr < 1)
- goto fail;
+ return frame;
+}
- group_id = id3_parse_uint(ptr, 1);
- }
+static int
+parse_data(struct id3_frame *frame,
+ id3_byte_t const *data, id3_length_t length)
+{
+ enum id3_field_textencoding encoding;
+ id3_byte_t const *end;
+ unsigned int i;
- break;
+ encoding = ID3_FIELD_TEXTENCODING_ISO_8859_1;
- default:
- goto fail;
- }
+ end = data + length;
- /* canonicalize frame ID for ID3v2.4 */
+ for (i = 0; i < frame->nfields; ++i) {
+ if (id3_field_parse
+ (&frame->fields[i], &data, end - data,
+ &encoding) == -1)
+ return -1;
+ }
- if (compat && compat->equiv)
- id = compat->equiv;
- else if (ID3_TAG_VERSION_MAJOR(version) == 2) {
- xid[0] = 'Y';
- xid[1] = id[0];
- xid[2] = id[1];
- xid[3] = id[2];
+ return 0;
+}
- id = xid;
+/*
+ * NAME: frame->parse()
+ * DESCRIPTION: parse raw frame data according to the specified ID3 tag version
+ */
+struct id3_frame *
+id3_frame_parse(id3_byte_t const **ptr, id3_length_t length,
+ unsigned int version)
+{
+ struct id3_frame *frame = 0;
+ id3_byte_t const *id,
+ *end,
+ *data;
+ id3_length_t size,
+ decoded_length = 0;
+ int flags = 0,
+ group_id = 0,
+ encryption_method = 0;
+ struct id3_compat const *compat = 0;
+ id3_byte_t *mem = 0;
+ char xid[4];
+
+ id = *ptr;
+ end = *ptr + length;
+
+ if (ID3_TAG_VERSION_MAJOR(version) < 4) {
+ switch (ID3_TAG_VERSION_MAJOR(version)) {
+ case 2:
+ if (length < 6)
+ goto fail;
- flags |=
- ID3_FRAME_FLAG_TAGALTERPRESERVATION |
- ID3_FRAME_FLAG_FILEALTERPRESERVATION;
- }
- }
- else { /* ID3v2.4 */
- if (length < 10)
- goto fail;
+ compat = id3_compat_lookup(id, 3);
+
+ *ptr += 3;
+ size = id3_parse_uint(ptr, 3);
+
+ if (size > end - *ptr)
+ goto fail;
+
+ end = *ptr + size;
+
+ break;
+
+ case 3:
+ if (length < 10)
+ goto fail;
+
+ compat = id3_compat_lookup(id, 4);
+
+ *ptr += 4;
+ size = id3_parse_uint(ptr, 4);
+ flags = id3_parse_uint(ptr, 2);
+
+ if (size > end - *ptr)
+ goto fail;
+
+ end = *ptr + size;
+
+ if (flags & (ID3_FRAME_FLAG_FORMATFLAGS & ~0x00e0)) {
+ frame =
+ unparseable(id, ptr, end - *ptr, 0, 0,
+ 0, 0);
+ goto done;
+ }
+
+ flags =
+ ((flags >> 1) & ID3_FRAME_FLAG_STATUSFLAGS) |
+ ((flags >> 4) & (ID3_FRAME_FLAG_COMPRESSION |
+ ID3_FRAME_FLAG_ENCRYPTION)) |
+ ((flags << 1) &
+ ID3_FRAME_FLAG_GROUPINGIDENTITY);
+
+ if (flags & ID3_FRAME_FLAG_COMPRESSION) {
+ if (end - *ptr < 4)
+ goto fail;
+
+ decoded_length = id3_parse_uint(ptr, 4);
+ }
+
+ if (flags & ID3_FRAME_FLAG_ENCRYPTION) {
+ if (end - *ptr < 1)
+ goto fail;
+
+ encryption_method = id3_parse_uint(ptr, 1);
+ }
+
+ if (flags & ID3_FRAME_FLAG_GROUPINGIDENTITY) {
+ if (end - *ptr < 1)
+ goto fail;
+
+ group_id = id3_parse_uint(ptr, 1);
+ }
+
+ break;
+
+ default:
+ goto fail;
+ }
+
+ /*
+ * canonicalize frame ID for ID3v2.4
+ */
+
+ if (compat && compat->equiv)
+ id = compat->equiv;
+ else if (ID3_TAG_VERSION_MAJOR(version) == 2) {
+ xid[0] = 'Y';
+ xid[1] = id[0];
+ xid[2] = id[1];
+ xid[3] = id[2];
+
+ id = xid;
- *ptr += 4;
- size = id3_parse_syncsafe(ptr, 4);
- flags = id3_parse_uint(ptr, 2);
+ flags |=
+ ID3_FRAME_FLAG_TAGALTERPRESERVATION |
+ ID3_FRAME_FLAG_FILEALTERPRESERVATION;
+ }
+ } else { /* ID3v2.4 */
+ if (length < 10)
+ goto fail;
- if (size > end - *ptr)
- goto fail;
+ *ptr += 4;
+ size = id3_parse_syncsafe(ptr, 4);
+ flags = id3_parse_uint(ptr, 2);
- end = *ptr + size;
+ if (size > end - *ptr)
+ goto fail;
- if (flags & (ID3_FRAME_FLAG_FORMATFLAGS & ~ID3_FRAME_FLAG_KNOWNFLAGS)) {
- frame = unparseable(id, ptr, end - *ptr, flags, 0, 0, 0);
- goto done;
- }
+ end = *ptr + size;
- if (flags & ID3_FRAME_FLAG_GROUPINGIDENTITY) {
- if (end - *ptr < 1)
- goto fail;
+ if (flags &
+ (ID3_FRAME_FLAG_FORMATFLAGS &
+ ~ID3_FRAME_FLAG_KNOWNFLAGS)) {
+ frame =
+ unparseable(id, ptr, end - *ptr, flags, 0, 0,
+ 0);
+ goto done;
+ }
- group_id = id3_parse_uint(ptr, 1);
- }
+ if (flags & ID3_FRAME_FLAG_GROUPINGIDENTITY) {
+ if (end - *ptr < 1)
+ goto fail;
- if ((flags & ID3_FRAME_FLAG_COMPRESSION) &&
- !(flags & ID3_FRAME_FLAG_DATALENGTHINDICATOR))
- goto fail;
+ group_id = id3_parse_uint(ptr, 1);
+ }
- if (flags & ID3_FRAME_FLAG_ENCRYPTION) {
- if (end - *ptr < 1)
- goto fail;
+ if ((flags & ID3_FRAME_FLAG_COMPRESSION) &&
+ !(flags & ID3_FRAME_FLAG_DATALENGTHINDICATOR))
+ goto fail;
+
+ if (flags & ID3_FRAME_FLAG_ENCRYPTION) {
+ if (end - *ptr < 1)
+ goto fail;
+
+ encryption_method = id3_parse_uint(ptr, 1);
+ }
+
+ if (flags & ID3_FRAME_FLAG_DATALENGTHINDICATOR) {
+ if (end - *ptr < 4)
+ goto fail;
+
+ decoded_length = id3_parse_syncsafe(ptr, 4);
+ }
+ }
- encryption_method = id3_parse_uint(ptr, 1);
- }
+ data = *ptr;
+ *ptr = end;
- if (flags & ID3_FRAME_FLAG_DATALENGTHINDICATOR) {
- if (end - *ptr < 4)
- goto fail;
+ /*
+ * undo frame encodings
+ */
- decoded_length = id3_parse_syncsafe(ptr, 4);
- }
- }
+ if ((flags & ID3_FRAME_FLAG_UNSYNCHRONISATION) && end - data > 0) {
+ mem = malloc(end - data);
+ if (mem == 0)
+ goto fail;
- data = *ptr;
- *ptr = end;
+ memcpy(mem, data, end - data);
- /* undo frame encodings */
+ end = mem + id3_util_deunsynchronise(mem, end - data);
+ data = mem;
+ }
- if ((flags & ID3_FRAME_FLAG_UNSYNCHRONISATION) && end - data > 0) {
- mem = malloc(end - data);
- if (mem == 0)
- goto fail;
+ if (flags & ID3_FRAME_FLAG_ENCRYPTION) {
+ frame = unparseable(id, &data, end - data, flags,
+ group_id, encryption_method,
+ decoded_length);
+ goto done;
+ }
- memcpy(mem, data, end - data);
+ if (flags & ID3_FRAME_FLAG_COMPRESSION) {
+ id3_byte_t *decomp;
- end = mem + id3_util_deunsynchronise(mem, end - data);
- data = mem;
- }
+ decomp =
+ id3_util_decompress(data, end - data, decoded_length);
+ if (decomp == 0)
+ goto fail;
- if (flags & ID3_FRAME_FLAG_ENCRYPTION) {
- frame = unparseable(id, &data, end - data, flags,
- group_id, encryption_method, decoded_length);
- goto done;
- }
+ if (mem)
+ free(mem);
- if (flags & ID3_FRAME_FLAG_COMPRESSION) {
- id3_byte_t *decomp;
+ data = mem = decomp;
+ end = data + decoded_length;
+ }
- decomp = id3_util_decompress(data, end - data, decoded_length);
- if (decomp == 0)
- goto fail;
+ /*
+ * check for obsolescence
+ */
- if (mem)
- free(mem);
+ if (compat && !compat->equiv) {
+ frame = obsolete(id, data, end - data);
+ goto done;
+ }
- data = mem = decomp;
- end = data + decoded_length;
- }
-
- /* check for obsolescence */
-
- if (compat && !compat->equiv) {
- frame = obsolete(id, data, end - data);
- goto done;
- }
-
- /* generate the internal frame structure */
-
- frame = id3_frame_new(id);
- if (frame) {
- frame->flags = flags;
- frame->group_id = group_id;
-
- if (compat && compat->translate) {
- if (compat->translate(frame, compat->id, data, end - data) == -1)
- goto fail;
- }
- else {
- if (parse_data(frame, data, end - data) == -1)
- goto fail;
- }
- }
+ /*
+ * generate the internal frame structure
+ */
+
+ frame = id3_frame_new(id);
+ if (frame) {
+ frame->flags = flags;
+ frame->group_id = group_id;
+
+ if (compat && compat->translate) {
+ if (compat->translate(frame, compat->id, data,
+ end - data) == -1)
+ goto fail;
+ } else {
+ if (parse_data(frame, data, end - data) == -1)
+ goto fail;
+ }
+ }
- if (0) {
- fail:
- if (frame) {
- id3_frame_delete(frame);
- frame = 0;
- }
- }
+ if (0) {
+ fail:
+ if (frame) {
+ id3_frame_delete(frame);
+ frame = 0;
+ }
+ }
- done:
- if (mem)
- free(mem);
+ done:
+ if (mem)
+ free(mem);
- return frame;
+ return frame;
}
-static
-id3_length_t render_data(id3_byte_t **ptr,
- union id3_field *fields, unsigned int length)
+static id3_length_t
+render_data(id3_byte_t ** ptr,
+ union id3_field *fields, unsigned int length)
{
- id3_length_t size = 0;
- enum id3_field_textencoding encoding;
- unsigned int i;
+ id3_length_t size = 0;
+ enum id3_field_textencoding encoding;
+ unsigned int i;
- encoding = ID3_FIELD_TEXTENCODING_ISO_8859_1;
+ encoding = ID3_FIELD_TEXTENCODING_ISO_8859_1;
- for (i = 0; i < length; ++i)
- size += id3_field_render(&fields[i], ptr, &encoding, i < length - 1);
+ for (i = 0; i < length; ++i)
+ size +=
+ id3_field_render(&fields[i], ptr, &encoding,
+ i < length - 1);
- return size;
+ return size;
}
/*
- * NAME: frame->render()
- * DESCRIPTION: render a single, complete frame
+ * NAME: frame->render()
+ * DESCRIPTION: render a single, complete frame
*/
-id3_length_t id3_frame_render(struct id3_frame const *frame,
- id3_byte_t **ptr, int options)
+id3_length_t
+id3_frame_render(struct id3_frame const *frame,
+ id3_byte_t ** ptr, int options)
{
- id3_length_t size = 0, decoded_length, datalen;
- id3_byte_t *size_ptr = 0, *flags_ptr = 0, *data = 0;
- int flags;
-
- assert(frame);
+ id3_length_t size = 0,
+ decoded_length,
+ datalen;
+ id3_byte_t *size_ptr = 0,
+ *flags_ptr = 0,
+ *data = 0;
+ int flags;
- if ((frame->flags & ID3_FRAME_FLAG_TAGALTERPRESERVATION) ||
- ((options & ID3_TAG_OPTION_FILEALTERED) &&
- (frame->flags & ID3_FRAME_FLAG_FILEALTERPRESERVATION)))
- return 0;
+ assert(frame);
- /* a frame must be at least 1 byte big, excluding the header */
+ if ((frame->flags & ID3_FRAME_FLAG_TAGALTERPRESERVATION) ||
+ ((options & ID3_TAG_OPTION_FILEALTERED) &&
+ (frame->flags & ID3_FRAME_FLAG_FILEALTERPRESERVATION)))
+ return 0;
- decoded_length = render_data(0, frame->fields, frame->nfields);
- if (decoded_length == 0 && frame->encoded == 0)
- return 0;
+ /*
+ * a frame must be at least 1 byte big, excluding the header
+ */
- /* header */
+ decoded_length = render_data(0, frame->fields, frame->nfields);
+ if (decoded_length == 0 && frame->encoded == 0)
+ return 0;
- size += id3_render_immediate(ptr, frame->id, 4);
+ /*
+ * header
+ */
- if (ptr)
- size_ptr = *ptr;
+ size += id3_render_immediate(ptr, frame->id, 4);
- size += id3_render_syncsafe(ptr, 0, 4);
+ if (ptr)
+ size_ptr = *ptr;
- if (ptr)
- flags_ptr = *ptr;
+ size += id3_render_syncsafe(ptr, 0, 4);
- flags = frame->flags;
+ if (ptr)
+ flags_ptr = *ptr;
- size += id3_render_int(ptr, flags, 2);
+ flags = frame->flags;
- if (flags & (ID3_FRAME_FLAG_FORMATFLAGS & ~ID3_FRAME_FLAG_KNOWNFLAGS)) {
- size += id3_render_binary(ptr, frame->encoded, frame->encoded_length);
- if (size_ptr)
- id3_render_syncsafe(&size_ptr, size - 10, 4);
+ size += id3_render_int(ptr, flags, 2);
- return size;
- }
+ if (flags &
+ (ID3_FRAME_FLAG_FORMATFLAGS & ~ID3_FRAME_FLAG_KNOWNFLAGS)) {
+ size +=
+ id3_render_binary(ptr, frame->encoded,
+ frame->encoded_length);
+ if (size_ptr)
+ id3_render_syncsafe(&size_ptr, size - 10, 4);
- flags &= ID3_FRAME_FLAG_KNOWNFLAGS;
-
- flags &= ~ID3_FRAME_FLAG_UNSYNCHRONISATION;
- if (options & ID3_TAG_OPTION_UNSYNCHRONISATION)
- flags |= ID3_FRAME_FLAG_UNSYNCHRONISATION;
-
- if (!(flags & ID3_FRAME_FLAG_ENCRYPTION)) {
- flags &= ~ID3_FRAME_FLAG_COMPRESSION;
- if (options & ID3_TAG_OPTION_COMPRESSION)
- flags |= ID3_FRAME_FLAG_COMPRESSION | ID3_FRAME_FLAG_DATALENGTHINDICATOR;
- }
+ return size;
+ }
- if (flags & ID3_FRAME_FLAG_GROUPINGIDENTITY)
- size += id3_render_int(ptr, frame->group_id, 1);
- if (flags & ID3_FRAME_FLAG_ENCRYPTION)
- size += id3_render_int(ptr, frame->encryption_method, 1);
- if (flags & ID3_FRAME_FLAG_DATALENGTHINDICATOR) {
- if (flags & ID3_FRAME_FLAG_ENCRYPTION)
- decoded_length = frame->decoded_length;
- size += id3_render_syncsafe(ptr, decoded_length, 4);
- }
+ flags &= ID3_FRAME_FLAG_KNOWNFLAGS;
- if (ptr)
- data = *ptr;
+ flags &= ~ID3_FRAME_FLAG_UNSYNCHRONISATION;
+ if (options & ID3_TAG_OPTION_UNSYNCHRONISATION)
+ flags |= ID3_FRAME_FLAG_UNSYNCHRONISATION;
+
+ if (!(flags & ID3_FRAME_FLAG_ENCRYPTION)) {
+ flags &= ~ID3_FRAME_FLAG_COMPRESSION;
+ if (options & ID3_TAG_OPTION_COMPRESSION)
+ flags |=
+ ID3_FRAME_FLAG_COMPRESSION |
+ ID3_FRAME_FLAG_DATALENGTHINDICATOR;
+ }
- if (flags & ID3_FRAME_FLAG_ENCRYPTION)
- datalen = id3_render_binary(ptr, frame->encoded, frame->encoded_length);
- else {
- if (ptr == 0)
- datalen = decoded_length;
- else {
- datalen = render_data(ptr, frame->fields, frame->nfields);
+ if (flags & ID3_FRAME_FLAG_GROUPINGIDENTITY)
+ size += id3_render_int(ptr, frame->group_id, 1);
+ if (flags & ID3_FRAME_FLAG_ENCRYPTION)
+ size += id3_render_int(ptr, frame->encryption_method, 1);
+ if (flags & ID3_FRAME_FLAG_DATALENGTHINDICATOR) {
+ if (flags & ID3_FRAME_FLAG_ENCRYPTION)
+ decoded_length = frame->decoded_length;
+ size += id3_render_syncsafe(ptr, decoded_length, 4);
+ }
- if (flags & ID3_FRAME_FLAG_COMPRESSION) {
- id3_byte_t *comp;
- id3_length_t complen;
+ if (ptr)
+ data = *ptr;
- comp = id3_util_compress(data, datalen, &complen);
- if (comp == 0)
- flags &= ~ID3_FRAME_FLAG_COMPRESSION;
+ if (flags & ID3_FRAME_FLAG_ENCRYPTION)
+ datalen =
+ id3_render_binary(ptr, frame->encoded,
+ frame->encoded_length);
else {
- *ptr = data;
- datalen = id3_render_binary(ptr, comp, complen);
-
- free(comp);
+ if (ptr == 0)
+ datalen = decoded_length;
+ else {
+ datalen =
+ render_data(ptr, frame->fields,
+ frame->nfields);
+
+ if (flags & ID3_FRAME_FLAG_COMPRESSION) {
+ id3_byte_t *comp;
+ id3_length_t complen;
+
+ comp =
+ id3_util_compress(data, datalen,
+ &complen);
+ if (comp == 0)
+ flags &=
+ ~ID3_FRAME_FLAG_COMPRESSION;
+ else {
+ *ptr = data;
+ datalen =
+ id3_render_binary(ptr, comp,
+ complen);
+
+ free(comp);
+ }
+ }
+ }
}
- }
- }
- }
-
- /* unsynchronisation */
- if (flags & ID3_FRAME_FLAG_UNSYNCHRONISATION) {
- if (data == 0)
- datalen *= 2;
- else {
- id3_length_t newlen;
-
- newlen = id3_util_unsynchronise(data, datalen);
- if (newlen == datalen)
- flags &= ~ID3_FRAME_FLAG_UNSYNCHRONISATION;
- else {
- *ptr += newlen - datalen;
- datalen = newlen;
- }
- }
- }
+ /*
+ * unsynchronisation
+ */
+
+ if (flags & ID3_FRAME_FLAG_UNSYNCHRONISATION) {
+ if (data == 0)
+ datalen *= 2;
+ else {
+ id3_length_t newlen;
+
+ newlen = id3_util_unsynchronise(data, datalen);
+ if (newlen == datalen)
+ flags &= ~ID3_FRAME_FLAG_UNSYNCHRONISATION;
+ else {
+ *ptr += newlen - datalen;
+ datalen = newlen;
+ }
+ }
+ }
- size += datalen;
+ size += datalen;
- /* patch size and flags */
+ /*
+ * patch size and flags
+ */
- if (size_ptr)
- id3_render_syncsafe(&size_ptr, size - 10, 4);
- if (flags_ptr)
- id3_render_int(&flags_ptr, flags, 2);
+ if (size_ptr)
+ id3_render_syncsafe(&size_ptr, size - 10, 4);
+ if (flags_ptr)
+ id3_render_int(&flags_ptr, flags, 2);
- return size;
+ return size;
}
diff --git a/libid3tag/frame.h b/libid3tag/frame.h
index 05c6b04..ca6c4f9 100644
--- a/libid3tag/frame.h
+++ b/libid3tag/frame.h
@@ -19,7 +19,7 @@
* $Id: frame.h,v 1.8 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_FRAME_H
+#ifndef LIBID3TAG_FRAME_H
# define LIBID3TAG_FRAME_H
# include "id3tag.h"
@@ -33,4 +33,4 @@ struct id3_frame *id3_frame_parse(id3_byte_t const **, id3_length_t,
unsigned int);
id3_length_t id3_frame_render(struct id3_frame const *, id3_byte_t **, int);
-# endif
+#endif
diff --git a/libid3tag/frametype.h b/libid3tag/frametype.h
index dd064b2..cdbf217 100644
--- a/libid3tag/frametype.h
+++ b/libid3tag/frametype.h
@@ -19,7 +19,7 @@
* $Id: frametype.h,v 1.7 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_FRAMETYPE_H
+#ifndef LIBID3TAG_FRAMETYPE_H
# define LIBID3TAG_FRAMETYPE_H
struct id3_frametype {
@@ -39,4 +39,4 @@ extern struct id3_frametype const id3_frametype_obsolete;
struct id3_frametype const *id3_frametype_lookup(register char const *,
register unsigned int);
-# endif
+#endif
diff --git a/libid3tag/genre.c b/libid3tag/genre.c
index 32fccb1..24103e8 100644
--- a/libid3tag/genre.c
+++ b/libid3tag/genre.c
@@ -19,133 +19,143 @@
* $Id: genre.c,v 1.8 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include "id3tag.h"
-# include "ucs4.h"
+#include "id3tag.h"
+#include "ucs4.h"
-/* genres are stored in ucs4 format */
-# include "genre.dat"
+/*
+ * genres are stored in ucs4 format
+ */
+#include "genre.dat"
-# define NGENRES (sizeof(genre_table) / sizeof(genre_table[0]))
+#define NGENRES (sizeof(genre_table) / sizeof(genre_table[0]))
/*
- * NAME: genre->index()
- * DESCRIPTION: return an ID3v1 genre string indexed by number
+ * NAME: genre->index()
+ * DESCRIPTION: return an ID3v1 genre string indexed by number
*/
-id3_ucs4_t const *id3_genre_index(unsigned int index)
+id3_ucs4_t const *
+id3_genre_index(unsigned int index)
{
- return (index < NGENRES) ? genre_table[index] : 0;
+ return (index < NGENRES) ? genre_table[index] : 0;
}
/*
- * NAME: genre->name()
- * DESCRIPTION: translate an ID3v2 genre number/keyword to its full name
+ * NAME: genre->name()
+ * DESCRIPTION: translate an ID3v2 genre number/keyword to its full name
*/
-id3_ucs4_t const *id3_genre_name(id3_ucs4_t const *string)
+id3_ucs4_t const *
+id3_genre_name(id3_ucs4_t const *string)
{
- id3_ucs4_t const *ptr;
- static id3_ucs4_t const genre_remix[] = { 'R', 'e', 'm', 'i', 'x', 0 };
- static id3_ucs4_t const genre_cover[] = { 'C', 'o', 'v', 'e', 'r', 0 };
- unsigned long number;
+ id3_ucs4_t const *ptr;
+ static id3_ucs4_t const genre_remix[] =
+ { 'R', 'e', 'm', 'i', 'x', 0 };
+ static id3_ucs4_t const genre_cover[] =
+ { 'C', 'o', 'v', 'e', 'r', 0 };
+ unsigned long number;
- if (string == 0 || *string == 0)
- return id3_ucs4_empty;
+ if (string == 0 || *string == 0)
+ return id3_ucs4_empty;
- if (string[0] == 'R' && string[1] == 'X' && string[2] == 0)
- return genre_remix;
- if (string[0] == 'C' && string[1] == 'R' && string[2] == 0)
- return genre_cover;
+ if (string[0] == 'R' && string[1] == 'X' && string[2] == 0)
+ return genre_remix;
+ if (string[0] == 'C' && string[1] == 'R' && string[2] == 0)
+ return genre_cover;
- for (ptr = string; *ptr; ++ptr) {
- if (*ptr < '0' || *ptr > '9')
- return string;
- }
+ for (ptr = string; *ptr; ++ptr) {
+ if (*ptr < '0' || *ptr > '9')
+ return string;
+ }
- number = id3_ucs4_getnumber(string);
+ number = id3_ucs4_getnumber(string);
- return (number < NGENRES) ? genre_table[number] : string;
+ return (number < NGENRES) ? genre_table[number] : string;
}
/*
- * NAME: translate()
- * DESCRIPTION: return a canonicalized character for testing genre equivalence
+ * NAME: translate()
+ * DESCRIPTION: return a canonicalized character for testing genre equivalence
*/
-static
-id3_ucs4_t translate(id3_ucs4_t ch)
+static id3_ucs4_t
+translate(id3_ucs4_t ch)
{
- if (ch) {
- if (ch >= 'A' && ch <= 'Z')
- ch += 'a' - 'A';
+ if (ch) {
+ if (ch >= 'A' && ch <= 'Z')
+ ch += 'a' - 'A';
- if (ch < 'a' || ch > 'z')
- ch = ID3_UCS4_REPLACEMENTCHAR;
- }
+ if (ch < 'a' || ch > 'z')
+ ch = ID3_UCS4_REPLACEMENTCHAR;
+ }
- return ch;
+ return ch;
}
/*
- * NAME: compare()
- * DESCRIPTION: test two ucs4 genre strings for equivalence
+ * NAME: compare()
+ * DESCRIPTION: test two ucs4 genre strings for equivalence
*/
-static
-int compare(id3_ucs4_t const *str1, id3_ucs4_t const *str2)
+static int
+compare(id3_ucs4_t const *str1, id3_ucs4_t const *str2)
{
- id3_ucs4_t c1, c2;
+ id3_ucs4_t c1,
+ c2;
- if (str1 == str2)
- return 1;
+ if (str1 == str2)
+ return 1;
- do {
- do
- c1 = translate(*str1++);
- while (c1 == ID3_UCS4_REPLACEMENTCHAR);
+ do {
+ do
+ c1 = translate(*str1++);
+ while (c1 == ID3_UCS4_REPLACEMENTCHAR);
- do
- c2 = translate(*str2++);
- while (c2 == ID3_UCS4_REPLACEMENTCHAR);
- }
- while (c1 && c1 == c2);
+ do
+ c2 = translate(*str2++);
+ while (c2 == ID3_UCS4_REPLACEMENTCHAR);
+ }
+ while (c1 && c1 == c2);
- return c1 == c2;
+ return c1 == c2;
}
/*
- * NAME: genre->number()
- * DESCRIPTION: translate an ID3v2 genre name/number to its ID3v1 index number
+ * NAME: genre->number()
+ * DESCRIPTION: translate an ID3v2 genre name/number to its ID3v1 index number
*/
-int id3_genre_number(id3_ucs4_t const *string)
+int
+id3_genre_number(id3_ucs4_t const *string)
{
- id3_ucs4_t const *ptr;
- int i;
+ id3_ucs4_t const *ptr;
+ int i;
- if (string == 0 || *string == 0)
- return -1;
+ if (string == 0 || *string == 0)
+ return -1;
- for (ptr = string; *ptr; ++ptr) {
- if (*ptr < '0' || *ptr > '9')
- break;
- }
+ for (ptr = string; *ptr; ++ptr) {
+ if (*ptr < '0' || *ptr > '9')
+ break;
+ }
- if (*ptr == 0) {
- unsigned long number;
+ if (*ptr == 0) {
+ unsigned long number;
- number = id3_ucs4_getnumber(string);
+ number = id3_ucs4_getnumber(string);
- return (number <= 0xff) ? number : -1;
- }
+ return (number <= 0xff) ? number : -1;
+ }
- for (i = 0; i < NGENRES; ++i) {
- if (compare(string, genre_table[i]))
- return i;
- }
+ for (i = 0; i < NGENRES; ++i) {
+ if (compare(string, genre_table[i]))
+ return i;
+ }
- /* no equivalent */
+ /*
+ * no equivalent
+ */
- return -1;
+ return -1;
}
diff --git a/libid3tag/genre.h b/libid3tag/genre.h
index 56d538a..8deef1c 100644
--- a/libid3tag/genre.h
+++ b/libid3tag/genre.h
@@ -19,9 +19,9 @@
* $Id: genre.h,v 1.6 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_GENRE_H
+#ifndef LIBID3TAG_GENRE_H
# define LIBID3TAG_GENRE_H
# define ID3_GENRE_OTHER 12
-# endif
+#endif
diff --git a/libid3tag/global.h b/libid3tag/global.h
index 377a5e6..37be1df 100644
--- a/libid3tag/global.h
+++ b/libid3tag/global.h
@@ -19,7 +19,7 @@
* $Id: global.h,v 1.9 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_GLOBAL_H
+#ifndef LIBID3TAG_GLOBAL_H
# define LIBID3TAG_GLOBAL_H
/* conditional debugging */
@@ -50,4 +50,4 @@
# endif
# endif
-# endif
+#endif
diff --git a/libid3tag/id3tag.h b/libid3tag/id3tag.h
index 57c7190..69d1d9d 100644
--- a/libid3tag/id3tag.h
+++ b/libid3tag/id3tag.h
@@ -22,7 +22,7 @@
* $Id: id3tag.h,v 1.17 2004/01/23 23:22:46 rob Exp $
*/
-# ifndef LIBID3TAG_ID3TAG_H
+#ifndef LIBID3TAG_ID3TAG_H
# define LIBID3TAG_ID3TAG_H
# ifdef __cplusplus
@@ -362,4 +362,4 @@ extern char const id3_build[];
}
# endif
-# endif
+#endif
diff --git a/libid3tag/latin1.c b/libid3tag/latin1.c
index 67b8199..039df52 100644
--- a/libid3tag/latin1.c
+++ b/libid3tag/latin1.c
@@ -19,199 +19,214 @@
* $Id: latin1.c,v 1.10 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include <stdlib.h>
+#include <stdlib.h>
-# include "id3tag.h"
-# include "latin1.h"
-# include "ucs4.h"
+#include "id3tag.h"
+#include "latin1.h"
+#include "ucs4.h"
/*
- * NAME: latin1->length()
- * DESCRIPTION: return the number of ucs4 chars represented by a latin1 string
+ * NAME: latin1->length()
+ * DESCRIPTION: return the number of ucs4 chars represented by a latin1 string
*/
-id3_length_t id3_latin1_length(id3_latin1_t const *latin1)
+id3_length_t
+id3_latin1_length(id3_latin1_t const *latin1)
{
- id3_latin1_t const *ptr = latin1;
+ id3_latin1_t const *ptr = latin1;
- while (*ptr)
- ++ptr;
+ while (*ptr)
+ ++ptr;
- return ptr - latin1;
+ return ptr - latin1;
}
/*
- * NAME: latin1->size()
- * DESCRIPTION: return the encoding size of a latin1 string
+ * NAME: latin1->size()
+ * DESCRIPTION: return the encoding size of a latin1 string
*/
-id3_length_t id3_latin1_size(id3_latin1_t const *latin1)
+id3_length_t
+id3_latin1_size(id3_latin1_t const *latin1)
{
- return id3_latin1_length(latin1) + 1;
+ return id3_latin1_length(latin1) + 1;
}
/*
- * NAME: latin1->copy()
- * DESCRIPTION: copy a latin1 string
+ * NAME: latin1->copy()
+ * DESCRIPTION: copy a latin1 string
*/
-void id3_latin1_copy(id3_latin1_t *dest, id3_latin1_t const *src)
+void
+id3_latin1_copy(id3_latin1_t * dest, id3_latin1_t const *src)
{
- while ((*dest++ = *src++))
- ;
+ while ((*dest++ = *src++));
}
/*
- * NAME: latin1->duplicate()
- * DESCRIPTION: duplicate a latin1 string
+ * NAME: latin1->duplicate()
+ * DESCRIPTION: duplicate a latin1 string
*/
-id3_latin1_t *id3_latin1_duplicate(id3_latin1_t const *src)
+id3_latin1_t *
+id3_latin1_duplicate(id3_latin1_t const *src)
{
- id3_latin1_t *latin1;
+ id3_latin1_t *latin1;
- latin1 = malloc(id3_latin1_size(src) * sizeof(*latin1));
- if (latin1)
- id3_latin1_copy(latin1, src);
+ latin1 = malloc(id3_latin1_size(src) * sizeof(*latin1));
+ if (latin1)
+ id3_latin1_copy(latin1, src);
- return latin1;
+ return latin1;
}
/*
- * NAME: latin1->ucs4duplicate()
- * DESCRIPTION: duplicate and decode a latin1 string into ucs4
+ * NAME: latin1->ucs4duplicate()
+ * DESCRIPTION: duplicate and decode a latin1 string into ucs4
*/
-id3_ucs4_t *id3_latin1_ucs4duplicate(id3_latin1_t const *latin1)
+id3_ucs4_t *
+id3_latin1_ucs4duplicate(id3_latin1_t const *latin1)
{
- id3_ucs4_t *ucs4;
+ id3_ucs4_t *ucs4;
- ucs4 = malloc((id3_latin1_length(latin1) + 1) * sizeof(*ucs4));
- if (ucs4)
- id3_latin1_decode(latin1, ucs4);
+ ucs4 = malloc((id3_latin1_length(latin1) + 1) * sizeof(*ucs4));
+ if (ucs4)
+ id3_latin1_decode(latin1, ucs4);
- return release(ucs4);
+ return release(ucs4);
}
/*
- * NAME: latin1->decodechar()
- * DESCRIPTION: decode a (single) latin1 char into a single ucs4 char
+ * NAME: latin1->decodechar()
+ * DESCRIPTION: decode a (single) latin1 char into a single ucs4 char
*/
-id3_length_t id3_latin1_decodechar(id3_latin1_t const *latin1,
- id3_ucs4_t *ucs4)
+id3_length_t
+id3_latin1_decodechar(id3_latin1_t const *latin1, id3_ucs4_t * ucs4)
{
- *ucs4 = *latin1;
+ *ucs4 = *latin1;
- return 1;
+ return 1;
}
/*
- * NAME: latin1->encodechar()
- * DESCRIPTION: encode a single ucs4 char into a (single) latin1 char
+ * NAME: latin1->encodechar()
+ * DESCRIPTION: encode a single ucs4 char into a (single) latin1 char
*/
-id3_length_t id3_latin1_encodechar(id3_latin1_t *latin1, id3_ucs4_t ucs4)
+id3_length_t
+id3_latin1_encodechar(id3_latin1_t * latin1, id3_ucs4_t ucs4)
{
- *latin1 = ucs4;
- if (ucs4 > 0x000000ffL)
- *latin1 = ID3_UCS4_REPLACEMENTCHAR;
+ *latin1 = ucs4;
+ if (ucs4 > 0x000000ffL)
+ *latin1 = ID3_UCS4_REPLACEMENTCHAR;
- return 1;
+ return 1;
}
/*
- * NAME: latin1->decode()
- * DESCRIPTION: decode a complete latin1 string into a ucs4 string
+ * NAME: latin1->decode()
+ * DESCRIPTION: decode a complete latin1 string into a ucs4 string
*/
-void id3_latin1_decode(id3_latin1_t const *latin1, id3_ucs4_t *ucs4)
+void
+id3_latin1_decode(id3_latin1_t const *latin1, id3_ucs4_t * ucs4)
{
- do
- latin1 += id3_latin1_decodechar(latin1, ucs4);
- while (*ucs4++);
+ do
+ latin1 += id3_latin1_decodechar(latin1, ucs4);
+ while (*ucs4++);
}
/*
- * NAME: latin1->encode()
- * DESCRIPTION: encode a complete ucs4 string into a latin1 string
+ * NAME: latin1->encode()
+ * DESCRIPTION: encode a complete ucs4 string into a latin1 string
*/
-void id3_latin1_encode(id3_latin1_t *latin1, id3_ucs4_t const *ucs4)
+void
+id3_latin1_encode(id3_latin1_t * latin1, id3_ucs4_t const *ucs4)
{
- do
- latin1 += id3_latin1_encodechar(latin1, *ucs4);
- while (*ucs4++);
+ do
+ latin1 += id3_latin1_encodechar(latin1, *ucs4);
+ while (*ucs4++);
}
/*
- * NAME: latin1->put()
- * DESCRIPTION: serialize a single latin1 character
+ * NAME: latin1->put()
+ * DESCRIPTION: serialize a single latin1 character
*/
-id3_length_t id3_latin1_put(id3_byte_t **ptr, id3_latin1_t latin1)
+id3_length_t
+id3_latin1_put(id3_byte_t ** ptr, id3_latin1_t latin1)
{
- if (ptr)
- *(*ptr)++ = latin1;
+ if (ptr)
+ *(*ptr)++ = latin1;
- return 1;
+ return 1;
}
/*
- * NAME: latin1->get()
- * DESCRIPTION: deserialize a single latin1 character
+ * NAME: latin1->get()
+ * DESCRIPTION: deserialize a single latin1 character
*/
-id3_latin1_t id3_latin1_get(id3_byte_t const **ptr)
+id3_latin1_t
+id3_latin1_get(id3_byte_t const **ptr)
{
- return *(*ptr)++;
+ return *(*ptr)++;
}
/*
- * NAME: latin1->serialize()
- * DESCRIPTION: serialize a ucs4 string using latin1 encoding
+ * NAME: latin1->serialize()
+ * DESCRIPTION: serialize a ucs4 string using latin1 encoding
*/
-id3_length_t id3_latin1_serialize(id3_byte_t **ptr, id3_ucs4_t const *ucs4,
- int terminate)
+id3_length_t
+id3_latin1_serialize(id3_byte_t ** ptr, id3_ucs4_t const *ucs4,
+ int terminate)
{
- id3_length_t size = 0;
- id3_latin1_t latin1[1], *out;
-
- while (*ucs4) {
- switch (id3_latin1_encodechar(out = latin1, *ucs4++)) {
- case 1: size += id3_latin1_put(ptr, *out++);
- case 0: break;
- }
- }
-
- if (terminate)
- size += id3_latin1_put(ptr, 0);
-
- return size;
+ id3_length_t size = 0;
+ id3_latin1_t latin1[1],
+ *out;
+
+ while (*ucs4) {
+ switch (id3_latin1_encodechar(out = latin1, *ucs4++)) {
+ case 1:
+ size += id3_latin1_put(ptr, *out++);
+ case 0:
+ break;
+ }
+ }
+
+ if (terminate)
+ size += id3_latin1_put(ptr, 0);
+
+ return size;
}
/*
- * NAME: latin1->deserialize()
- * DESCRIPTION: deserialize a ucs4 string using latin1 encoding
+ * NAME: latin1->deserialize()
+ * DESCRIPTION: deserialize a ucs4 string using latin1 encoding
*/
-id3_ucs4_t *id3_latin1_deserialize(id3_byte_t const **ptr, id3_length_t length)
+id3_ucs4_t *
+id3_latin1_deserialize(id3_byte_t const **ptr, id3_length_t length)
{
- id3_byte_t const *end;
- id3_latin1_t *latin1ptr, *latin1;
- id3_ucs4_t *ucs4;
+ id3_byte_t const *end;
+ id3_latin1_t *latin1ptr,
+ *latin1;
+ id3_ucs4_t *ucs4;
- end = *ptr + length;
+ end = *ptr + length;
- latin1 = malloc((length + 1) * sizeof(*latin1));
- if (latin1 == 0)
- return 0;
+ latin1 = malloc((length + 1) * sizeof(*latin1));
+ if (latin1 == 0)
+ return 0;
- latin1ptr = latin1;
- while (end - *ptr > 0 && (*latin1ptr = id3_latin1_get(ptr)))
- ++latin1ptr;
+ latin1ptr = latin1;
+ while (end - *ptr > 0 && (*latin1ptr = id3_latin1_get(ptr)))
+ ++latin1ptr;
- *latin1ptr = 0;
+ *latin1ptr = 0;
- ucs4 = malloc((id3_latin1_length(latin1) + 1) * sizeof(*ucs4));
- if (ucs4)
- id3_latin1_decode(latin1, ucs4);
+ ucs4 = malloc((id3_latin1_length(latin1) + 1) * sizeof(*ucs4));
+ if (ucs4)
+ id3_latin1_decode(latin1, ucs4);
- free(latin1);
+ free(latin1);
- return ucs4;
+ return ucs4;
}
diff --git a/libid3tag/latin1.h b/libid3tag/latin1.h
index 3604bbf..1595548 100644
--- a/libid3tag/latin1.h
+++ b/libid3tag/latin1.h
@@ -19,7 +19,7 @@
* $Id: latin1.h,v 1.8 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_LATIN1_H
+#ifndef LIBID3TAG_LATIN1_H
# define LIBID3TAG_LATIN1_H
# include "id3tag.h"
@@ -42,4 +42,4 @@ id3_latin1_t id3_latin1_get(id3_byte_t const **);
id3_length_t id3_latin1_serialize(id3_byte_t **, id3_ucs4_t const *, int);
id3_ucs4_t *id3_latin1_deserialize(id3_byte_t const **, id3_length_t);
-# endif
+#endif
diff --git a/libid3tag/parse.c b/libid3tag/parse.c
index 86a3f21..224e505 100644
--- a/libid3tag/parse.c
+++ b/libid3tag/parse.c
@@ -19,178 +19,197 @@
* $Id: parse.c,v 1.9 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# ifdef HAVE_ASSERT_H
-# include <assert.h>
-# endif
+#ifdef HAVE_ASSERT_H
+# include <assert.h>
+#endif
-# include <stdlib.h>
-# include <string.h>
+#include <stdlib.h>
+#include <string.h>
-# include "id3tag.h"
-# include "parse.h"
-# include "latin1.h"
-# include "utf16.h"
-# include "utf8.h"
+#include "id3tag.h"
+#include "parse.h"
+#include "latin1.h"
+#include "utf16.h"
+#include "utf8.h"
-signed long id3_parse_int(id3_byte_t const **ptr, unsigned int bytes)
+signed long
+id3_parse_int(id3_byte_t const **ptr, unsigned int bytes)
{
- signed long value = 0;
+ signed long value = 0;
- assert(bytes >= 1 && bytes <= 4);
+ assert(bytes >= 1 && bytes <= 4);
- if (**ptr & 0x80)
- value = ~0;
+ if (**ptr & 0x80)
+ value = ~0;
- switch (bytes) {
- case 4: value = (value << 8) | *(*ptr)++;
- case 3: value = (value << 8) | *(*ptr)++;
- case 2: value = (value << 8) | *(*ptr)++;
- case 1: value = (value << 8) | *(*ptr)++;
- }
+ switch (bytes) {
+ case 4:
+ value = (value << 8) | *(*ptr)++;
+ case 3:
+ value = (value << 8) | *(*ptr)++;
+ case 2:
+ value = (value << 8) | *(*ptr)++;
+ case 1:
+ value = (value << 8) | *(*ptr)++;
+ }
- return value;
+ return value;
}
-unsigned long id3_parse_uint(id3_byte_t const **ptr, unsigned int bytes)
+unsigned long
+id3_parse_uint(id3_byte_t const **ptr, unsigned int bytes)
{
- unsigned long value = 0;
-
- assert(bytes >= 1 && bytes <= 4);
-
- switch (bytes) {
- case 4: value = (value << 8) | *(*ptr)++;
- case 3: value = (value << 8) | *(*ptr)++;
- case 2: value = (value << 8) | *(*ptr)++;
- case 1: value = (value << 8) | *(*ptr)++;
- }
-
- return value;
+ unsigned long value = 0;
+
+ assert(bytes >= 1 && bytes <= 4);
+
+ switch (bytes) {
+ case 4:
+ value = (value << 8) | *(*ptr)++;
+ case 3:
+ value = (value << 8) | *(*ptr)++;
+ case 2:
+ value = (value << 8) | *(*ptr)++;
+ case 1:
+ value = (value << 8) | *(*ptr)++;
+ }
+
+ return value;
}
-unsigned long id3_parse_syncsafe(id3_byte_t const **ptr, unsigned int bytes)
+unsigned long
+id3_parse_syncsafe(id3_byte_t const **ptr, unsigned int bytes)
{
- unsigned long value = 0;
+ unsigned long value = 0;
- assert(bytes == 4 || bytes == 5);
+ assert(bytes == 4 || bytes == 5);
- switch (bytes) {
- case 5: value = (value << 4) | (*(*ptr)++ & 0x0f);
- case 4: value = (value << 7) | (*(*ptr)++ & 0x7f);
- value = (value << 7) | (*(*ptr)++ & 0x7f);
- value = (value << 7) | (*(*ptr)++ & 0x7f);
- value = (value << 7) | (*(*ptr)++ & 0x7f);
- }
+ switch (bytes) {
+ case 5:
+ value = (value << 4) | (*(*ptr)++ & 0x0f);
+ case 4:
+ value = (value << 7) | (*(*ptr)++ & 0x7f);
+ value = (value << 7) | (*(*ptr)++ & 0x7f);
+ value = (value << 7) | (*(*ptr)++ & 0x7f);
+ value = (value << 7) | (*(*ptr)++ & 0x7f);
+ }
- return value;
+ return value;
}
-void id3_parse_immediate(id3_byte_t const **ptr, unsigned int bytes,
- char *value)
+void
+id3_parse_immediate(id3_byte_t const **ptr, unsigned int bytes,
+ char *value)
{
- assert(value);
- assert(bytes == 8 || bytes == 4 || bytes == 3);
-
- switch (bytes) {
- case 8: *value++ = *(*ptr)++;
- *value++ = *(*ptr)++;
- *value++ = *(*ptr)++;
- *value++ = *(*ptr)++;
- case 4: *value++ = *(*ptr)++;
- case 3: *value++ = *(*ptr)++;
- *value++ = *(*ptr)++;
- *value++ = *(*ptr)++;
- }
-
- *value = 0;
+ assert(value);
+ assert(bytes == 8 || bytes == 4 || bytes == 3);
+
+ switch (bytes) {
+ case 8:
+ *value++ = *(*ptr)++;
+ *value++ = *(*ptr)++;
+ *value++ = *(*ptr)++;
+ *value++ = *(*ptr)++;
+ case 4:
+ *value++ = *(*ptr)++;
+ case 3:
+ *value++ = *(*ptr)++;
+ *value++ = *(*ptr)++;
+ *value++ = *(*ptr)++;
+ }
+
+ *value = 0;
}
-id3_latin1_t *id3_parse_latin1(id3_byte_t const **ptr, id3_length_t length,
- int full)
+id3_latin1_t *
+id3_parse_latin1(id3_byte_t const **ptr, id3_length_t length, int full)
{
- id3_byte_t const *end;
- int terminated = 0;
- id3_latin1_t *latin1;
-
- end = memchr(*ptr, 0, length);
- if (end == 0)
- end = *ptr + length;
- else {
- length = end - *ptr;
- terminated = 1;
- }
-
- latin1 = malloc(length + 1);
- if (latin1) {
- memcpy(latin1, *ptr, length);
- latin1[length] = 0;
-
- if (!full) {
- id3_latin1_t *check;
-
- for (check = latin1; *check; ++check) {
- if (*check == '\n')
- *check = ' ';
- }
- }
- }
-
- *ptr += length + terminated;
-
- return latin1;
+ id3_byte_t const *end;
+ int terminated = 0;
+ id3_latin1_t *latin1;
+
+ end = memchr(*ptr, 0, length);
+ if (end == 0)
+ end = *ptr + length;
+ else {
+ length = end - *ptr;
+ terminated = 1;
+ }
+
+ latin1 = malloc(length + 1);
+ if (latin1) {
+ memcpy(latin1, *ptr, length);
+ latin1[length] = 0;
+
+ if (!full) {
+ id3_latin1_t *check;
+
+ for (check = latin1; *check; ++check) {
+ if (*check == '\n')
+ *check = ' ';
+ }
+ }
+ }
+
+ *ptr += length + terminated;
+
+ return latin1;
}
-id3_ucs4_t *id3_parse_string(id3_byte_t const **ptr, id3_length_t length,
- enum id3_field_textencoding encoding, int full)
+id3_ucs4_t *
+id3_parse_string(id3_byte_t const **ptr, id3_length_t length,
+ enum id3_field_textencoding encoding, int full)
{
- id3_ucs4_t *ucs4 = 0;
- enum id3_utf16_byteorder byteorder = ID3_UTF16_BYTEORDER_ANY;
-
- switch (encoding) {
- case ID3_FIELD_TEXTENCODING_ISO_8859_1:
- ucs4 = id3_latin1_deserialize(ptr, length);
- break;
-
- case ID3_FIELD_TEXTENCODING_UTF_16BE:
- byteorder = ID3_UTF16_BYTEORDER_BE;
- case ID3_FIELD_TEXTENCODING_UTF_16:
- ucs4 = id3_utf16_deserialize(ptr, length, byteorder);
- break;
-
- case ID3_FIELD_TEXTENCODING_UTF_8:
- ucs4 = id3_utf8_deserialize(ptr, length);
- break;
- }
-
- if (ucs4 && !full) {
- id3_ucs4_t *check;
-
- for (check = ucs4; *check; ++check) {
- if (*check == '\n')
- *check = ' ';
- }
- }
-
- return ucs4;
+ id3_ucs4_t *ucs4 = 0;
+ enum id3_utf16_byteorder byteorder = ID3_UTF16_BYTEORDER_ANY;
+
+ switch (encoding) {
+ case ID3_FIELD_TEXTENCODING_ISO_8859_1:
+ ucs4 = id3_latin1_deserialize(ptr, length);
+ break;
+
+ case ID3_FIELD_TEXTENCODING_UTF_16BE:
+ byteorder = ID3_UTF16_BYTEORDER_BE;
+ case ID3_FIELD_TEXTENCODING_UTF_16:
+ ucs4 = id3_utf16_deserialize(ptr, length, byteorder);
+ break;
+
+ case ID3_FIELD_TEXTENCODING_UTF_8:
+ ucs4 = id3_utf8_deserialize(ptr, length);
+ break;
+ }
+
+ if (ucs4 && !full) {
+ id3_ucs4_t *check;
+
+ for (check = ucs4; *check; ++check) {
+ if (*check == '\n')
+ *check = ' ';
+ }
+ }
+
+ return ucs4;
}
-id3_byte_t *id3_parse_binary(id3_byte_t const **ptr, id3_length_t length)
+id3_byte_t *
+id3_parse_binary(id3_byte_t const **ptr, id3_length_t length)
{
- id3_byte_t *data;
+ id3_byte_t *data;
- if (length == 0)
- return malloc(1);
+ if (length == 0)
+ return malloc(1);
- data = malloc(length);
- if (data)
- memcpy(data, *ptr, length);
+ data = malloc(length);
+ if (data)
+ memcpy(data, *ptr, length);
- *ptr += length;
+ *ptr += length;
- return data;
+ return data;
}
diff --git a/libid3tag/parse.h b/libid3tag/parse.h
index 5dfa23f..6c1e85e 100644
--- a/libid3tag/parse.h
+++ b/libid3tag/parse.h
@@ -19,7 +19,7 @@
* $Id: parse.h,v 1.6 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_PARSE_H
+#ifndef LIBID3TAG_PARSE_H
# define LIBID3TAG_PARSE_H
signed long id3_parse_int(id3_byte_t const **, unsigned int);
@@ -31,4 +31,4 @@ id3_ucs4_t *id3_parse_string(id3_byte_t const **, id3_length_t,
enum id3_field_textencoding, int);
id3_byte_t *id3_parse_binary(id3_byte_t const **, id3_length_t);
-# endif
+#endif
diff --git a/libid3tag/render.c b/libid3tag/render.c
index 668a487..431c28d 100644
--- a/libid3tag/render.c
+++ b/libid3tag/render.c
@@ -19,182 +19,202 @@
* $Id: render.c,v 1.11 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include <string.h>
-# include <stdlib.h>
+#include <string.h>
+#include <stdlib.h>
-# ifdef HAVE_ASSERT_H
-# include <assert.h>
-# endif
+#ifdef HAVE_ASSERT_H
+# include <assert.h>
+#endif
-# include "id3tag.h"
-# include "render.h"
-# include "ucs4.h"
-# include "latin1.h"
-# include "utf16.h"
-# include "utf8.h"
+#include "id3tag.h"
+#include "render.h"
+#include "ucs4.h"
+#include "latin1.h"
+#include "utf16.h"
+#include "utf8.h"
-id3_length_t id3_render_immediate(id3_byte_t **ptr,
- char const *value, unsigned int bytes)
+id3_length_t
+id3_render_immediate(id3_byte_t ** ptr,
+ char const *value, unsigned int bytes)
{
- assert(value);
- assert(bytes == 8 || bytes == 4 || bytes == 3);
-
- if (ptr) {
- switch (bytes) {
- case 8: *(*ptr)++ = *value++;
- *(*ptr)++ = *value++;
- *(*ptr)++ = *value++;
- *(*ptr)++ = *value++;
- case 4: *(*ptr)++ = *value++;
- case 3: *(*ptr)++ = *value++;
- *(*ptr)++ = *value++;
- *(*ptr)++ = *value++;
- }
- }
-
- return bytes;
+ assert(value);
+ assert(bytes == 8 || bytes == 4 || bytes == 3);
+
+ if (ptr) {
+ switch (bytes) {
+ case 8:
+ *(*ptr)++ = *value++;
+ *(*ptr)++ = *value++;
+ *(*ptr)++ = *value++;
+ *(*ptr)++ = *value++;
+ case 4:
+ *(*ptr)++ = *value++;
+ case 3:
+ *(*ptr)++ = *value++;
+ *(*ptr)++ = *value++;
+ *(*ptr)++ = *value++;
+ }
+ }
+
+ return bytes;
}
-id3_length_t id3_render_syncsafe(id3_byte_t **ptr,
- unsigned long num, unsigned int bytes)
+id3_length_t
+id3_render_syncsafe(id3_byte_t ** ptr,
+ unsigned long num, unsigned int bytes)
{
- assert(bytes == 4 || bytes == 5);
-
- if (ptr) {
- switch (bytes) {
- case 5: *(*ptr)++ = (num >> 28) & 0x0f;
- case 4: *(*ptr)++ = (num >> 21) & 0x7f;
- *(*ptr)++ = (num >> 14) & 0x7f;
- *(*ptr)++ = (num >> 7) & 0x7f;
- *(*ptr)++ = (num >> 0) & 0x7f;
- }
- }
-
- return bytes;
+ assert(bytes == 4 || bytes == 5);
+
+ if (ptr) {
+ switch (bytes) {
+ case 5:
+ *(*ptr)++ = (num >> 28) & 0x0f;
+ case 4:
+ *(*ptr)++ = (num >> 21) & 0x7f;
+ *(*ptr)++ = (num >> 14) & 0x7f;
+ *(*ptr)++ = (num >> 7) & 0x7f;
+ *(*ptr)++ = (num >> 0) & 0x7f;
+ }
+ }
+
+ return bytes;
}
-id3_length_t id3_render_int(id3_byte_t **ptr,
- signed long num, unsigned int bytes)
+id3_length_t
+id3_render_int(id3_byte_t ** ptr, signed long num, unsigned int bytes)
{
- assert(bytes >= 1 && bytes <= 4);
-
- if (ptr) {
- switch (bytes) {
- case 4: *(*ptr)++ = num >> 24;
- case 3: *(*ptr)++ = num >> 16;
- case 2: *(*ptr)++ = num >> 8;
- case 1: *(*ptr)++ = num >> 0;
- }
- }
-
- return bytes;
+ assert(bytes >= 1 && bytes <= 4);
+
+ if (ptr) {
+ switch (bytes) {
+ case 4:
+ *(*ptr)++ = num >> 24;
+ case 3:
+ *(*ptr)++ = num >> 16;
+ case 2:
+ *(*ptr)++ = num >> 8;
+ case 1:
+ *(*ptr)++ = num >> 0;
+ }
+ }
+
+ return bytes;
}
-id3_length_t id3_render_binary(id3_byte_t **ptr,
- id3_byte_t const *data, id3_length_t length)
+id3_length_t
+id3_render_binary(id3_byte_t ** ptr,
+ id3_byte_t const *data, id3_length_t length)
{
- if (data == 0)
- return 0;
+ if (data == 0)
+ return 0;
- if (ptr) {
- memcpy(*ptr, data, length);
- *ptr += length;
- }
+ if (ptr) {
+ memcpy(*ptr, data, length);
+ *ptr += length;
+ }
- return length;
+ return length;
}
-id3_length_t id3_render_latin1(id3_byte_t **ptr,
- id3_latin1_t const *latin1, int terminate)
+id3_length_t
+id3_render_latin1(id3_byte_t ** ptr,
+ id3_latin1_t const *latin1, int terminate)
{
- id3_length_t size;
+ id3_length_t size;
- if (latin1 == 0)
- latin1 = "";
+ if (latin1 == 0)
+ latin1 = "";
- size = id3_latin1_size(latin1);
- if (!terminate)
- --size;
+ size = id3_latin1_size(latin1);
+ if (!terminate)
+ --size;
- if (ptr) {
- memcpy(*ptr, latin1, size);
- *ptr += size;
- }
+ if (ptr) {
+ memcpy(*ptr, latin1, size);
+ *ptr += size;
+ }
- return size;
+ return size;
}
-id3_length_t id3_render_string(id3_byte_t **ptr, id3_ucs4_t const *ucs4,
- enum id3_field_textencoding encoding,
- int terminate)
+id3_length_t
+id3_render_string(id3_byte_t ** ptr, id3_ucs4_t const *ucs4,
+ enum id3_field_textencoding encoding, int terminate)
{
- enum id3_utf16_byteorder byteorder = ID3_UTF16_BYTEORDER_ANY;
+ enum id3_utf16_byteorder byteorder = ID3_UTF16_BYTEORDER_ANY;
- if (ucs4 == 0)
- ucs4 = id3_ucs4_empty;
+ if (ucs4 == 0)
+ ucs4 = id3_ucs4_empty;
- switch (encoding) {
- case ID3_FIELD_TEXTENCODING_ISO_8859_1:
- return id3_latin1_serialize(ptr, ucs4, terminate);
+ switch (encoding) {
+ case ID3_FIELD_TEXTENCODING_ISO_8859_1:
+ return id3_latin1_serialize(ptr, ucs4, terminate);
- case ID3_FIELD_TEXTENCODING_UTF_16BE:
- byteorder = ID3_UTF16_BYTEORDER_BE;
- case ID3_FIELD_TEXTENCODING_UTF_16:
- return id3_utf16_serialize(ptr, ucs4, byteorder, terminate);
+ case ID3_FIELD_TEXTENCODING_UTF_16BE:
+ byteorder = ID3_UTF16_BYTEORDER_BE;
+ case ID3_FIELD_TEXTENCODING_UTF_16:
+ return id3_utf16_serialize(ptr, ucs4, byteorder,
+ terminate);
- case ID3_FIELD_TEXTENCODING_UTF_8:
- return id3_utf8_serialize(ptr, ucs4, terminate);
- }
+ case ID3_FIELD_TEXTENCODING_UTF_8:
+ return id3_utf8_serialize(ptr, ucs4, terminate);
+ }
- return 0;
+ return 0;
}
-id3_length_t id3_render_padding(id3_byte_t **ptr, id3_byte_t value,
- id3_length_t length)
+id3_length_t
+id3_render_padding(id3_byte_t ** ptr, id3_byte_t value,
+ id3_length_t length)
{
- if (ptr) {
- memset(*ptr, value, length);
- *ptr += length;
- }
+ if (ptr) {
+ memset(*ptr, value, length);
+ *ptr += length;
+ }
- return length;
+ return length;
}
/*
- * NAME: render->paddedstring()
- * DESCRIPTION: render a space-padded string using latin1 encoding
+ * NAME: render->paddedstring()
+ * DESCRIPTION: render a space-padded string using latin1 encoding
*/
-id3_length_t id3_render_paddedstring(id3_byte_t **ptr, id3_ucs4_t const *ucs4,
- id3_length_t length)
+id3_length_t
+id3_render_paddedstring(id3_byte_t ** ptr, id3_ucs4_t const *ucs4,
+ id3_length_t length)
{
- id3_ucs4_t padded[31], *data, *end;
+ id3_ucs4_t padded[31],
+ *data,
+ *end;
- /* latin1 encoding only (this is used for ID3v1 fields) */
+ /*
+ * latin1 encoding only (this is used for ID3v1 fields)
+ */
- assert(length <= 30);
+ assert(length <= 30);
- data = padded;
- end = data + length;
+ data = padded;
+ end = data + length;
- if (ucs4) {
- while (*ucs4 && end - data > 0) {
- *data++ = *ucs4++;
+ if (ucs4) {
+ while (*ucs4 && end - data > 0) {
+ *data++ = *ucs4++;
- if (data[-1] == '\n')
- data[-1] = ' ';
- }
- }
+ if (data[-1] == '\n')
+ data[-1] = ' ';
+ }
+ }
- while (end - data > 0)
- *data++ = ' ';
+ while (end - data > 0)
+ *data++ = ' ';
- *data = 0;
+ *data = 0;
- return id3_latin1_serialize(ptr, padded, 0);
+ return id3_latin1_serialize(ptr, padded, 0);
}
diff --git a/libid3tag/render.h b/libid3tag/render.h
index 702605d..1e2ebcf 100644
--- a/libid3tag/render.h
+++ b/libid3tag/render.h
@@ -19,7 +19,7 @@
* $Id: render.h,v 1.7 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_RENDER_H
+#ifndef LIBID3TAG_RENDER_H
# define LIBID3TAG_RENDER_H
# include "id3tag.h"
@@ -37,4 +37,4 @@ id3_length_t id3_render_padding(id3_byte_t **, id3_byte_t, id3_length_t);
id3_length_t id3_render_paddedstring(id3_byte_t **, id3_ucs4_t const *,
id3_length_t);
-# endif
+#endif
diff --git a/libid3tag/tag.c b/libid3tag/tag.c
index be4e8e7..11e3b13 100644
--- a/libid3tag/tag.c
+++ b/libid3tag/tag.c
@@ -19,891 +19,1031 @@
* $Id: tag.c,v 1.20 2004/02/17 02:04:10 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
-
-# include "global.h"
-
-# include <string.h>
-# include <stdlib.h>
-
-# ifdef HAVE_ASSERT_H
-# include <assert.h>
-# endif
-
-# include "id3tag.h"
-# include "tag.h"
-# include "frame.h"
-# include "compat.h"
-# include "parse.h"
-# include "render.h"
-# include "latin1.h"
-# include "ucs4.h"
-# include "genre.h"
-# include "crc.h"
-# include "field.h"
-# include "util.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "global.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef HAVE_ASSERT_H
+# include <assert.h>
+#endif
+
+#include "id3tag.h"
+#include "tag.h"
+#include "frame.h"
+#include "compat.h"
+#include "parse.h"
+#include "render.h"
+#include "latin1.h"
+#include "ucs4.h"
+#include "genre.h"
+#include "crc.h"
+#include "field.h"
+#include "util.h"
/*
- * NAME: tag->new()
- * DESCRIPTION: allocate and return a new, empty tag
+ * NAME: tag->new()
+ * DESCRIPTION: allocate and return a new, empty tag
*/
-struct id3_tag *id3_tag_new(void)
+struct id3_tag *
+id3_tag_new(void)
{
- struct id3_tag *tag;
-
- tag = malloc(sizeof(*tag));
- if (tag) {
- tag->refcount = 0;
- tag->version = ID3_TAG_VERSION;
- tag->flags = 0;
- tag->extendedflags = 0;
- tag->restrictions = 0;
- tag->options = /* ID3_TAG_OPTION_UNSYNCHRONISATION | */
- ID3_TAG_OPTION_COMPRESSION | ID3_TAG_OPTION_CRC;
- tag->nframes = 0;
- tag->frames = 0;
- tag->paddedsize = 0;
- }
-
- return tag;
+ struct id3_tag *tag;
+
+ tag = malloc(sizeof(*tag));
+ if (tag) {
+ tag->refcount = 0;
+ tag->version = ID3_TAG_VERSION;
+ tag->flags = 0;
+ tag->extendedflags = 0;
+ tag->restrictions = 0;
+ tag->options = /* ID3_TAG_OPTION_UNSYNCHRONISATION | */
+ ID3_TAG_OPTION_COMPRESSION | ID3_TAG_OPTION_CRC;
+ tag->nframes = 0;
+ tag->frames = 0;
+ tag->paddedsize = 0;
+ }
+
+ return tag;
}
/*
- * NAME: tag->delete()
- * DESCRIPTION: destroy a tag and deallocate all associated memory
+ * NAME: tag->delete()
+ * DESCRIPTION: destroy a tag and deallocate all associated memory
*/
-void id3_tag_delete(struct id3_tag *tag)
+void
+id3_tag_delete(struct id3_tag *tag)
{
- assert(tag);
+ assert(tag);
- if (tag->refcount == 0) {
- id3_tag_clearframes(tag);
+ if (tag->refcount == 0) {
+ id3_tag_clearframes(tag);
- if (tag->frames)
- free(tag->frames);
+ if (tag->frames)
+ free(tag->frames);
- free(tag);
- }
+ free(tag);
+ }
}
/*
- * NAME: tag->addref()
- * DESCRIPTION: add an external reference to a tag
+ * NAME: tag->addref()
+ * DESCRIPTION: add an external reference to a tag
*/
-void id3_tag_addref(struct id3_tag *tag)
+void
+id3_tag_addref(struct id3_tag *tag)
{
- assert(tag);
+ assert(tag);
- ++tag->refcount;
+ ++tag->refcount;
}
/*
- * NAME: tag->delref()
- * DESCRIPTION: remove an external reference to a tag
+ * NAME: tag->delref()
+ * DESCRIPTION: remove an external reference to a tag
*/
-void id3_tag_delref(struct id3_tag *tag)
+void
+id3_tag_delref(struct id3_tag *tag)
{
- assert(tag && tag->refcount > 0);
+ assert(tag && tag->refcount > 0);
- --tag->refcount;
+ --tag->refcount;
}
/*
- * NAME: tag->version()
- * DESCRIPTION: return the tag's original ID3 version number
+ * NAME: tag->version()
+ * DESCRIPTION: return the tag's original ID3 version number
*/
-unsigned int id3_tag_version(struct id3_tag const *tag)
+unsigned int
+id3_tag_version(struct id3_tag const *tag)
{
- assert(tag);
+ assert(tag);
- return tag->version;
+ return tag->version;
}
/*
- * NAME: tag->options()
- * DESCRIPTION: get or set tag options
+ * NAME: tag->options()
+ * DESCRIPTION: get or set tag options
*/
-int id3_tag_options(struct id3_tag *tag, int mask, int values)
+int
+id3_tag_options(struct id3_tag *tag, int mask, int values)
{
- assert(tag);
+ assert(tag);
- if (mask)
- tag->options = (tag->options & ~mask) | (values & mask);
+ if (mask)
+ tag->options = (tag->options & ~mask) | (values & mask);
- return tag->options;
+ return tag->options;
}
/*
- * NAME: tag->setlength()
- * DESCRIPTION: set the minimum rendered tag size
+ * NAME: tag->setlength()
+ * DESCRIPTION: set the minimum rendered tag size
*/
-void id3_tag_setlength(struct id3_tag *tag, id3_length_t length)
+void
+id3_tag_setlength(struct id3_tag *tag, id3_length_t length)
{
- assert(tag);
+ assert(tag);
- tag->paddedsize = length;
+ tag->paddedsize = length;
}
/*
- * NAME: tag->clearframes()
- * DESCRIPTION: detach and delete all frames associated with a tag
+ * NAME: tag->clearframes()
+ * DESCRIPTION: detach and delete all frames associated with a tag
*/
-void id3_tag_clearframes(struct id3_tag *tag)
+void
+id3_tag_clearframes(struct id3_tag *tag)
{
- unsigned int i;
+ unsigned int i;
- assert(tag);
+ assert(tag);
- for (i = 0; i < tag->nframes; ++i) {
- id3_frame_delref(tag->frames[i]);
- id3_frame_delete(tag->frames[i]);
- }
+ for (i = 0; i < tag->nframes; ++i) {
+ id3_frame_delref(tag->frames[i]);
+ id3_frame_delete(tag->frames[i]);
+ }
- tag->nframes = 0;
+ tag->nframes = 0;
}
/*
- * NAME: tag->attachframe()
- * DESCRIPTION: attach a frame to a tag
+ * NAME: tag->attachframe()
+ * DESCRIPTION: attach a frame to a tag
*/
-int id3_tag_attachframe(struct id3_tag *tag, struct id3_frame *frame)
+int
+id3_tag_attachframe(struct id3_tag *tag, struct id3_frame *frame)
{
- struct id3_frame **frames;
+ struct id3_frame **frames;
- assert(tag && frame);
+ assert(tag && frame);
- frames = realloc(tag->frames, (tag->nframes + 1) * sizeof(*frames));
- if (frames == 0)
- return -1;
+ frames =
+ realloc(tag->frames, (tag->nframes + 1) * sizeof(*frames));
+ if (frames == 0)
+ return -1;
- tag->frames = frames;
- tag->frames[tag->nframes++] = frame;
+ tag->frames = frames;
+ tag->frames[tag->nframes++] = frame;
- id3_frame_addref(frame);
+ id3_frame_addref(frame);
- return 0;
+ return 0;
}
/*
- * NAME: tag->detachframe()
- * DESCRIPTION: detach (but don't delete) a frame from a tag
+ * NAME: tag->detachframe()
+ * DESCRIPTION: detach (but don't delete) a frame from a tag
*/
-int id3_tag_detachframe(struct id3_tag *tag, struct id3_frame *frame)
+int
+id3_tag_detachframe(struct id3_tag *tag, struct id3_frame *frame)
{
- unsigned int i;
+ unsigned int i;
- assert(tag && frame);
+ assert(tag && frame);
- for (i = 0; i < tag->nframes; ++i) {
- if (tag->frames[i] == frame)
- break;
- }
+ for (i = 0; i < tag->nframes; ++i) {
+ if (tag->frames[i] == frame)
+ break;
+ }
- if (i == tag->nframes)
- return -1;
+ if (i == tag->nframes)
+ return -1;
- --tag->nframes;
- while (i++ < tag->nframes)
- tag->frames[i - 1] = tag->frames[i];
+ --tag->nframes;
+ while (i++ < tag->nframes)
+ tag->frames[i - 1] = tag->frames[i];
- id3_frame_delref(frame);
+ id3_frame_delref(frame);
- return 0;
+ return 0;
}
/*
- * NAME: tag->findframe()
- * DESCRIPTION: find in a tag the nth (0-based) frame with the given frame ID
+ * NAME: tag->findframe()
+ * DESCRIPTION: find in a tag the nth (0-based) frame with the given frame ID
*/
-struct id3_frame *id3_tag_findframe(struct id3_tag const *tag,
- char const *id, unsigned int index)
+struct id3_frame *
+id3_tag_findframe(struct id3_tag const *tag,
+ char const *id, unsigned int index)
{
- unsigned int len, i;
+ unsigned int len,
+ i;
- assert(tag);
+ assert(tag);
- if (id == 0 || *id == 0)
- return (index < tag->nframes) ? tag->frames[index] : 0;
+ if (id == 0 || *id == 0)
+ return (index < tag->nframes) ? tag->frames[index] : 0;
- len = strlen(id);
+ len = strlen(id);
- if (len == 4) {
- struct id3_compat const *compat;
+ if (len == 4) {
+ struct id3_compat const *compat;
- compat = id3_compat_lookup(id, len);
- if (compat && compat->equiv && !compat->translate) {
- id = compat->equiv;
- len = strlen(id);
- }
- }
+ compat = id3_compat_lookup(id, len);
+ if (compat && compat->equiv && !compat->translate) {
+ id = compat->equiv;
+ len = strlen(id);
+ }
+ }
- for (i = 0; i < tag->nframes; ++i) {
- if (strncmp(tag->frames[i]->id, id, len) == 0 && index-- == 0)
- return tag->frames[i];
- }
+ for (i = 0; i < tag->nframes; ++i) {
+ if (strncmp(tag->frames[i]->id, id, len) == 0
+ && index-- == 0)
+ return tag->frames[i];
+ }
- return 0;
+ return 0;
}
enum tagtype {
- TAGTYPE_NONE = 0,
- TAGTYPE_ID3V1,
- TAGTYPE_ID3V2,
- TAGTYPE_ID3V2_FOOTER
+ TAGTYPE_NONE = 0,
+ TAGTYPE_ID3V1,
+ TAGTYPE_ID3V2,
+ TAGTYPE_ID3V2_FOOTER
};
-static
-enum tagtype tagtype(id3_byte_t const *data, id3_length_t length)
+static enum tagtype
+tagtype(id3_byte_t const *data, id3_length_t length)
{
- if (length >= 3 &&
- data[0] == 'T' && data[1] == 'A' && data[2] == 'G')
- return TAGTYPE_ID3V1;
-
- if (length >= 10 &&
- ((data[0] == 'I' && data[1] == 'D' && data[2] == '3') ||
- (data[0] == '3' && data[1] == 'D' && data[2] == 'I')) &&
- data[3] < 0xff && data[4] < 0xff &&
- data[6] < 0x80 && data[7] < 0x80 && data[8] < 0x80 && data[9] < 0x80)
- return data[0] == 'I' ? TAGTYPE_ID3V2 : TAGTYPE_ID3V2_FOOTER;
-
- return TAGTYPE_NONE;
+ if (length >= 3 &&
+ data[0] == 'T' && data[1] == 'A' && data[2] == 'G')
+ return TAGTYPE_ID3V1;
+
+ if (length >= 10 &&
+ ((data[0] == 'I' && data[1] == 'D' && data[2] == '3') ||
+ (data[0] == '3' && data[1] == 'D' && data[2] == 'I')) &&
+ data[3] < 0xff && data[4] < 0xff &&
+ data[6] < 0x80 && data[7] < 0x80 && data[8] < 0x80
+ && data[9] < 0x80)
+ return data[0] ==
+ 'I' ? TAGTYPE_ID3V2 : TAGTYPE_ID3V2_FOOTER;
+
+ return TAGTYPE_NONE;
}
-static
-void parse_header(id3_byte_t const **ptr,
- unsigned int *version, int *flags, id3_length_t *size)
+static void
+parse_header(id3_byte_t const **ptr,
+ unsigned int *version, int *flags, id3_length_t * size)
{
- *ptr += 3;
+ *ptr += 3;
- *version = id3_parse_uint(ptr, 2);
- *flags = id3_parse_uint(ptr, 1);
- *size = id3_parse_syncsafe(ptr, 4);
+ *version = id3_parse_uint(ptr, 2);
+ *flags = id3_parse_uint(ptr, 1);
+ *size = id3_parse_syncsafe(ptr, 4);
}
/*
- * NAME: tag->query()
- * DESCRIPTION: if a tag begins at the given location, return its size
+ * NAME: tag->query()
+ * DESCRIPTION: if a tag begins at the given location, return its size
*/
-signed long id3_tag_query(id3_byte_t const *data, id3_length_t length)
+signed long
+id3_tag_query(id3_byte_t const *data, id3_length_t length)
{
- unsigned int version;
- int flags;
- id3_length_t size;
+ unsigned int version;
+ int flags;
+ id3_length_t size;
- assert(data);
+ assert(data);
- switch (tagtype(data, length)) {
- case TAGTYPE_ID3V1:
- return 128;
+ switch (tagtype(data, length)) {
+ case TAGTYPE_ID3V1:
+ return 128;
- case TAGTYPE_ID3V2:
- parse_header(&data, &version, &flags, &size);
+ case TAGTYPE_ID3V2:
+ parse_header(&data, &version, &flags, &size);
- if (flags & ID3_TAG_FLAG_FOOTERPRESENT)
- size += 10;
+ if (flags & ID3_TAG_FLAG_FOOTERPRESENT)
+ size += 10;
- return 10 + size;
+ return 10 + size;
- case TAGTYPE_ID3V2_FOOTER:
- parse_header(&data, &version, &flags, &size);
- return -size - 10;
+ case TAGTYPE_ID3V2_FOOTER:
+ parse_header(&data, &version, &flags, &size);
+ return -size - 10;
- case TAGTYPE_NONE:
- break;
- }
+ case TAGTYPE_NONE:
+ break;
+ }
- return 0;
+ return 0;
}
-static
-void trim(char *str)
+static void
+trim(char *str)
{
- char *ptr;
+ char *ptr;
- ptr = str + strlen(str);
- while (ptr > str && ptr[-1] == ' ')
- --ptr;
+ ptr = str + strlen(str);
+ while (ptr > str && ptr[-1] == ' ')
+ --ptr;
- *ptr = 0;
-}
-
-static
-int v1_attachstr(struct id3_tag *tag, char const *id,
- char *text, unsigned long number)
-{
- struct id3_frame *frame;
- id3_ucs4_t ucs4[31];
-
- if (text) {
- trim(text);
- if (*text == 0)
- return 0;
- }
-
- frame = id3_frame_new(id);
- if (frame == 0)
- return -1;
-
- if (id3_field_settextencoding(&frame->fields[0],
- ID3_FIELD_TEXTENCODING_ISO_8859_1) == -1)
- goto fail;
-
- if (text)
- id3_latin1_decode(text, ucs4);
- else
- id3_ucs4_putnumber(ucs4, number);
-
- if (strcmp(id, ID3_FRAME_COMMENT) == 0) {
- if (id3_field_setlanguage(&frame->fields[1], "XXX") == -1 ||
- id3_field_setstring(&frame->fields[2], id3_ucs4_empty) == -1 ||
- id3_field_setfullstring(&frame->fields[3], ucs4) == -1)
- goto fail;
- }
- else {
- id3_ucs4_t *ptr = ucs4;
-
- if (id3_field_setstrings(&frame->fields[1], 1, &ptr) == -1)
- goto fail;
- }
-
- if (id3_tag_attachframe(tag, frame) == -1)
- goto fail;
-
- return 0;
-
- fail:
- id3_frame_delete(frame);
- return -1;
+ *ptr = 0;
}
-static
-struct id3_tag *v1_parse(id3_byte_t const *data)
+static int
+v1_attachstr(struct id3_tag *tag, char const *id,
+ char *text, unsigned long number)
{
- struct id3_tag *tag;
+ struct id3_frame *frame;
+ id3_ucs4_t ucs4[31];
- tag = id3_tag_new();
- if (tag) {
- char title[31], artist[31], album[31], year[5], comment[31];
- unsigned int genre, track;
-
- tag->version = 0x0100;
-
- tag->options |= ID3_TAG_OPTION_ID3V1;
- tag->options &= ~ID3_TAG_OPTION_COMPRESSION;
-
- tag->restrictions =
- ID3_TAG_RESTRICTION_TEXTENCODING_LATIN1_UTF8 |
- ID3_TAG_RESTRICTION_TEXTSIZE_30_CHARS;
-
- title[30] = artist[30] = album[30] = year[4] = comment[30] = 0;
+ if (text) {
+ trim(text);
+ if (*text == 0)
+ return 0;
+ }
- memcpy(title, &data[3], 30);
- memcpy(artist, &data[33], 30);
- memcpy(album, &data[63], 30);
- memcpy(year, &data[93], 4);
- memcpy(comment, &data[97], 30);
+ frame = id3_frame_new(id);
+ if (frame == 0)
+ return -1;
- genre = data[127];
+ if (id3_field_settextencoding(&frame->fields[0],
+ ID3_FIELD_TEXTENCODING_ISO_8859_1) ==
+ -1)
+ goto fail;
- track = 0;
- if (comment[28] == 0 && comment[29] != 0) {
- track = comment[29];
- tag->version = 0x0101;
- }
+ if (text)
+ id3_latin1_decode(text, ucs4);
+ else
+ id3_ucs4_putnumber(ucs4, number);
+
+ if (strcmp(id, ID3_FRAME_COMMENT) == 0) {
+ if (id3_field_setlanguage(&frame->fields[1], "XXX") == -1
+ || id3_field_setstring(&frame->fields[2],
+ id3_ucs4_empty) == -1
+ || id3_field_setfullstring(&frame->fields[3],
+ ucs4) == -1)
+ goto fail;
+ } else {
+ id3_ucs4_t *ptr = ucs4;
+
+ if (id3_field_setstrings(&frame->fields[1], 1, &ptr) == -1)
+ goto fail;
+ }
- /* populate tag frames */
+ if (id3_tag_attachframe(tag, frame) == -1)
+ goto fail;
- if (v1_attachstr(tag, ID3_FRAME_TITLE, title, 0) == -1 ||
- v1_attachstr(tag, ID3_FRAME_ARTIST, artist, 0) == -1 ||
- v1_attachstr(tag, ID3_FRAME_ALBUM, album, 0) == -1 ||
- v1_attachstr(tag, ID3_FRAME_YEAR, year, 0) == -1 ||
- (track && v1_attachstr(tag, ID3_FRAME_TRACK, 0, track) == -1) ||
- (genre < 0xff && v1_attachstr(tag, ID3_FRAME_GENRE, 0, genre) == -1) ||
- v1_attachstr(tag, ID3_FRAME_COMMENT, comment, 0) == -1) {
- id3_tag_delete(tag);
- tag = 0;
- }
- }
+ return 0;
- return tag;
+ fail:
+ id3_frame_delete(frame);
+ return -1;
}
-static
-struct id3_tag *v2_parse(id3_byte_t const *ptr)
+static struct id3_tag *
+v1_parse(id3_byte_t const *data)
{
- struct id3_tag *tag;
- id3_byte_t *mem = 0;
-
- tag = id3_tag_new();
- if (tag) {
- id3_byte_t const *end;
- id3_length_t size;
-
- parse_header(&ptr, &tag->version, &tag->flags, &size);
-
- tag->paddedsize = 10 + size;
-
- if ((tag->flags & ID3_TAG_FLAG_UNSYNCHRONISATION) &&
- ID3_TAG_VERSION_MAJOR(tag->version) < 4) {
- mem = malloc(size);
- if (mem == 0)
- goto fail;
-
- memcpy(mem, ptr, size);
-
- size = id3_util_deunsynchronise(mem, size);
- ptr = mem;
- }
-
- end = ptr + size;
-
- if (tag->flags & ID3_TAG_FLAG_EXTENDEDHEADER) {
- switch (ID3_TAG_VERSION_MAJOR(tag->version)) {
- case 2:
- goto fail;
-
- case 3:
- {
- id3_byte_t const *ehptr, *ehend;
- id3_length_t ehsize;
-
- enum {
- EH_FLAG_CRC = 0x8000 /* CRC data present */
- };
-
- if (end - ptr < 4)
- goto fail;
-
- ehsize = id3_parse_uint(&ptr, 4);
-
- if (ehsize > end - ptr)
- goto fail;
-
- ehptr = ptr;
- ehend = ptr + ehsize;
-
- ptr = ehend;
-
- if (ehend - ehptr >= 6) {
- int ehflags;
- id3_length_t padsize;
-
- ehflags = id3_parse_uint(&ehptr, 2);
- padsize = id3_parse_uint(&ehptr, 4);
-
- if (padsize > end - ptr)
- goto fail;
-
- end -= padsize;
-
- if (ehflags & EH_FLAG_CRC) {
- unsigned long crc;
-
- if (ehend - ehptr < 4)
- goto fail;
-
- crc = id3_parse_uint(&ehptr, 4);
-
- if (crc != id3_crc_compute(ptr, end - ptr))
- goto fail;
+ struct id3_tag *tag;
+
+ tag = id3_tag_new();
+ if (tag) {
+ char title[31],
+ artist[31],
+ album[31],
+ year[5],
+ comment[31];
+ unsigned int genre,
+ track;
+
+ tag->version = 0x0100;
+
+ tag->options |= ID3_TAG_OPTION_ID3V1;
+ tag->options &= ~ID3_TAG_OPTION_COMPRESSION;
+
+ tag->restrictions =
+ ID3_TAG_RESTRICTION_TEXTENCODING_LATIN1_UTF8 |
+ ID3_TAG_RESTRICTION_TEXTSIZE_30_CHARS;
+
+ title[30] = artist[30] = album[30] = year[4] =
+ comment[30] = 0;
+
+ memcpy(title, &data[3], 30);
+ memcpy(artist, &data[33], 30);
+ memcpy(album, &data[63], 30);
+ memcpy(year, &data[93], 4);
+ memcpy(comment, &data[97], 30);
+
+ genre = data[127];
+
+ track = 0;
+ if (comment[28] == 0 && comment[29] != 0) {
+ track = comment[29];
+ tag->version = 0x0101;
+ }
- tag->extendedflags |= ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT;
- }
- }
+ /*
+ * populate tag frames
+ */
+
+ if (v1_attachstr(tag, ID3_FRAME_TITLE, title, 0) == -1 ||
+ v1_attachstr(tag, ID3_FRAME_ARTIST, artist, 0) == -1 ||
+ v1_attachstr(tag, ID3_FRAME_ALBUM, album, 0) == -1 ||
+ v1_attachstr(tag, ID3_FRAME_YEAR, year, 0) == -1 ||
+ (track
+ && v1_attachstr(tag, ID3_FRAME_TRACK, 0, track) == -1)
+ || (genre < 0xff
+ && v1_attachstr(tag, ID3_FRAME_GENRE, 0,
+ genre) == -1)
+ || v1_attachstr(tag, ID3_FRAME_COMMENT, comment,
+ 0) == -1) {
+ id3_tag_delete(tag);
+ tag = 0;
+ }
}
- break;
-
- case 4:
- {
- id3_byte_t const *ehptr, *ehend;
- id3_length_t ehsize;
- unsigned int bytes;
-
- if (end - ptr < 4)
- goto fail;
- ehptr = ptr;
- ehsize = id3_parse_syncsafe(&ptr, 4);
+ return tag;
+}
- if (ehsize < 6 || ehsize > end - ehptr)
- goto fail;
+static struct id3_tag *
+v2_parse(id3_byte_t const *ptr)
+{
+ struct id3_tag *tag;
+ id3_byte_t *mem = 0;
- ehend = ehptr + ehsize;
+ tag = id3_tag_new();
+ if (tag) {
+ id3_byte_t const *end;
+ id3_length_t size;
- bytes = id3_parse_uint(&ptr, 1);
+ parse_header(&ptr, &tag->version, &tag->flags, &size);
- if (bytes < 1 || bytes > ehend - ptr)
- goto fail;
+ tag->paddedsize = 10 + size;
- ehptr = ptr + bytes;
+ if ((tag->flags & ID3_TAG_FLAG_UNSYNCHRONISATION) &&
+ ID3_TAG_VERSION_MAJOR(tag->version) < 4) {
+ mem = malloc(size);
+ if (mem == 0)
+ goto fail;
- /* verify extended header size */
- {
- id3_byte_t const *flagsptr = ptr, *dataptr = ehptr;
- unsigned int datalen;
- int ehflags;
+ memcpy(mem, ptr, size);
- while (bytes--) {
- for (ehflags = id3_parse_uint(&flagsptr, 1); ehflags;
- ehflags = (ehflags << 1) & 0xff) {
- if (ehflags & 0x80) {
- if (dataptr == ehend)
- goto fail;
- datalen = id3_parse_uint(&dataptr, 1);
- if (datalen > 0x7f || datalen > ehend - dataptr)
- goto fail;
- dataptr += datalen;
+ size = id3_util_deunsynchronise(mem, size);
+ ptr = mem;
}
- }
- }
- }
- tag->extendedflags = id3_parse_uint(&ptr, 1);
+ end = ptr + size;
- ptr = ehend;
+ if (tag->flags & ID3_TAG_FLAG_EXTENDEDHEADER) {
+ switch (ID3_TAG_VERSION_MAJOR(tag->version)) {
+ case 2:
+ goto fail;
- if (tag->extendedflags & ID3_TAG_EXTENDEDFLAG_TAGISANUPDATE) {
- bytes = id3_parse_uint(&ehptr, 1);
- ehptr += bytes;
- }
+ case 3:
+ {
+ id3_byte_t const *ehptr,
+ *ehend;
+ id3_length_t ehsize;
- if (tag->extendedflags & ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT) {
- unsigned long crc;
+ enum {
+ EH_FLAG_CRC = 0x8000 /* CRC
+ * data
+ * present
+ */
+ };
+
+ if (end - ptr < 4)
+ goto fail;
+
+ ehsize = id3_parse_uint(&ptr, 4);
+
+ if (ehsize > end - ptr)
+ goto fail;
+
+ ehptr = ptr;
+ ehend = ptr + ehsize;
+
+ ptr = ehend;
+
+ if (ehend - ehptr >= 6) {
+ int ehflags;
+ id3_length_t padsize;
+
+ ehflags =
+ id3_parse_uint(&ehptr,
+ 2);
+ padsize =
+ id3_parse_uint(&ehptr,
+ 4);
+
+ if (padsize > end - ptr)
+ goto fail;
+
+ end -= padsize;
+
+ if (ehflags & EH_FLAG_CRC) {
+ unsigned long crc;
+
+ if (ehend - ehptr <
+ 4)
+ goto fail;
+
+ crc =
+ id3_parse_uint
+ (&ehptr, 4);
+
+ if (crc !=
+ id3_crc_compute
+ (ptr,
+ end - ptr))
+ goto fail;
+
+ tag->
+ extendedflags
+ |=
+ ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT;
+ }
+ }
+ }
+ break;
+
+ case 4:
+ {
+ id3_byte_t const *ehptr,
+ *ehend;
+ id3_length_t ehsize;
+ unsigned int bytes;
+
+ if (end - ptr < 4)
+ goto fail;
+
+ ehptr = ptr;
+ ehsize =
+ id3_parse_syncsafe(&ptr, 4);
+
+ if (ehsize < 6
+ || ehsize > end - ehptr)
+ goto fail;
+
+ ehend = ehptr + ehsize;
+
+ bytes = id3_parse_uint(&ptr, 1);
+
+ if (bytes < 1
+ || bytes > ehend - ptr)
+ goto fail;
+
+ ehptr = ptr + bytes;
+
+ /*
+ * verify extended header size
+ */
+ {
+ id3_byte_t const *flagsptr
+ = ptr,
+ *dataptr = ehptr;
+ unsigned int datalen;
+ int ehflags;
+
+ while (bytes--) {
+ for (ehflags =
+ id3_parse_uint
+ (&flagsptr,
+ 1); ehflags;
+ ehflags =
+ (ehflags << 1)
+ & 0xff) {
+ if (ehflags
+ & 0x80)
+ {
+ if (dataptr == ehend)
+ goto fail;
+ datalen
+ =
+ id3_parse_uint
+ (&dataptr,
+ 1);
+ if (datalen > 0x7f || datalen > ehend - dataptr)
+ goto fail;
+ dataptr
+ +=
+ datalen;
+ }
+ }
+ }
+ }
+
+ tag->extendedflags =
+ id3_parse_uint(&ptr, 1);
+
+ ptr = ehend;
+
+ if (tag->
+ extendedflags &
+ ID3_TAG_EXTENDEDFLAG_TAGISANUPDATE)
+ {
+ bytes =
+ id3_parse_uint(&ehptr,
+ 1);
+ ehptr += bytes;
+ }
+
+ if (tag->
+ extendedflags &
+ ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT)
+ {
+ unsigned long crc;
+
+ bytes =
+ id3_parse_uint(&ehptr,
+ 1);
+ if (bytes < 5)
+ goto fail;
+
+ crc =
+ id3_parse_syncsafe
+ (&ehptr, 5);
+ ehptr += bytes - 5;
+
+ if (crc !=
+ id3_crc_compute(ptr,
+ end -
+ ptr))
+ goto fail;
+ }
+
+ if (tag->
+ extendedflags &
+ ID3_TAG_EXTENDEDFLAG_TAGRESTRICTIONS)
+ {
+ bytes =
+ id3_parse_uint(&ehptr,
+ 1);
+ if (bytes < 1)
+ goto fail;
+
+ tag->restrictions =
+ id3_parse_uint(&ehptr,
+ 1);
+ ehptr += bytes - 1;
+ }
+ }
+ break;
+ }
+ }
- bytes = id3_parse_uint(&ehptr, 1);
- if (bytes < 5)
- goto fail;
+ /*
+ * frames
+ */
- crc = id3_parse_syncsafe(&ehptr, 5);
- ehptr += bytes - 5;
+ while (ptr < end) {
+ struct id3_frame *frame;
- if (crc != id3_crc_compute(ptr, end - ptr))
- goto fail;
- }
+ if (*ptr == 0)
+ break; /* padding */
- if (tag->extendedflags & ID3_TAG_EXTENDEDFLAG_TAGRESTRICTIONS) {
- bytes = id3_parse_uint(&ehptr, 1);
- if (bytes < 1)
- goto fail;
+ frame =
+ id3_frame_parse(&ptr, end - ptr, tag->version);
+ if (frame == 0
+ || id3_tag_attachframe(tag, frame) == -1)
+ goto fail;
+ }
- tag->restrictions = id3_parse_uint(&ehptr, 1);
- ehptr += bytes - 1;
- }
+ if (ID3_TAG_VERSION_MAJOR(tag->version) < 4 &&
+ id3_compat_fixup(tag) == -1)
+ goto fail;
}
- break;
- }
- }
-
- /* frames */
-
- while (ptr < end) {
- struct id3_frame *frame;
-
- if (*ptr == 0)
- break; /* padding */
-
- frame = id3_frame_parse(&ptr, end - ptr, tag->version);
- if (frame == 0 || id3_tag_attachframe(tag, frame) == -1)
- goto fail;
- }
-
- if (ID3_TAG_VERSION_MAJOR(tag->version) < 4 &&
- id3_compat_fixup(tag) == -1)
- goto fail;
- }
- if (0) {
- fail:
- id3_tag_delete(tag);
- tag = 0;
- }
+ if (0) {
+ fail:
+ id3_tag_delete(tag);
+ tag = 0;
+ }
- if (mem)
- free(mem);
+ if (mem)
+ free(mem);
- return tag;
+ return tag;
}
/*
- * NAME: tag->parse()
- * DESCRIPTION: parse a complete ID3 tag
+ * NAME: tag->parse()
+ * DESCRIPTION: parse a complete ID3 tag
*/
-struct id3_tag *id3_tag_parse(id3_byte_t const *data, id3_length_t length)
+struct id3_tag *
+id3_tag_parse(id3_byte_t const *data, id3_length_t length)
{
- id3_byte_t const *ptr;
- unsigned int version;
- int flags;
- id3_length_t size;
+ id3_byte_t const *ptr;
+ unsigned int version;
+ int flags;
+ id3_length_t size;
- assert(data);
+ assert(data);
- switch (tagtype(data, length)) {
- case TAGTYPE_ID3V1:
- return (length < 128) ? 0 : v1_parse(data);
+ switch (tagtype(data, length)) {
+ case TAGTYPE_ID3V1:
+ return (length < 128) ? 0 : v1_parse(data);
- case TAGTYPE_ID3V2:
- break;
+ case TAGTYPE_ID3V2:
+ break;
- case TAGTYPE_ID3V2_FOOTER:
- case TAGTYPE_NONE:
- return 0;
- }
+ case TAGTYPE_ID3V2_FOOTER:
+ case TAGTYPE_NONE:
+ return 0;
+ }
- /* ID3v2.x */
+ /*
+ * ID3v2.x
+ */
- ptr = data;
- parse_header(&ptr, &version, &flags, &size);
+ ptr = data;
+ parse_header(&ptr, &version, &flags, &size);
- switch (ID3_TAG_VERSION_MAJOR(version)) {
- case 4:
- if (flags & ID3_TAG_FLAG_FOOTERPRESENT)
- size += 10;
- case 2:
- case 3:
- return (length < 10 + size) ? 0 : v2_parse(data);
- }
+ switch (ID3_TAG_VERSION_MAJOR(version)) {
+ case 4:
+ if (flags & ID3_TAG_FLAG_FOOTERPRESENT)
+ size += 10;
+ case 2:
+ case 3:
+ return (length < 10 + size) ? 0 : v2_parse(data);
+ }
- return 0;
+ return 0;
}
-static
-void v1_renderstr(struct id3_tag const *tag, char const *frameid,
- id3_byte_t **buffer, id3_length_t length)
+static void
+v1_renderstr(struct id3_tag const *tag, char const *frameid,
+ id3_byte_t ** buffer, id3_length_t length)
{
- struct id3_frame *frame;
- id3_ucs4_t const *string;
-
- frame = id3_tag_findframe(tag, frameid, 0);
- if (frame == 0)
- string = id3_ucs4_empty;
- else {
- if (strcmp(frameid, ID3_FRAME_COMMENT) == 0)
- string = id3_field_getfullstring(&frame->fields[3]);
- else
- string = id3_field_getstrings(&frame->fields[1], 0);
- }
-
- id3_render_paddedstring(buffer, string, length);
+ struct id3_frame *frame;
+ id3_ucs4_t const *string;
+
+ frame = id3_tag_findframe(tag, frameid, 0);
+ if (frame == 0)
+ string = id3_ucs4_empty;
+ else {
+ if (strcmp(frameid, ID3_FRAME_COMMENT) == 0)
+ string =
+ id3_field_getfullstring(&frame->fields[3]);
+ else
+ string =
+ id3_field_getstrings(&frame->fields[1], 0);
+ }
+
+ id3_render_paddedstring(buffer, string, length);
}
/*
- * NAME: v1->render()
- * DESCRIPTION: render an ID3v1 (or ID3v1.1) tag
+ * NAME: v1->render()
+ * DESCRIPTION: render an ID3v1 (or ID3v1.1) tag
*/
-static
-id3_length_t v1_render(struct id3_tag const *tag, id3_byte_t *buffer)
+static id3_length_t
+v1_render(struct id3_tag const *tag, id3_byte_t * buffer)
{
- id3_byte_t data[128], *ptr;
- struct id3_frame *frame;
- unsigned int i;
- int genre = -1;
-
- ptr = data;
-
- id3_render_immediate(&ptr, "TAG", 3);
-
- v1_renderstr(tag, ID3_FRAME_TITLE, &ptr, 30);
- v1_renderstr(tag, ID3_FRAME_ARTIST, &ptr, 30);
- v1_renderstr(tag, ID3_FRAME_ALBUM, &ptr, 30);
- v1_renderstr(tag, ID3_FRAME_YEAR, &ptr, 4);
- v1_renderstr(tag, ID3_FRAME_COMMENT, &ptr, 30);
-
- /* ID3v1.1 track number */
-
- frame = id3_tag_findframe(tag, ID3_FRAME_TRACK, 0);
- if (frame) {
- unsigned int track;
-
- track = id3_ucs4_getnumber(id3_field_getstrings(&frame->fields[1], 0));
- if (track > 0 && track <= 0xff) {
- ptr[-2] = 0;
- ptr[-1] = track;
- }
- }
+ id3_byte_t data[128],
+ *ptr;
+ struct id3_frame *frame;
+ unsigned int i;
+ int genre = -1;
+
+ ptr = data;
+
+ id3_render_immediate(&ptr, "TAG", 3);
+
+ v1_renderstr(tag, ID3_FRAME_TITLE, &ptr, 30);
+ v1_renderstr(tag, ID3_FRAME_ARTIST, &ptr, 30);
+ v1_renderstr(tag, ID3_FRAME_ALBUM, &ptr, 30);
+ v1_renderstr(tag, ID3_FRAME_YEAR, &ptr, 4);
+ v1_renderstr(tag, ID3_FRAME_COMMENT, &ptr, 30);
+
+ /*
+ * ID3v1.1 track number
+ */
+
+ frame = id3_tag_findframe(tag, ID3_FRAME_TRACK, 0);
+ if (frame) {
+ unsigned int track;
+
+ track =
+ id3_ucs4_getnumber(id3_field_getstrings
+ (&frame->fields[1], 0));
+ if (track > 0 && track <= 0xff) {
+ ptr[-2] = 0;
+ ptr[-1] = track;
+ }
+ }
- /* ID3v1 genre number */
+ /*
+ * ID3v1 genre number
+ */
- frame = id3_tag_findframe(tag, ID3_FRAME_GENRE, 0);
- if (frame) {
- unsigned int nstrings;
+ frame = id3_tag_findframe(tag, ID3_FRAME_GENRE, 0);
+ if (frame) {
+ unsigned int nstrings;
- nstrings = id3_field_getnstrings(&frame->fields[1]);
+ nstrings = id3_field_getnstrings(&frame->fields[1]);
- for (i = 0; i < nstrings; ++i) {
- genre = id3_genre_number(id3_field_getstrings(&frame->fields[1], i));
- if (genre != -1)
- break;
- }
+ for (i = 0; i < nstrings; ++i) {
+ genre =
+ id3_genre_number(id3_field_getstrings
+ (&frame->fields[1], i));
+ if (genre != -1)
+ break;
+ }
- if (i == nstrings && nstrings > 0)
- genre = ID3_GENRE_OTHER;
- }
+ if (i == nstrings && nstrings > 0)
+ genre = ID3_GENRE_OTHER;
+ }
- id3_render_int(&ptr, genre, 1);
+ id3_render_int(&ptr, genre, 1);
- /* make sure the tag is not empty */
+ /*
+ * make sure the tag is not empty
+ */
- if (genre == -1) {
- for (i = 3; i < 127; ++i) {
- if (data[i] != ' ')
- break;
- }
+ if (genre == -1) {
+ for (i = 3; i < 127; ++i) {
+ if (data[i] != ' ')
+ break;
+ }
- if (i == 127)
- return 0;
- }
+ if (i == 127)
+ return 0;
+ }
- if (buffer)
- memcpy(buffer, data, 128);
+ if (buffer)
+ memcpy(buffer, data, 128);
- return 128;
+ return 128;
}
/*
- * NAME: tag->render()
- * DESCRIPTION: render a complete ID3 tag
+ * NAME: tag->render()
+ * DESCRIPTION: render a complete ID3 tag
*/
-id3_length_t id3_tag_render(struct id3_tag const *tag, id3_byte_t *buffer)
+id3_length_t
+id3_tag_render(struct id3_tag const *tag, id3_byte_t * buffer)
{
- id3_length_t size = 0;
- id3_byte_t **ptr,
- *header_ptr = 0, *tagsize_ptr = 0, *crc_ptr = 0, *frames_ptr = 0;
- int flags, extendedflags;
- unsigned int i;
-
- assert(tag);
-
- if (tag->options & ID3_TAG_OPTION_ID3V1)
- return v1_render(tag, buffer);
-
- /* a tag must contain at least one (renderable) frame */
-
- for (i = 0; i < tag->nframes; ++i) {
- if (id3_frame_render(tag->frames[i], 0, 0) > 0)
- break;
- }
-
- if (i == tag->nframes)
- return 0;
-
- ptr = buffer ? &buffer : 0;
-
- /* get flags */
-
- flags = tag->flags & ID3_TAG_FLAG_KNOWNFLAGS;
- extendedflags = tag->extendedflags & ID3_TAG_EXTENDEDFLAG_KNOWNFLAGS;
+ id3_length_t size = 0;
+ id3_byte_t **ptr,
+ *header_ptr = 0,
+ *tagsize_ptr = 0,
+ *crc_ptr = 0,
+ *frames_ptr = 0;
+ int flags,
+ extendedflags;
+ unsigned int i;
+
+ assert(tag);
+
+ if (tag->options & ID3_TAG_OPTION_ID3V1)
+ return v1_render(tag, buffer);
+
+ /*
+ * a tag must contain at least one (renderable) frame
+ */
+
+ for (i = 0; i < tag->nframes; ++i) {
+ if (id3_frame_render(tag->frames[i], 0, 0) > 0)
+ break;
+ }
- extendedflags &= ~ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT;
- if (tag->options & ID3_TAG_OPTION_CRC)
- extendedflags |= ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT;
+ if (i == tag->nframes)
+ return 0;
- extendedflags &= ~ID3_TAG_EXTENDEDFLAG_TAGRESTRICTIONS;
- if (tag->restrictions)
- extendedflags |= ID3_TAG_EXTENDEDFLAG_TAGRESTRICTIONS;
+ ptr = buffer ? &buffer : 0;
- flags &= ~ID3_TAG_FLAG_UNSYNCHRONISATION;
- if (tag->options & ID3_TAG_OPTION_UNSYNCHRONISATION)
- flags |= ID3_TAG_FLAG_UNSYNCHRONISATION;
+ /*
+ * get flags
+ */
- flags &= ~ID3_TAG_FLAG_EXTENDEDHEADER;
- if (extendedflags)
- flags |= ID3_TAG_FLAG_EXTENDEDHEADER;
+ flags = tag->flags & ID3_TAG_FLAG_KNOWNFLAGS;
+ extendedflags =
+ tag->extendedflags & ID3_TAG_EXTENDEDFLAG_KNOWNFLAGS;
- flags &= ~ID3_TAG_FLAG_FOOTERPRESENT;
- if (tag->options & ID3_TAG_OPTION_APPENDEDTAG)
- flags |= ID3_TAG_FLAG_FOOTERPRESENT;
+ extendedflags &= ~ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT;
+ if (tag->options & ID3_TAG_OPTION_CRC)
+ extendedflags |= ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT;
- /* header */
+ extendedflags &= ~ID3_TAG_EXTENDEDFLAG_TAGRESTRICTIONS;
+ if (tag->restrictions)
+ extendedflags |= ID3_TAG_EXTENDEDFLAG_TAGRESTRICTIONS;
- if (ptr)
- header_ptr = *ptr;
+ flags &= ~ID3_TAG_FLAG_UNSYNCHRONISATION;
+ if (tag->options & ID3_TAG_OPTION_UNSYNCHRONISATION)
+ flags |= ID3_TAG_FLAG_UNSYNCHRONISATION;
- size += id3_render_immediate(ptr, "ID3", 3);
- size += id3_render_int(ptr, ID3_TAG_VERSION, 2);
- size += id3_render_int(ptr, flags, 1);
+ flags &= ~ID3_TAG_FLAG_EXTENDEDHEADER;
+ if (extendedflags)
+ flags |= ID3_TAG_FLAG_EXTENDEDHEADER;
- if (ptr)
- tagsize_ptr = *ptr;
+ flags &= ~ID3_TAG_FLAG_FOOTERPRESENT;
+ if (tag->options & ID3_TAG_OPTION_APPENDEDTAG)
+ flags |= ID3_TAG_FLAG_FOOTERPRESENT;
- size += id3_render_syncsafe(ptr, 0, 4);
+ /*
+ * header
+ */
- /* extended header */
+ if (ptr)
+ header_ptr = *ptr;
- if (flags & ID3_TAG_FLAG_EXTENDEDHEADER) {
- id3_length_t ehsize = 0;
- id3_byte_t *ehsize_ptr = 0;
+ size += id3_render_immediate(ptr, "ID3", 3);
+ size += id3_render_int(ptr, ID3_TAG_VERSION, 2);
+ size += id3_render_int(ptr, flags, 1);
- if (ptr)
- ehsize_ptr = *ptr;
+ if (ptr)
+ tagsize_ptr = *ptr;
- ehsize += id3_render_syncsafe(ptr, 0, 4);
- ehsize += id3_render_int(ptr, 1, 1);
- ehsize += id3_render_int(ptr, extendedflags, 1);
+ size += id3_render_syncsafe(ptr, 0, 4);
- if (extendedflags & ID3_TAG_EXTENDEDFLAG_TAGISANUPDATE)
- ehsize += id3_render_int(ptr, 0, 1);
+ /*
+ * extended header
+ */
- if (extendedflags & ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT) {
- ehsize += id3_render_int(ptr, 5, 1);
+ if (flags & ID3_TAG_FLAG_EXTENDEDHEADER) {
+ id3_length_t ehsize = 0;
+ id3_byte_t *ehsize_ptr = 0;
- if (ptr)
- crc_ptr = *ptr;
+ if (ptr)
+ ehsize_ptr = *ptr;
- ehsize += id3_render_syncsafe(ptr, 0, 5);
- }
+ ehsize += id3_render_syncsafe(ptr, 0, 4);
+ ehsize += id3_render_int(ptr, 1, 1);
+ ehsize += id3_render_int(ptr, extendedflags, 1);
- if (extendedflags & ID3_TAG_EXTENDEDFLAG_TAGRESTRICTIONS) {
- ehsize += id3_render_int(ptr, 1, 1);
- ehsize += id3_render_int(ptr, tag->restrictions, 1);
- }
+ if (extendedflags & ID3_TAG_EXTENDEDFLAG_TAGISANUPDATE)
+ ehsize += id3_render_int(ptr, 0, 1);
- if (ehsize_ptr)
- id3_render_syncsafe(&ehsize_ptr, ehsize, 4);
+ if (extendedflags & ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT) {
+ ehsize += id3_render_int(ptr, 5, 1);
- size += ehsize;
- }
+ if (ptr)
+ crc_ptr = *ptr;
- /* frames */
+ ehsize += id3_render_syncsafe(ptr, 0, 5);
+ }
- if (ptr)
- frames_ptr = *ptr;
+ if (extendedflags & ID3_TAG_EXTENDEDFLAG_TAGRESTRICTIONS) {
+ ehsize += id3_render_int(ptr, 1, 1);
+ ehsize +=
+ id3_render_int(ptr, tag->restrictions, 1);
+ }
- for (i = 0; i < tag->nframes; ++i)
- size += id3_frame_render(tag->frames[i], ptr, tag->options);
+ if (ehsize_ptr)
+ id3_render_syncsafe(&ehsize_ptr, ehsize, 4);
- /* padding */
+ size += ehsize;
+ }
- if (!(flags & ID3_TAG_FLAG_FOOTERPRESENT)) {
- if (size < tag->paddedsize)
- size += id3_render_padding(ptr, 0, tag->paddedsize - size);
- else if (tag->options & ID3_TAG_OPTION_UNSYNCHRONISATION) {
- if (ptr == 0)
- size += 1;
- else {
- if ((*ptr)[-1] == 0xff)
- size += id3_render_padding(ptr, 0, 1);
- }
- }
- }
+ /*
+ * frames
+ */
+
+ if (ptr)
+ frames_ptr = *ptr;
+
+ for (i = 0; i < tag->nframes; ++i)
+ size +=
+ id3_frame_render(tag->frames[i], ptr, tag->options);
+
+ /*
+ * padding
+ */
+
+ if (!(flags & ID3_TAG_FLAG_FOOTERPRESENT)) {
+ if (size < tag->paddedsize)
+ size +=
+ id3_render_padding(ptr, 0,
+ tag->paddedsize - size);
+ else if (tag->options & ID3_TAG_OPTION_UNSYNCHRONISATION) {
+ if (ptr == 0)
+ size += 1;
+ else {
+ if ((*ptr)[-1] == 0xff)
+ size +=
+ id3_render_padding(ptr, 0, 1);
+ }
+ }
+ }
- /* patch tag size and CRC */
+ /*
+ * patch tag size and CRC
+ */
- if (tagsize_ptr)
- id3_render_syncsafe(&tagsize_ptr, size - 10, 4);
+ if (tagsize_ptr)
+ id3_render_syncsafe(&tagsize_ptr, size - 10, 4);
- if (crc_ptr) {
- id3_render_syncsafe(&crc_ptr,
- id3_crc_compute(frames_ptr, *ptr - frames_ptr), 5);
- }
+ if (crc_ptr) {
+ id3_render_syncsafe(&crc_ptr,
+ id3_crc_compute(frames_ptr,
+ *ptr - frames_ptr), 5);
+ }
- /* footer */
+ /*
+ * footer
+ */
- if (flags & ID3_TAG_FLAG_FOOTERPRESENT) {
- size += id3_render_immediate(ptr, "3DI", 3);
- size += id3_render_binary(ptr, header_ptr + 3, 7);
- }
+ if (flags & ID3_TAG_FLAG_FOOTERPRESENT) {
+ size += id3_render_immediate(ptr, "3DI", 3);
+ size += id3_render_binary(ptr, header_ptr + 3, 7);
+ }
- return size;
+ return size;
}
diff --git a/libid3tag/tag.h b/libid3tag/tag.h
index 2ce84d7..ca7e29d 100644
--- a/libid3tag/tag.h
+++ b/libid3tag/tag.h
@@ -19,7 +19,7 @@
* $Id: tag.h,v 1.10 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_TAG_H
+#ifndef LIBID3TAG_TAG_H
# define LIBID3TAG_TAG_H
# include "id3tag.h"
@@ -27,4 +27,4 @@
void id3_tag_addref(struct id3_tag *);
void id3_tag_delref(struct id3_tag *);
-# endif
+#endif
diff --git a/libid3tag/ucs4.c b/libid3tag/ucs4.c
index 15dace8..31e5d54 100644
--- a/libid3tag/ucs4.c
+++ b/libid3tag/ucs4.c
@@ -19,206 +19,218 @@
* $Id: ucs4.c,v 1.13 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include <stdlib.h>
+#include <stdlib.h>
-# include "id3tag.h"
-# include "ucs4.h"
-# include "latin1.h"
-# include "utf16.h"
-# include "utf8.h"
+#include "id3tag.h"
+#include "ucs4.h"
+#include "latin1.h"
+#include "utf16.h"
+#include "utf8.h"
id3_ucs4_t const id3_ucs4_empty[] = { 0 };
/*
- * NAME: ucs4->length()
- * DESCRIPTION: return the number of ucs4 chars represented by a ucs4 string
+ * NAME: ucs4->length()
+ * DESCRIPTION: return the number of ucs4 chars represented by a ucs4 string
*/
-id3_length_t id3_ucs4_length(id3_ucs4_t const *ucs4)
+id3_length_t
+id3_ucs4_length(id3_ucs4_t const *ucs4)
{
- id3_ucs4_t const *ptr = ucs4;
+ id3_ucs4_t const *ptr = ucs4;
- while (*ptr)
- ++ptr;
+ while (*ptr)
+ ++ptr;
- return ptr - ucs4;
+ return ptr - ucs4;
}
/*
- * NAME: ucs4->size()
- * DESCRIPTION: return the encoding size of a ucs4 string
+ * NAME: ucs4->size()
+ * DESCRIPTION: return the encoding size of a ucs4 string
*/
-id3_length_t id3_ucs4_size(id3_ucs4_t const *ucs4)
+id3_length_t
+id3_ucs4_size(id3_ucs4_t const *ucs4)
{
- return id3_ucs4_length(ucs4) + 1;
+ return id3_ucs4_length(ucs4) + 1;
}
/*
- * NAME: ucs4->latin1size()
- * DESCRIPTION: return the encoding size of a latin1-encoded ucs4 string
+ * NAME: ucs4->latin1size()
+ * DESCRIPTION: return the encoding size of a latin1-encoded ucs4 string
*/
-id3_length_t id3_ucs4_latin1size(id3_ucs4_t const *ucs4)
+id3_length_t
+id3_ucs4_latin1size(id3_ucs4_t const *ucs4)
{
- return id3_ucs4_size(ucs4);
+ return id3_ucs4_size(ucs4);
}
/*
- * NAME: ucs4->utf16size()
- * DESCRIPTION: return the encoding size of a utf16-encoded ucs4 string
+ * NAME: ucs4->utf16size()
+ * DESCRIPTION: return the encoding size of a utf16-encoded ucs4 string
*/
-id3_length_t id3_ucs4_utf16size(id3_ucs4_t const *ucs4)
+id3_length_t
+id3_ucs4_utf16size(id3_ucs4_t const *ucs4)
{
- id3_length_t size = 0;
+ id3_length_t size = 0;
- while (*ucs4) {
- ++size;
- if (*ucs4 >= 0x00010000L &&
- *ucs4 <= 0x0010ffffL)
- ++size;
+ while (*ucs4) {
+ ++size;
+ if (*ucs4 >= 0x00010000L && *ucs4 <= 0x0010ffffL)
+ ++size;
- ++ucs4;
- }
+ ++ucs4;
+ }
- return size + 1;
+ return size + 1;
}
/*
- * NAME: ucs4->utf8size()
- * DESCRIPTION: return the encoding size of a utf8-encoded ucs4 string
+ * NAME: ucs4->utf8size()
+ * DESCRIPTION: return the encoding size of a utf8-encoded ucs4 string
*/
-id3_length_t id3_ucs4_utf8size(id3_ucs4_t const *ucs4)
+id3_length_t
+id3_ucs4_utf8size(id3_ucs4_t const *ucs4)
{
- id3_length_t size = 0;
-
- while (*ucs4) {
- if (*ucs4 <= 0x0000007fL)
- size += 1;
- else if (*ucs4 <= 0x000007ffL)
- size += 2;
- else if (*ucs4 <= 0x0000ffffL)
- size += 3;
- else if (*ucs4 <= 0x001fffffL)
- size += 4;
- else if (*ucs4 <= 0x03ffffffL)
- size += 5;
- else if (*ucs4 <= 0x7fffffffL)
- size += 6;
- else
- size += 2; /* based on U+00B7 replacement char */
-
- ++ucs4;
- }
-
- return size + 1;
+ id3_length_t size = 0;
+
+ while (*ucs4) {
+ if (*ucs4 <= 0x0000007fL)
+ size += 1;
+ else if (*ucs4 <= 0x000007ffL)
+ size += 2;
+ else if (*ucs4 <= 0x0000ffffL)
+ size += 3;
+ else if (*ucs4 <= 0x001fffffL)
+ size += 4;
+ else if (*ucs4 <= 0x03ffffffL)
+ size += 5;
+ else if (*ucs4 <= 0x7fffffffL)
+ size += 6;
+ else
+ size += 2; /* based on U+00B7 replacement
+ * char */
+
+ ++ucs4;
+ }
+
+ return size + 1;
}
/*
- * NAME: ucs4->latin1duplicate()
- * DESCRIPTION: duplicate and encode a ucs4 string into latin1
+ * NAME: ucs4->latin1duplicate()
+ * DESCRIPTION: duplicate and encode a ucs4 string into latin1
*/
-id3_latin1_t *id3_ucs4_latin1duplicate(id3_ucs4_t const *ucs4)
+id3_latin1_t *
+id3_ucs4_latin1duplicate(id3_ucs4_t const *ucs4)
{
- id3_latin1_t *latin1;
+ id3_latin1_t *latin1;
- latin1 = malloc(id3_ucs4_latin1size(ucs4) * sizeof(*latin1));
- if (latin1)
- id3_latin1_encode(latin1, ucs4);
+ latin1 = malloc(id3_ucs4_latin1size(ucs4) * sizeof(*latin1));
+ if (latin1)
+ id3_latin1_encode(latin1, ucs4);
- return release(latin1);
+ return release(latin1);
}
/*
- * NAME: ucs4->utf16duplicate()
- * DESCRIPTION: duplicate and encode a ucs4 string into utf16
+ * NAME: ucs4->utf16duplicate()
+ * DESCRIPTION: duplicate and encode a ucs4 string into utf16
*/
-id3_utf16_t *id3_ucs4_utf16duplicate(id3_ucs4_t const *ucs4)
+id3_utf16_t *
+id3_ucs4_utf16duplicate(id3_ucs4_t const *ucs4)
{
- id3_utf16_t *utf16;
+ id3_utf16_t *utf16;
- utf16 = malloc(id3_ucs4_utf16size(ucs4) * sizeof(*utf16));
- if (utf16)
- id3_utf16_encode(utf16, ucs4);
+ utf16 = malloc(id3_ucs4_utf16size(ucs4) * sizeof(*utf16));
+ if (utf16)
+ id3_utf16_encode(utf16, ucs4);
- return release(utf16);
+ return release(utf16);
}
/*
- * NAME: ucs4->utf8duplicate()
- * DESCRIPTION: duplicate and encode a ucs4 string into utf8
+ * NAME: ucs4->utf8duplicate()
+ * DESCRIPTION: duplicate and encode a ucs4 string into utf8
*/
-id3_utf8_t *id3_ucs4_utf8duplicate(id3_ucs4_t const *ucs4)
+id3_utf8_t *
+id3_ucs4_utf8duplicate(id3_ucs4_t const *ucs4)
{
- id3_utf8_t *utf8;
+ id3_utf8_t *utf8;
- utf8 = malloc(id3_ucs4_utf8size(ucs4) * sizeof(*utf8));
- if (utf8)
- id3_utf8_encode(utf8, ucs4);
+ utf8 = malloc(id3_ucs4_utf8size(ucs4) * sizeof(*utf8));
+ if (utf8)
+ id3_utf8_encode(utf8, ucs4);
- return release(utf8);
+ return release(utf8);
}
/*
- * NAME: ucs4->copy()
- * DESCRIPTION: copy a ucs4 string
+ * NAME: ucs4->copy()
+ * DESCRIPTION: copy a ucs4 string
*/
-void id3_ucs4_copy(id3_ucs4_t *dest, id3_ucs4_t const *src)
+void
+id3_ucs4_copy(id3_ucs4_t * dest, id3_ucs4_t const *src)
{
- while ((*dest++ = *src++))
- ;
+ while ((*dest++ = *src++));
}
/*
- * NAME: ucs4->duplicate()
- * DESCRIPTION: duplicate a ucs4 string
+ * NAME: ucs4->duplicate()
+ * DESCRIPTION: duplicate a ucs4 string
*/
-id3_ucs4_t *id3_ucs4_duplicate(id3_ucs4_t const *src)
+id3_ucs4_t *
+id3_ucs4_duplicate(id3_ucs4_t const *src)
{
- id3_ucs4_t *ucs4;
+ id3_ucs4_t *ucs4;
- ucs4 = malloc(id3_ucs4_size(src) * sizeof(*ucs4));
- if (ucs4)
- id3_ucs4_copy(ucs4, src);
+ ucs4 = malloc(id3_ucs4_size(src) * sizeof(*ucs4));
+ if (ucs4)
+ id3_ucs4_copy(ucs4, src);
- return ucs4;
+ return ucs4;
}
/*
- * NAME: ucs4->putnumber()
- * DESCRIPTION: write a ucs4 string containing a (positive) decimal number
+ * NAME: ucs4->putnumber()
+ * DESCRIPTION: write a ucs4 string containing a (positive) decimal number
*/
-void id3_ucs4_putnumber(id3_ucs4_t *ucs4, unsigned long number)
+void
+id3_ucs4_putnumber(id3_ucs4_t * ucs4, unsigned long number)
{
- int digits[10], *digit;
+ int digits[10],
+ *digit;
- digit = digits;
+ digit = digits;
- do {
- *digit++ = number % 10;
- number /= 10;
- }
- while (number);
+ do {
+ *digit++ = number % 10;
+ number /= 10;
+ }
+ while (number);
- while (digit != digits)
- *ucs4++ = '0' + *--digit;
+ while (digit != digits)
+ *ucs4++ = '0' + *--digit;
- *ucs4 = 0;
+ *ucs4 = 0;
}
/*
- * NAME: ucs4->getnumber()
- * DESCRIPTION: read a ucs4 string containing a (positive) decimal number
+ * NAME: ucs4->getnumber()
+ * DESCRIPTION: read a ucs4 string containing a (positive) decimal number
*/
-unsigned long id3_ucs4_getnumber(id3_ucs4_t const *ucs4)
+unsigned long
+id3_ucs4_getnumber(id3_ucs4_t const *ucs4)
{
- unsigned long number = 0;
+ unsigned long number = 0;
- while (*ucs4 >= '0' && *ucs4 <= '9')
- number = 10 * number + (*ucs4++ - '0');
+ while (*ucs4 >= '0' && *ucs4 <= '9')
+ number = 10 * number + (*ucs4++ - '0');
- return number;
+ return number;
}
diff --git a/libid3tag/ucs4.h b/libid3tag/ucs4.h
index bfb325d..b190b88 100644
--- a/libid3tag/ucs4.h
+++ b/libid3tag/ucs4.h
@@ -19,7 +19,7 @@
* $Id: ucs4.h,v 1.11 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_UCS4_H
+#ifndef LIBID3TAG_UCS4_H
# define LIBID3TAG_UCS4_H
# include "id3tag.h"
@@ -38,4 +38,4 @@ id3_length_t id3_ucs4_utf8size(id3_ucs4_t const *);
void id3_ucs4_copy(id3_ucs4_t *, id3_ucs4_t const *);
id3_ucs4_t *id3_ucs4_duplicate(id3_ucs4_t const *);
-# endif
+#endif
diff --git a/libid3tag/utf16.c b/libid3tag/utf16.c
index 70ee9d5..f30ebc5 100644
--- a/libid3tag/utf16.c
+++ b/libid3tag/utf16.c
@@ -19,268 +19,279 @@
* $Id: utf16.c,v 1.9 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include <stdlib.h>
+#include <stdlib.h>
-# include "id3tag.h"
-# include "utf16.h"
-# include "ucs4.h"
+#include "id3tag.h"
+#include "utf16.h"
+#include "ucs4.h"
/*
- * NAME: utf16->length()
- * DESCRIPTION: return the number of ucs4 chars represented by a utf16 string
+ * NAME: utf16->length()
+ * DESCRIPTION: return the number of ucs4 chars represented by a utf16 string
*/
-id3_length_t id3_utf16_length(id3_utf16_t const *utf16)
+id3_length_t
+id3_utf16_length(id3_utf16_t const *utf16)
{
- id3_length_t length = 0;
+ id3_length_t length = 0;
- while (*utf16) {
- if (utf16[0] < 0xd800 || utf16[0] > 0xdfff)
- ++length;
- else if (utf16[0] >= 0xd800 && utf16[0] <= 0xdbff &&
- utf16[1] >= 0xdc00 && utf16[1] <= 0xdfff) {
- ++length;
- ++utf16;
- }
+ while (*utf16) {
+ if (utf16[0] < 0xd800 || utf16[0] > 0xdfff)
+ ++length;
+ else if (utf16[0] >= 0xd800 && utf16[0] <= 0xdbff &&
+ utf16[1] >= 0xdc00 && utf16[1] <= 0xdfff) {
+ ++length;
+ ++utf16;
+ }
- ++utf16;
- }
+ ++utf16;
+ }
- return length;
+ return length;
}
/*
- * NAME: utf16->size()
- * DESCRIPTION: return the encoding size of a utf16 string
+ * NAME: utf16->size()
+ * DESCRIPTION: return the encoding size of a utf16 string
*/
-id3_length_t id3_utf16_size(id3_utf16_t const *utf16)
+id3_length_t
+id3_utf16_size(id3_utf16_t const *utf16)
{
- id3_utf16_t const *ptr = utf16;
+ id3_utf16_t const *ptr = utf16;
- while (*ptr)
- ++ptr;
+ while (*ptr)
+ ++ptr;
- return ptr - utf16 + 1;
+ return ptr - utf16 + 1;
}
/*
- * NAME: utf16->ucs4duplicate()
- * DESCRIPTION: duplicate and decode a utf16 string into ucs4
+ * NAME: utf16->ucs4duplicate()
+ * DESCRIPTION: duplicate and decode a utf16 string into ucs4
*/
-id3_ucs4_t *id3_utf16_ucs4duplicate(id3_utf16_t const *utf16)
+id3_ucs4_t *
+id3_utf16_ucs4duplicate(id3_utf16_t const *utf16)
{
- id3_ucs4_t *ucs4;
+ id3_ucs4_t *ucs4;
- ucs4 = malloc((id3_utf16_length(utf16) + 1) * sizeof(*ucs4));
- if (ucs4)
- id3_utf16_decode(utf16, ucs4);
+ ucs4 = malloc((id3_utf16_length(utf16) + 1) * sizeof(*ucs4));
+ if (ucs4)
+ id3_utf16_decode(utf16, ucs4);
- return release(ucs4);
+ return release(ucs4);
}
/*
- * NAME: utf16->decodechar()
- * DESCRIPTION: decode a series of utf16 chars into a single ucs4 char
+ * NAME: utf16->decodechar()
+ * DESCRIPTION: decode a series of utf16 chars into a single ucs4 char
*/
-id3_length_t id3_utf16_decodechar(id3_utf16_t const *utf16, id3_ucs4_t *ucs4)
+id3_length_t
+id3_utf16_decodechar(id3_utf16_t const *utf16, id3_ucs4_t * ucs4)
{
- id3_utf16_t const *start = utf16;
-
- while (1) {
- if (utf16[0] < 0xd800 || utf16[0] > 0xdfff) {
- *ucs4 = utf16[0];
- return utf16 - start + 1;
- }
- else if (utf16[0] >= 0xd800 && utf16[0] <= 0xdbff &&
- utf16[1] >= 0xdc00 && utf16[1] <= 0xdfff) {
- *ucs4 = (((utf16[0] & 0x03ffL) << 10) |
- ((utf16[1] & 0x03ffL) << 0)) + 0x00010000L;
- return utf16 - start + 2;
- }
-
- ++utf16;
- }
+ id3_utf16_t const *start = utf16;
+
+ while (1) {
+ if (utf16[0] < 0xd800 || utf16[0] > 0xdfff) {
+ *ucs4 = utf16[0];
+ return utf16 - start + 1;
+ } else if (utf16[0] >= 0xd800 && utf16[0] <= 0xdbff &&
+ utf16[1] >= 0xdc00 && utf16[1] <= 0xdfff) {
+ *ucs4 = (((utf16[0] & 0x03ffL) << 10) |
+ ((utf16[1] & 0x03ffL) << 0)) +
+ 0x00010000L;
+ return utf16 - start + 2;
+ }
+
+ ++utf16;
+ }
}
/*
- * NAME: utf16->encodechar()
- * DESCRIPTION: encode a single ucs4 char into a series of up to 2 utf16 chars
+ * NAME: utf16->encodechar()
+ * DESCRIPTION: encode a single ucs4 char into a series of up to 2 utf16 chars
*/
-id3_length_t id3_utf16_encodechar(id3_utf16_t *utf16, id3_ucs4_t ucs4)
+id3_length_t
+id3_utf16_encodechar(id3_utf16_t * utf16, id3_ucs4_t ucs4)
{
- if (ucs4 < 0x00010000L) {
- utf16[0] = ucs4;
+ if (ucs4 < 0x00010000L) {
+ utf16[0] = ucs4;
- return 1;
- }
- else if (ucs4 < 0x00110000L) {
- ucs4 -= 0x00010000L;
+ return 1;
+ } else if (ucs4 < 0x00110000L) {
+ ucs4 -= 0x00010000L;
- utf16[0] = ((ucs4 >> 10) & 0x3ff) | 0xd800;
- utf16[1] = ((ucs4 >> 0) & 0x3ff) | 0xdc00;
+ utf16[0] = ((ucs4 >> 10) & 0x3ff) | 0xd800;
+ utf16[1] = ((ucs4 >> 0) & 0x3ff) | 0xdc00;
- return 2;
- }
+ return 2;
+ }
- /* default */
+ /*
+ * default
+ */
- return id3_utf16_encodechar(utf16, ID3_UCS4_REPLACEMENTCHAR);
+ return id3_utf16_encodechar(utf16, ID3_UCS4_REPLACEMENTCHAR);
}
/*
- * NAME: utf16->decode()
- * DESCRIPTION: decode a complete utf16 string into a ucs4 string
+ * NAME: utf16->decode()
+ * DESCRIPTION: decode a complete utf16 string into a ucs4 string
*/
-void id3_utf16_decode(id3_utf16_t const *utf16, id3_ucs4_t *ucs4)
+void
+id3_utf16_decode(id3_utf16_t const *utf16, id3_ucs4_t * ucs4)
{
- do
- utf16 += id3_utf16_decodechar(utf16, ucs4);
- while (*ucs4++);
+ do
+ utf16 += id3_utf16_decodechar(utf16, ucs4);
+ while (*ucs4++);
}
/*
- * NAME: utf16->encode()
- * DESCRIPTION: encode a complete ucs4 string into a utf16 string
+ * NAME: utf16->encode()
+ * DESCRIPTION: encode a complete ucs4 string into a utf16 string
*/
-void id3_utf16_encode(id3_utf16_t *utf16, id3_ucs4_t const *ucs4)
+void
+id3_utf16_encode(id3_utf16_t * utf16, id3_ucs4_t const *ucs4)
{
- do
- utf16 += id3_utf16_encodechar(utf16, *ucs4);
- while (*ucs4++);
+ do
+ utf16 += id3_utf16_encodechar(utf16, *ucs4);
+ while (*ucs4++);
}
/*
- * NAME: utf16->put()
- * DESCRIPTION: serialize a single utf16 character
+ * NAME: utf16->put()
+ * DESCRIPTION: serialize a single utf16 character
*/
-id3_length_t id3_utf16_put(id3_byte_t **ptr, id3_utf16_t utf16,
- enum id3_utf16_byteorder byteorder)
+id3_length_t
+id3_utf16_put(id3_byte_t ** ptr, id3_utf16_t utf16,
+ enum id3_utf16_byteorder byteorder)
{
- if (ptr) {
- switch (byteorder) {
- default:
- case ID3_UTF16_BYTEORDER_BE:
- (*ptr)[0] = (utf16 >> 8) & 0xff;
- (*ptr)[1] = (utf16 >> 0) & 0xff;
- break;
-
- case ID3_UTF16_BYTEORDER_LE:
- (*ptr)[0] = (utf16 >> 0) & 0xff;
- (*ptr)[1] = (utf16 >> 8) & 0xff;
- break;
- }
-
- *ptr += 2;
- }
-
- return 2;
+ if (ptr) {
+ switch (byteorder) {
+ default:
+ case ID3_UTF16_BYTEORDER_BE:
+ (*ptr)[0] = (utf16 >> 8) & 0xff;
+ (*ptr)[1] = (utf16 >> 0) & 0xff;
+ break;
+
+ case ID3_UTF16_BYTEORDER_LE:
+ (*ptr)[0] = (utf16 >> 0) & 0xff;
+ (*ptr)[1] = (utf16 >> 8) & 0xff;
+ break;
+ }
+
+ *ptr += 2;
+ }
+
+ return 2;
}
/*
- * NAME: utf16->get()
- * DESCRIPTION: deserialize a single utf16 character
+ * NAME: utf16->get()
+ * DESCRIPTION: deserialize a single utf16 character
*/
-id3_utf16_t id3_utf16_get(id3_byte_t const **ptr,
- enum id3_utf16_byteorder byteorder)
+id3_utf16_t
+id3_utf16_get(id3_byte_t const **ptr, enum id3_utf16_byteorder byteorder)
{
- id3_utf16_t utf16;
-
- switch (byteorder) {
- default:
- case ID3_UTF16_BYTEORDER_BE:
- utf16 =
- ((*ptr)[0] << 8) |
- ((*ptr)[1] << 0);
- break;
-
- case ID3_UTF16_BYTEORDER_LE:
- utf16 =
- ((*ptr)[0] << 0) |
- ((*ptr)[1] << 8);
- break;
- }
-
- *ptr += 2;
-
- return utf16;
-}
+ id3_utf16_t utf16;
-/*
- * NAME: utf16->serialize()
- * DESCRIPTION: serialize a ucs4 string using utf16 encoding
- */
-id3_length_t id3_utf16_serialize(id3_byte_t **ptr, id3_ucs4_t const *ucs4,
- enum id3_utf16_byteorder byteorder,
- int terminate)
-{
- id3_length_t size = 0;
- id3_utf16_t utf16[2], *out;
+ switch (byteorder) {
+ default:
+ case ID3_UTF16_BYTEORDER_BE:
+ utf16 = ((*ptr)[0] << 8) | ((*ptr)[1] << 0);
+ break;
- if (byteorder == ID3_UTF16_BYTEORDER_ANY)
- size += id3_utf16_put(ptr, 0xfeff, byteorder);
+ case ID3_UTF16_BYTEORDER_LE:
+ utf16 = ((*ptr)[0] << 0) | ((*ptr)[1] << 8);
+ break;
+ }
- while (*ucs4) {
- switch (id3_utf16_encodechar(out = utf16, *ucs4++)) {
- case 2: size += id3_utf16_put(ptr, *out++, byteorder);
- case 1: size += id3_utf16_put(ptr, *out++, byteorder);
- case 0: break;
- }
- }
+ *ptr += 2;
- if (terminate)
- size += id3_utf16_put(ptr, 0, byteorder);
+ return utf16;
+}
- return size;
+/*
+ * NAME: utf16->serialize()
+ * DESCRIPTION: serialize a ucs4 string using utf16 encoding
+ */
+id3_length_t
+id3_utf16_serialize(id3_byte_t ** ptr, id3_ucs4_t const *ucs4,
+ enum id3_utf16_byteorder byteorder, int terminate)
+{
+ id3_length_t size = 0;
+ id3_utf16_t utf16[2],
+ *out;
+
+ if (byteorder == ID3_UTF16_BYTEORDER_ANY)
+ size += id3_utf16_put(ptr, 0xfeff, byteorder);
+
+ while (*ucs4) {
+ switch (id3_utf16_encodechar(out = utf16, *ucs4++)) {
+ case 2:
+ size += id3_utf16_put(ptr, *out++, byteorder);
+ case 1:
+ size += id3_utf16_put(ptr, *out++, byteorder);
+ case 0:
+ break;
+ }
+ }
+
+ if (terminate)
+ size += id3_utf16_put(ptr, 0, byteorder);
+
+ return size;
}
/*
- * NAME: utf16->deserialize()
- * DESCRIPTION: deserialize a ucs4 string using utf16 encoding
+ * NAME: utf16->deserialize()
+ * DESCRIPTION: deserialize a ucs4 string using utf16 encoding
*/
-id3_ucs4_t *id3_utf16_deserialize(id3_byte_t const **ptr, id3_length_t length,
- enum id3_utf16_byteorder byteorder)
+id3_ucs4_t *
+id3_utf16_deserialize(id3_byte_t const **ptr, id3_length_t length,
+ enum id3_utf16_byteorder byteorder)
{
- id3_byte_t const *end;
- id3_utf16_t *utf16ptr, *utf16;
- id3_ucs4_t *ucs4;
+ id3_byte_t const *end;
+ id3_utf16_t *utf16ptr,
+ *utf16;
+ id3_ucs4_t *ucs4;
- end = *ptr + (length & ~1);
+ end = *ptr + (length & ~1);
- utf16 = malloc((length / 2 + 1) * sizeof(*utf16));
- if (utf16 == 0)
- return 0;
+ utf16 = malloc((length / 2 + 1) * sizeof(*utf16));
+ if (utf16 == 0)
+ return 0;
- if (byteorder == ID3_UTF16_BYTEORDER_ANY && end - *ptr > 0) {
- switch (((*ptr)[0] << 8) |
- ((*ptr)[1] << 0)) {
- case 0xfeff:
- byteorder = ID3_UTF16_BYTEORDER_BE;
- *ptr += 2;
- break;
+ if (byteorder == ID3_UTF16_BYTEORDER_ANY && end - *ptr > 0) {
+ switch (((*ptr)[0] << 8) | ((*ptr)[1] << 0)) {
+ case 0xfeff:
+ byteorder = ID3_UTF16_BYTEORDER_BE;
+ *ptr += 2;
+ break;
- case 0xfffe:
- byteorder = ID3_UTF16_BYTEORDER_LE;
- *ptr += 2;
- break;
- }
- }
+ case 0xfffe:
+ byteorder = ID3_UTF16_BYTEORDER_LE;
+ *ptr += 2;
+ break;
+ }
+ }
- utf16ptr = utf16;
- while (end - *ptr > 0 && (*utf16ptr = id3_utf16_get(ptr, byteorder)))
- ++utf16ptr;
+ utf16ptr = utf16;
+ while (end - *ptr > 0
+ && (*utf16ptr = id3_utf16_get(ptr, byteorder)))
+ ++utf16ptr;
- *utf16ptr = 0;
+ *utf16ptr = 0;
- ucs4 = malloc((id3_utf16_length(utf16) + 1) * sizeof(*ucs4));
- if (ucs4)
- id3_utf16_decode(utf16, ucs4);
+ ucs4 = malloc((id3_utf16_length(utf16) + 1) * sizeof(*ucs4));
+ if (ucs4)
+ id3_utf16_decode(utf16, ucs4);
- free(utf16);
+ free(utf16);
- return ucs4;
+ return ucs4;
}
diff --git a/libid3tag/utf16.h b/libid3tag/utf16.h
index b7be49c..fe7466b 100644
--- a/libid3tag/utf16.h
+++ b/libid3tag/utf16.h
@@ -19,7 +19,7 @@
* $Id: utf16.h,v 1.8 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_UTF16_H
+#ifndef LIBID3TAG_UTF16_H
# define LIBID3TAG_UTF16_H
# include "id3tag.h"
@@ -48,4 +48,4 @@ id3_length_t id3_utf16_serialize(id3_byte_t **, id3_ucs4_t const *,
id3_ucs4_t *id3_utf16_deserialize(id3_byte_t const **, id3_length_t,
enum id3_utf16_byteorder);
-# endif
+#endif
diff --git a/libid3tag/utf8.c b/libid3tag/utf8.c
index 4d8649a..bb6109d 100644
--- a/libid3tag/utf8.c
+++ b/libid3tag/utf8.c
@@ -19,347 +19,355 @@
* $Id: utf8.c,v 1.9 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include <stdlib.h>
+#include <stdlib.h>
-# include "id3tag.h"
-# include "utf8.h"
-# include "ucs4.h"
+#include "id3tag.h"
+#include "utf8.h"
+#include "ucs4.h"
/*
- * NAME: utf8->length()
- * DESCRIPTION: return the number of ucs4 chars represented by a utf8 string
+ * NAME: utf8->length()
+ * DESCRIPTION: return the number of ucs4 chars represented by a utf8 string
*/
-id3_length_t id3_utf8_length(id3_utf8_t const *utf8)
+id3_length_t
+id3_utf8_length(id3_utf8_t const *utf8)
{
- id3_length_t length = 0;
-
- while (*utf8) {
- if ((utf8[0] & 0x80) == 0x00)
- ++length;
- else if ((utf8[0] & 0xe0) == 0xc0 &&
- (utf8[1] & 0xc0) == 0x80) {
- if (((utf8[0] & 0x1fL) << 6) >= 0x00000080L) {
- ++length;
- utf8 += 1;
- }
- }
- else if ((utf8[0] & 0xf0) == 0xe0 &&
- (utf8[1] & 0xc0) == 0x80 &&
- (utf8[2] & 0xc0) == 0x80) {
- if ((((utf8[0] & 0x0fL) << 12) |
- ((utf8[1] & 0x3fL) << 6)) >= 0x00000800L) {
- ++length;
- utf8 += 2;
- }
- }
- else if ((utf8[0] & 0xf8) == 0xf0 &&
- (utf8[1] & 0xc0) == 0x80 &&
- (utf8[2] & 0xc0) == 0x80 &&
- (utf8[3] & 0xc0) == 0x80) {
- if ((((utf8[0] & 0x07L) << 18) |
- ((utf8[1] & 0x3fL) << 12)) >= 0x00010000L) {
- ++length;
- utf8 += 3;
- }
- }
- else if ((utf8[0] & 0xfc) == 0xf8 &&
- (utf8[1] & 0xc0) == 0x80 &&
- (utf8[2] & 0xc0) == 0x80 &&
- (utf8[3] & 0xc0) == 0x80 &&
- (utf8[4] & 0xc0) == 0x80) {
- if ((((utf8[0] & 0x03L) << 24) |
- ((utf8[0] & 0x3fL) << 18)) >= 0x00200000L) {
- ++length;
- utf8 += 4;
- }
- }
- else if ((utf8[0] & 0xfe) == 0xfc &&
- (utf8[1] & 0xc0) == 0x80 &&
- (utf8[2] & 0xc0) == 0x80 &&
- (utf8[3] & 0xc0) == 0x80 &&
- (utf8[4] & 0xc0) == 0x80 &&
- (utf8[5] & 0xc0) == 0x80) {
- if ((((utf8[0] & 0x01L) << 30) |
- ((utf8[0] & 0x3fL) << 24)) >= 0x04000000L) {
- ++length;
- utf8 += 5;
- }
- }
-
- ++utf8;
- }
-
- return length;
+ id3_length_t length = 0;
+
+ while (*utf8) {
+ if ((utf8[0] & 0x80) == 0x00)
+ ++length;
+ else if ((utf8[0] & 0xe0) == 0xc0 &&
+ (utf8[1] & 0xc0) == 0x80) {
+ if (((utf8[0] & 0x1fL) << 6) >= 0x00000080L) {
+ ++length;
+ utf8 += 1;
+ }
+ } else if ((utf8[0] & 0xf0) == 0xe0 &&
+ (utf8[1] & 0xc0) == 0x80 &&
+ (utf8[2] & 0xc0) == 0x80) {
+ if ((((utf8[0] & 0x0fL) << 12) |
+ ((utf8[1] & 0x3fL) << 6)) >= 0x00000800L) {
+ ++length;
+ utf8 += 2;
+ }
+ } else if ((utf8[0] & 0xf8) == 0xf0 &&
+ (utf8[1] & 0xc0) == 0x80 &&
+ (utf8[2] & 0xc0) == 0x80 &&
+ (utf8[3] & 0xc0) == 0x80) {
+ if ((((utf8[0] & 0x07L) << 18) |
+ ((utf8[1] & 0x3fL) << 12)) >= 0x00010000L) {
+ ++length;
+ utf8 += 3;
+ }
+ } else if ((utf8[0] & 0xfc) == 0xf8 &&
+ (utf8[1] & 0xc0) == 0x80 &&
+ (utf8[2] & 0xc0) == 0x80 &&
+ (utf8[3] & 0xc0) == 0x80 &&
+ (utf8[4] & 0xc0) == 0x80) {
+ if ((((utf8[0] & 0x03L) << 24) |
+ ((utf8[0] & 0x3fL) << 18)) >= 0x00200000L) {
+ ++length;
+ utf8 += 4;
+ }
+ } else if ((utf8[0] & 0xfe) == 0xfc &&
+ (utf8[1] & 0xc0) == 0x80 &&
+ (utf8[2] & 0xc0) == 0x80 &&
+ (utf8[3] & 0xc0) == 0x80 &&
+ (utf8[4] & 0xc0) == 0x80 &&
+ (utf8[5] & 0xc0) == 0x80) {
+ if ((((utf8[0] & 0x01L) << 30) |
+ ((utf8[0] & 0x3fL) << 24)) >= 0x04000000L) {
+ ++length;
+ utf8 += 5;
+ }
+ }
+
+ ++utf8;
+ }
+
+ return length;
}
/*
- * NAME: utf8->size()
- * DESCRIPTION: return the encoding size of a utf8 string
+ * NAME: utf8->size()
+ * DESCRIPTION: return the encoding size of a utf8 string
*/
-id3_length_t id3_utf8_size(id3_utf8_t const *utf8)
+id3_length_t
+id3_utf8_size(id3_utf8_t const *utf8)
{
- id3_utf8_t const *ptr = utf8;
+ id3_utf8_t const *ptr = utf8;
- while (*ptr)
- ++ptr;
+ while (*ptr)
+ ++ptr;
- return ptr - utf8 + 1;
+ return ptr - utf8 + 1;
}
/*
- * NAME: utf8->ucs4duplicate()
- * DESCRIPTION: duplicate and decode a utf8 string into ucs4
+ * NAME: utf8->ucs4duplicate()
+ * DESCRIPTION: duplicate and decode a utf8 string into ucs4
*/
-id3_ucs4_t *id3_utf8_ucs4duplicate(id3_utf8_t const *utf8)
+id3_ucs4_t *
+id3_utf8_ucs4duplicate(id3_utf8_t const *utf8)
{
- id3_ucs4_t *ucs4;
+ id3_ucs4_t *ucs4;
- ucs4 = malloc((id3_utf8_length(utf8) + 1) * sizeof(*ucs4));
- if (ucs4)
- id3_utf8_decode(utf8, ucs4);
+ ucs4 = malloc((id3_utf8_length(utf8) + 1) * sizeof(*ucs4));
+ if (ucs4)
+ id3_utf8_decode(utf8, ucs4);
- return release(ucs4);
+ return release(ucs4);
}
/*
- * NAME: utf8->decodechar()
- * DESCRIPTION: decode a series of utf8 chars into a single ucs4 char
+ * NAME: utf8->decodechar()
+ * DESCRIPTION: decode a series of utf8 chars into a single ucs4 char
*/
-id3_length_t id3_utf8_decodechar(id3_utf8_t const *utf8, id3_ucs4_t *ucs4)
+id3_length_t
+id3_utf8_decodechar(id3_utf8_t const *utf8, id3_ucs4_t * ucs4)
{
- id3_utf8_t const *start = utf8;
-
- while (1) {
- if ((utf8[0] & 0x80) == 0x00) {
- *ucs4 = utf8[0];
- return utf8 - start + 1;
- }
- else if ((utf8[0] & 0xe0) == 0xc0 &&
- (utf8[1] & 0xc0) == 0x80) {
- *ucs4 =
- ((utf8[0] & 0x1fL) << 6) |
- ((utf8[1] & 0x3fL) << 0);
- if (*ucs4 >= 0x00000080L)
- return utf8 - start + 2;
- }
- else if ((utf8[0] & 0xf0) == 0xe0 &&
- (utf8[1] & 0xc0) == 0x80 &&
- (utf8[2] & 0xc0) == 0x80) {
- *ucs4 =
- ((utf8[0] & 0x0fL) << 12) |
- ((utf8[1] & 0x3fL) << 6) |
- ((utf8[2] & 0x3fL) << 0);
- if (*ucs4 >= 0x00000800L)
- return utf8 - start + 3;
- }
- else if ((utf8[0] & 0xf8) == 0xf0 &&
- (utf8[1] & 0xc0) == 0x80 &&
- (utf8[2] & 0xc0) == 0x80 &&
- (utf8[3] & 0xc0) == 0x80) {
- *ucs4 =
- ((utf8[0] & 0x07L) << 18) |
- ((utf8[1] & 0x3fL) << 12) |
- ((utf8[2] & 0x3fL) << 6) |
- ((utf8[3] & 0x3fL) << 0);
- if (*ucs4 >= 0x00010000L)
- return utf8 - start + 4;
- }
- else if ((utf8[0] & 0xfc) == 0xf8 &&
- (utf8[1] & 0xc0) == 0x80 &&
- (utf8[2] & 0xc0) == 0x80 &&
- (utf8[3] & 0xc0) == 0x80 &&
- (utf8[4] & 0xc0) == 0x80) {
- *ucs4 =
- ((utf8[0] & 0x03L) << 24) |
- ((utf8[1] & 0x3fL) << 18) |
- ((utf8[2] & 0x3fL) << 12) |
- ((utf8[3] & 0x3fL) << 6) |
- ((utf8[4] & 0x3fL) << 0);
- if (*ucs4 >= 0x00200000L)
- return utf8 - start + 5;
- }
- else if ((utf8[0] & 0xfe) == 0xfc &&
- (utf8[1] & 0xc0) == 0x80 &&
- (utf8[2] & 0xc0) == 0x80 &&
- (utf8[3] & 0xc0) == 0x80 &&
- (utf8[4] & 0xc0) == 0x80 &&
- (utf8[5] & 0xc0) == 0x80) {
- *ucs4 =
- ((utf8[0] & 0x01L) << 30) |
- ((utf8[1] & 0x3fL) << 24) |
- ((utf8[2] & 0x3fL) << 18) |
- ((utf8[3] & 0x3fL) << 12) |
- ((utf8[4] & 0x3fL) << 6) |
- ((utf8[5] & 0x3fL) << 0);
- if (*ucs4 >= 0x04000000L)
- return utf8 - start + 6;
- }
-
- ++utf8;
- }
+ id3_utf8_t const *start = utf8;
+
+ while (1) {
+ if ((utf8[0] & 0x80) == 0x00) {
+ *ucs4 = utf8[0];
+ return utf8 - start + 1;
+ } else if ((utf8[0] & 0xe0) == 0xc0 &&
+ (utf8[1] & 0xc0) == 0x80) {
+ *ucs4 =
+ ((utf8[0] & 0x1fL) << 6) |
+ ((utf8[1] & 0x3fL) << 0);
+ if (*ucs4 >= 0x00000080L)
+ return utf8 - start + 2;
+ } else if ((utf8[0] & 0xf0) == 0xe0 &&
+ (utf8[1] & 0xc0) == 0x80 &&
+ (utf8[2] & 0xc0) == 0x80) {
+ *ucs4 =
+ ((utf8[0] & 0x0fL) << 12) |
+ ((utf8[1] & 0x3fL) << 6) |
+ ((utf8[2] & 0x3fL) << 0);
+ if (*ucs4 >= 0x00000800L)
+ return utf8 - start + 3;
+ } else if ((utf8[0] & 0xf8) == 0xf0 &&
+ (utf8[1] & 0xc0) == 0x80 &&
+ (utf8[2] & 0xc0) == 0x80 &&
+ (utf8[3] & 0xc0) == 0x80) {
+ *ucs4 =
+ ((utf8[0] & 0x07L) << 18) |
+ ((utf8[1] & 0x3fL) << 12) |
+ ((utf8[2] & 0x3fL) << 6) |
+ ((utf8[3] & 0x3fL) << 0);
+ if (*ucs4 >= 0x00010000L)
+ return utf8 - start + 4;
+ } else if ((utf8[0] & 0xfc) == 0xf8 &&
+ (utf8[1] & 0xc0) == 0x80 &&
+ (utf8[2] & 0xc0) == 0x80 &&
+ (utf8[3] & 0xc0) == 0x80 &&
+ (utf8[4] & 0xc0) == 0x80) {
+ *ucs4 =
+ ((utf8[0] & 0x03L) << 24) |
+ ((utf8[1] & 0x3fL) << 18) |
+ ((utf8[2] & 0x3fL) << 12) |
+ ((utf8[3] & 0x3fL) << 6) |
+ ((utf8[4] & 0x3fL) << 0);
+ if (*ucs4 >= 0x00200000L)
+ return utf8 - start + 5;
+ } else if ((utf8[0] & 0xfe) == 0xfc &&
+ (utf8[1] & 0xc0) == 0x80 &&
+ (utf8[2] & 0xc0) == 0x80 &&
+ (utf8[3] & 0xc0) == 0x80 &&
+ (utf8[4] & 0xc0) == 0x80 &&
+ (utf8[5] & 0xc0) == 0x80) {
+ *ucs4 =
+ ((utf8[0] & 0x01L) << 30) |
+ ((utf8[1] & 0x3fL) << 24) |
+ ((utf8[2] & 0x3fL) << 18) |
+ ((utf8[3] & 0x3fL) << 12) |
+ ((utf8[4] & 0x3fL) << 6) |
+ ((utf8[5] & 0x3fL) << 0);
+ if (*ucs4 >= 0x04000000L)
+ return utf8 - start + 6;
+ }
+
+ ++utf8;
+ }
}
/*
- * NAME: utf8->encodechar()
- * DESCRIPTION: encode a single ucs4 char into a series of up to 6 utf8 chars
+ * NAME: utf8->encodechar()
+ * DESCRIPTION: encode a single ucs4 char into a series of up to 6 utf8 chars
*/
-id3_length_t id3_utf8_encodechar(id3_utf8_t *utf8, id3_ucs4_t ucs4)
+id3_length_t
+id3_utf8_encodechar(id3_utf8_t * utf8, id3_ucs4_t ucs4)
{
- if (ucs4 <= 0x0000007fL) {
- utf8[0] = ucs4;
-
- return 1;
- }
- else if (ucs4 <= 0x000007ffL) {
- utf8[0] = 0xc0 | ((ucs4 >> 6) & 0x1f);
- utf8[1] = 0x80 | ((ucs4 >> 0) & 0x3f);
-
- return 2;
- }
- else if (ucs4 <= 0x0000ffffL) {
- utf8[0] = 0xe0 | ((ucs4 >> 12) & 0x0f);
- utf8[1] = 0x80 | ((ucs4 >> 6) & 0x3f);
- utf8[2] = 0x80 | ((ucs4 >> 0) & 0x3f);
-
- return 3;
- }
- else if (ucs4 <= 0x001fffffL) {
- utf8[0] = 0xf0 | ((ucs4 >> 18) & 0x07);
- utf8[1] = 0x80 | ((ucs4 >> 12) & 0x3f);
- utf8[2] = 0x80 | ((ucs4 >> 6) & 0x3f);
- utf8[3] = 0x80 | ((ucs4 >> 0) & 0x3f);
-
- return 4;
- }
- else if (ucs4 <= 0x03ffffffL) {
- utf8[0] = 0xf8 | ((ucs4 >> 24) & 0x03);
- utf8[1] = 0x80 | ((ucs4 >> 18) & 0x3f);
- utf8[2] = 0x80 | ((ucs4 >> 12) & 0x3f);
- utf8[3] = 0x80 | ((ucs4 >> 6) & 0x3f);
- utf8[4] = 0x80 | ((ucs4 >> 0) & 0x3f);
-
- return 5;
- }
- else if (ucs4 <= 0x7fffffffL) {
- utf8[0] = 0xfc | ((ucs4 >> 30) & 0x01);
- utf8[1] = 0x80 | ((ucs4 >> 24) & 0x3f);
- utf8[2] = 0x80 | ((ucs4 >> 18) & 0x3f);
- utf8[3] = 0x80 | ((ucs4 >> 12) & 0x3f);
- utf8[4] = 0x80 | ((ucs4 >> 6) & 0x3f);
- utf8[5] = 0x80 | ((ucs4 >> 0) & 0x3f);
-
- return 6;
- }
-
- /* default */
-
- return id3_utf8_encodechar(utf8, ID3_UCS4_REPLACEMENTCHAR);
+ if (ucs4 <= 0x0000007fL) {
+ utf8[0] = ucs4;
+
+ return 1;
+ } else if (ucs4 <= 0x000007ffL) {
+ utf8[0] = 0xc0 | ((ucs4 >> 6) & 0x1f);
+ utf8[1] = 0x80 | ((ucs4 >> 0) & 0x3f);
+
+ return 2;
+ } else if (ucs4 <= 0x0000ffffL) {
+ utf8[0] = 0xe0 | ((ucs4 >> 12) & 0x0f);
+ utf8[1] = 0x80 | ((ucs4 >> 6) & 0x3f);
+ utf8[2] = 0x80 | ((ucs4 >> 0) & 0x3f);
+
+ return 3;
+ } else if (ucs4 <= 0x001fffffL) {
+ utf8[0] = 0xf0 | ((ucs4 >> 18) & 0x07);
+ utf8[1] = 0x80 | ((ucs4 >> 12) & 0x3f);
+ utf8[2] = 0x80 | ((ucs4 >> 6) & 0x3f);
+ utf8[3] = 0x80 | ((ucs4 >> 0) & 0x3f);
+
+ return 4;
+ } else if (ucs4 <= 0x03ffffffL) {
+ utf8[0] = 0xf8 | ((ucs4 >> 24) & 0x03);
+ utf8[1] = 0x80 | ((ucs4 >> 18) & 0x3f);
+ utf8[2] = 0x80 | ((ucs4 >> 12) & 0x3f);
+ utf8[3] = 0x80 | ((ucs4 >> 6) & 0x3f);
+ utf8[4] = 0x80 | ((ucs4 >> 0) & 0x3f);
+
+ return 5;
+ } else if (ucs4 <= 0x7fffffffL) {
+ utf8[0] = 0xfc | ((ucs4 >> 30) & 0x01);
+ utf8[1] = 0x80 | ((ucs4 >> 24) & 0x3f);
+ utf8[2] = 0x80 | ((ucs4 >> 18) & 0x3f);
+ utf8[3] = 0x80 | ((ucs4 >> 12) & 0x3f);
+ utf8[4] = 0x80 | ((ucs4 >> 6) & 0x3f);
+ utf8[5] = 0x80 | ((ucs4 >> 0) & 0x3f);
+
+ return 6;
+ }
+
+ /*
+ * default
+ */
+
+ return id3_utf8_encodechar(utf8, ID3_UCS4_REPLACEMENTCHAR);
}
/*
- * NAME: utf8->decode()
- * DESCRIPTION: decode a complete utf8 string into a ucs4 string
+ * NAME: utf8->decode()
+ * DESCRIPTION: decode a complete utf8 string into a ucs4 string
*/
-void id3_utf8_decode(id3_utf8_t const *utf8, id3_ucs4_t *ucs4)
+void
+id3_utf8_decode(id3_utf8_t const *utf8, id3_ucs4_t * ucs4)
{
- do
- utf8 += id3_utf8_decodechar(utf8, ucs4);
- while (*ucs4++);
+ do
+ utf8 += id3_utf8_decodechar(utf8, ucs4);
+ while (*ucs4++);
}
/*
- * NAME: utf8->encode()
- * DESCRIPTION: encode a complete ucs4 string into a utf8 string
+ * NAME: utf8->encode()
+ * DESCRIPTION: encode a complete ucs4 string into a utf8 string
*/
-void id3_utf8_encode(id3_utf8_t *utf8, id3_ucs4_t const *ucs4)
+void
+id3_utf8_encode(id3_utf8_t * utf8, id3_ucs4_t const *ucs4)
{
- do
- utf8 += id3_utf8_encodechar(utf8, *ucs4);
- while (*ucs4++);
+ do
+ utf8 += id3_utf8_encodechar(utf8, *ucs4);
+ while (*ucs4++);
}
/*
- * NAME: utf8->put()
- * DESCRIPTION: serialize a single utf8 character
+ * NAME: utf8->put()
+ * DESCRIPTION: serialize a single utf8 character
*/
-id3_length_t id3_utf8_put(id3_byte_t **ptr, id3_utf8_t utf8)
+id3_length_t
+id3_utf8_put(id3_byte_t ** ptr, id3_utf8_t utf8)
{
- if (ptr)
- *(*ptr)++ = utf8;
+ if (ptr)
+ *(*ptr)++ = utf8;
- return 1;
+ return 1;
}
/*
- * NAME: utf8->get()
- * DESCRIPTION: deserialize a single utf8 character
+ * NAME: utf8->get()
+ * DESCRIPTION: deserialize a single utf8 character
*/
-id3_utf8_t id3_utf8_get(id3_byte_t const **ptr)
+id3_utf8_t
+id3_utf8_get(id3_byte_t const **ptr)
{
- return *(*ptr)++;
+ return *(*ptr)++;
}
/*
- * NAME: utf8->serialize()
- * DESCRIPTION: serialize a ucs4 string using utf8 encoding
+ * NAME: utf8->serialize()
+ * DESCRIPTION: serialize a ucs4 string using utf8 encoding
*/
-id3_length_t id3_utf8_serialize(id3_byte_t **ptr, id3_ucs4_t const *ucs4,
- int terminate)
+id3_length_t
+id3_utf8_serialize(id3_byte_t ** ptr, id3_ucs4_t const *ucs4,
+ int terminate)
{
- id3_length_t size = 0;
- id3_utf8_t utf8[6], *out;
-
- while (*ucs4) {
- switch (id3_utf8_encodechar(out = utf8, *ucs4++)) {
- case 6: size += id3_utf8_put(ptr, *out++);
- case 5: size += id3_utf8_put(ptr, *out++);
- case 4: size += id3_utf8_put(ptr, *out++);
- case 3: size += id3_utf8_put(ptr, *out++);
- case 2: size += id3_utf8_put(ptr, *out++);
- case 1: size += id3_utf8_put(ptr, *out++);
- case 0: break;
- }
- }
-
- if (terminate)
- size += id3_utf8_put(ptr, 0);
-
- return size;
+ id3_length_t size = 0;
+ id3_utf8_t utf8[6],
+ *out;
+
+ while (*ucs4) {
+ switch (id3_utf8_encodechar(out = utf8, *ucs4++)) {
+ case 6:
+ size += id3_utf8_put(ptr, *out++);
+ case 5:
+ size += id3_utf8_put(ptr, *out++);
+ case 4:
+ size += id3_utf8_put(ptr, *out++);
+ case 3:
+ size += id3_utf8_put(ptr, *out++);
+ case 2:
+ size += id3_utf8_put(ptr, *out++);
+ case 1:
+ size += id3_utf8_put(ptr, *out++);
+ case 0:
+ break;
+ }
+ }
+
+ if (terminate)
+ size += id3_utf8_put(ptr, 0);
+
+ return size;
}
/*
- * NAME: utf8->deserialize()
- * DESCRIPTION: deserialize a ucs4 string using utf8 encoding
+ * NAME: utf8->deserialize()
+ * DESCRIPTION: deserialize a ucs4 string using utf8 encoding
*/
-id3_ucs4_t *id3_utf8_deserialize(id3_byte_t const **ptr, id3_length_t length)
+id3_ucs4_t *
+id3_utf8_deserialize(id3_byte_t const **ptr, id3_length_t length)
{
- id3_byte_t const *end;
- id3_utf8_t *utf8ptr, *utf8;
- id3_ucs4_t *ucs4;
+ id3_byte_t const *end;
+ id3_utf8_t *utf8ptr,
+ *utf8;
+ id3_ucs4_t *ucs4;
- end = *ptr + length;
+ end = *ptr + length;
- utf8 = malloc((length + 1) * sizeof(*utf8));
- if (utf8 == 0)
- return 0;
+ utf8 = malloc((length + 1) * sizeof(*utf8));
+ if (utf8 == 0)
+ return 0;
- utf8ptr = utf8;
- while (end - *ptr > 0 && (*utf8ptr = id3_utf8_get(ptr)))
- ++utf8ptr;
+ utf8ptr = utf8;
+ while (end - *ptr > 0 && (*utf8ptr = id3_utf8_get(ptr)))
+ ++utf8ptr;
- *utf8ptr = 0;
+ *utf8ptr = 0;
- ucs4 = malloc((id3_utf8_length(utf8) + 1) * sizeof(*ucs4));
- if (ucs4)
- id3_utf8_decode(utf8, ucs4);
+ ucs4 = malloc((id3_utf8_length(utf8) + 1) * sizeof(*ucs4));
+ if (ucs4)
+ id3_utf8_decode(utf8, ucs4);
- free(utf8);
+ free(utf8);
- return ucs4;
+ return ucs4;
}
diff --git a/libid3tag/utf8.h b/libid3tag/utf8.h
index 572bb2a..279b7ad 100644
--- a/libid3tag/utf8.h
+++ b/libid3tag/utf8.h
@@ -19,7 +19,7 @@
* $Id: utf8.h,v 1.7 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_UTF8_H
+#ifndef LIBID3TAG_UTF8_H
# define LIBID3TAG_UTF8_H
# include "id3tag.h"
@@ -39,4 +39,4 @@ id3_utf8_t id3_utf8_get(id3_byte_t const **);
id3_length_t id3_utf8_serialize(id3_byte_t **, id3_ucs4_t const *, int);
id3_ucs4_t *id3_utf8_deserialize(id3_byte_t const **, id3_length_t);
-# endif
+#endif
diff --git a/libid3tag/util.c b/libid3tag/util.c
index 61ccccf..bad0f11 100644
--- a/libid3tag/util.c
+++ b/libid3tag/util.c
@@ -19,129 +19,139 @@
* $Id: util.c,v 1.9 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include <stdlib.h>
-# include <zlib.h>
+#include <stdlib.h>
+#include <zlib.h>
-# include "id3tag.h"
-# include "util.h"
+#include "id3tag.h"
+#include "util.h"
/*
- * NAME: util->unsynchronise()
- * DESCRIPTION: perform (in-place) unsynchronisation
+ * NAME: util->unsynchronise()
+ * DESCRIPTION: perform (in-place) unsynchronisation
*/
-id3_length_t id3_util_unsynchronise(id3_byte_t *data, id3_length_t length)
+id3_length_t
+id3_util_unsynchronise(id3_byte_t * data, id3_length_t length)
{
- id3_length_t bytes = 0, count;
- id3_byte_t *end = data + length;
- id3_byte_t const *ptr;
-
- if (length == 0)
- return 0;
-
- for (ptr = data; ptr < end - 1; ++ptr) {
- if (ptr[0] == 0xff && (ptr[1] == 0x00 || (ptr[1] & 0xe0) == 0xe0))
- ++bytes;
- }
-
- if (bytes) {
- ptr = end;
- end += bytes;
-
- *--end = *--ptr;
-
- for (count = bytes; count; *--end = *--ptr) {
- if (ptr[-1] == 0xff && (ptr[0] == 0x00 || (ptr[0] & 0xe0) == 0xe0)) {
- *--end = 0x00;
- --count;
- }
- }
- }
-
- return length + bytes;
+ id3_length_t bytes = 0,
+ count;
+ id3_byte_t *end = data + length;
+ id3_byte_t const *ptr;
+
+ if (length == 0)
+ return 0;
+
+ for (ptr = data; ptr < end - 1; ++ptr) {
+ if (ptr[0] == 0xff
+ && (ptr[1] == 0x00 || (ptr[1] & 0xe0) == 0xe0))
+ ++bytes;
+ }
+
+ if (bytes) {
+ ptr = end;
+ end += bytes;
+
+ *--end = *--ptr;
+
+ for (count = bytes; count; *--end = *--ptr) {
+ if (ptr[-1] == 0xff
+ && (ptr[0] == 0x00
+ || (ptr[0] & 0xe0) == 0xe0)) {
+ *--end = 0x00;
+ --count;
+ }
+ }
+ }
+
+ return length + bytes;
}
/*
- * NAME: util->deunsynchronise()
- * DESCRIPTION: undo unsynchronisation (in-place)
+ * NAME: util->deunsynchronise()
+ * DESCRIPTION: undo unsynchronisation (in-place)
*/
-id3_length_t id3_util_deunsynchronise(id3_byte_t *data, id3_length_t length)
+id3_length_t
+id3_util_deunsynchronise(id3_byte_t * data, id3_length_t length)
{
- id3_byte_t const *old, *end = data + length;
- id3_byte_t *new;
+ id3_byte_t const *old,
+ *end = data + length;
+ id3_byte_t *new;
- if (length == 0)
- return 0;
+ if (length == 0)
+ return 0;
- for (old = new = data; old < end - 1; ++old) {
- *new++ = *old;
- if (old[0] == 0xff && old[1] == 0x00)
- ++old;
- }
+ for (old = new = data; old < end - 1; ++old) {
+ *new++ = *old;
+ if (old[0] == 0xff && old[1] == 0x00)
+ ++old;
+ }
- *new++ = *old;
+ *new++ = *old;
- return new - data;
+ return new - data;
}
/*
- * NAME: util->compress()
- * DESCRIPTION: perform zlib deflate method compression
+ * NAME: util->compress()
+ * DESCRIPTION: perform zlib deflate method compression
*/
-id3_byte_t *id3_util_compress(id3_byte_t const *data, id3_length_t length,
- id3_length_t *newlength)
+id3_byte_t *
+id3_util_compress(id3_byte_t const *data, id3_length_t length,
+ id3_length_t * newlength)
{
- id3_byte_t *compressed;
-
- *newlength = length + 12;
- *newlength += *newlength / 1000;
-
- compressed = malloc(*newlength);
- if (compressed) {
- if (compress2(compressed, newlength, data, length,
- Z_BEST_COMPRESSION) != Z_OK ||
- *newlength >= length) {
- free(compressed);
- compressed = 0;
- }
- else {
- id3_byte_t *resized;
-
- resized = realloc(compressed, *newlength ? *newlength : 1);
- if (resized)
- compressed = resized;
- }
- }
-
- return compressed;
+ id3_byte_t *compressed;
+
+ *newlength = length + 12;
+ *newlength += *newlength / 1000;
+
+ compressed = malloc(*newlength);
+ if (compressed) {
+ if (compress2(compressed, newlength, data, length,
+ Z_BEST_COMPRESSION) != Z_OK ||
+ *newlength >= length) {
+ free(compressed);
+ compressed = 0;
+ } else {
+ id3_byte_t *resized;
+
+ resized =
+ realloc(compressed,
+ *newlength ? *newlength : 1);
+ if (resized)
+ compressed = resized;
+ }
+ }
+
+ return compressed;
}
/*
- * NAME: util->decompress()
- * DESCRIPTION: undo zlib deflate method compression
+ * NAME: util->decompress()
+ * DESCRIPTION: undo zlib deflate method compression
*/
-id3_byte_t *id3_util_decompress(id3_byte_t const *data, id3_length_t length,
- id3_length_t newlength)
+id3_byte_t *
+id3_util_decompress(id3_byte_t const *data, id3_length_t length,
+ id3_length_t newlength)
{
- id3_byte_t *decompressed;
+ id3_byte_t *decompressed;
- decompressed = malloc(newlength ? newlength : 1);
- if (decompressed) {
- id3_length_t size;
+ decompressed = malloc(newlength ? newlength : 1);
+ if (decompressed) {
+ id3_length_t size;
- size = newlength;
+ size = newlength;
- if (uncompress(decompressed, &size, data, length) != Z_OK ||
- size != newlength) {
- free(decompressed);
- decompressed = 0;
- }
- }
+ if (uncompress(decompressed, &size, data, length) != Z_OK
+ || size != newlength) {
+ free(decompressed);
+ decompressed = 0;
+ }
+ }
- return decompressed;
+ return decompressed;
}
diff --git a/libid3tag/util.h b/libid3tag/util.h
index 4b895d2..46d3cc4 100644
--- a/libid3tag/util.h
+++ b/libid3tag/util.h
@@ -19,7 +19,7 @@
* $Id: util.h,v 1.6 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_UTIL_H
+#ifndef LIBID3TAG_UTIL_H
# define LIBID3TAG_UTIL_H
# include "id3tag.h"
@@ -32,4 +32,4 @@ id3_byte_t *id3_util_compress(id3_byte_t const *, id3_length_t,
id3_byte_t *id3_util_decompress(id3_byte_t const *, id3_length_t,
id3_length_t);
-# endif
+#endif
diff --git a/libid3tag/version.c b/libid3tag/version.c
index d54b80a..ca8d46a 100644
--- a/libid3tag/version.c
+++ b/libid3tag/version.c
@@ -19,27 +19,27 @@
* $Id: version.c,v 1.7 2004/01/23 09:41:32 rob Exp $
*/
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-# include "global.h"
+#include "global.h"
-# include "id3tag.h"
-# include "version.h"
+#include "id3tag.h"
+#include "version.h"
-char const id3_version[] = "ID3 Tag Library " ID3_VERSION;
-char const id3_copyright[] = "Copyright (C) " ID3_PUBLISHYEAR " " ID3_AUTHOR;
-char const id3_author[] = ID3_AUTHOR " <" ID3_EMAIL ">";
+char const id3_version[] = "ID3 Tag Library " ID3_VERSION;
+char const id3_copyright[] =
+ "Copyright (C) " ID3_PUBLISHYEAR " " ID3_AUTHOR;
+char const id3_author[] = ID3_AUTHOR " <" ID3_EMAIL ">";
char const id3_build[] = ""
-# if defined(DEBUG)
- "DEBUG "
-# elif defined(NDEBUG)
- "NDEBUG "
-# endif
-
-# if defined(EXPERIMENTAL)
- "EXPERIMENTAL "
-# endif
-;
+#if defined(DEBUG)
+ "DEBUG "
+#elif defined(NDEBUG)
+ "NDEBUG "
+#endif
+#if defined(EXPERIMENTAL)
+ "EXPERIMENTAL "
+#endif
+ ;
diff --git a/libid3tag/version.h b/libid3tag/version.h
index 5eaa11f..ac96fd6 100644
--- a/libid3tag/version.h
+++ b/libid3tag/version.h
@@ -19,7 +19,7 @@
* $Id: version.h,v 1.7 2004/01/23 09:41:32 rob Exp $
*/
-# ifndef LIBID3TAG_VERSION_H
+#ifndef LIBID3TAG_VERSION_H
# define LIBID3TAG_VERSION_H
-# endif
+#endif

Return to:

Send suggestions and report system problems to the System administrator.