diff options
author | Max Kellermann <max@duempel.org> | 2013-09-05 18:13:29 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-09-05 18:27:40 +0200 |
commit | 0d73a49327fed7e20614a3032cc20fd1c0caec7f (patch) | |
tree | e7144ccf7edf02faf5076ca8eb68a5b80f198efc /src | |
parent | 6239dd96f2250c75e5d223a99e9bb7efa736daa3 (diff) | |
download | mpd-0d73a49327fed7e20614a3032cc20fd1c0caec7f.tar.gz mpd-0d73a49327fed7e20614a3032cc20fd1c0caec7f.tar.xz mpd-0d73a49327fed7e20614a3032cc20fd1c0caec7f.zip |
Tag: move fix_tag_value() to TagString.cxx
Diffstat (limited to '')
-rw-r--r-- | src/tag/Tag.cxx | 104 | ||||
-rw-r--r-- | src/tag/TagString.cxx | 126 | ||||
-rw-r--r-- | src/tag/TagString.hxx | 32 |
3 files changed, 160 insertions, 102 deletions
diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx index 20711f1cc..d0e44862d 100644 --- a/src/tag/Tag.cxx +++ b/src/tag/Tag.cxx @@ -21,6 +21,7 @@ #include "Tag.hxx" #include "TagInternal.hxx" #include "TagPool.hxx" +#include "TagString.hxx" #include <glib.h> #include <assert.h> @@ -216,48 +217,6 @@ Tag::HasType(tag_type type) const return GetValue(type) != nullptr; } -/** - * Replace invalid sequences with the question mark. - */ -static char * -patch_utf8(const char *src, size_t length, const gchar *end) -{ - /* duplicate the string, and replace invalid bytes in that - buffer */ - char *dest = g_strdup(src); - - do { - dest[end - src] = '?'; - } while (!g_utf8_validate(end + 1, (src + length) - (end + 1), &end)); - - return dest; -} - -static char * -fix_utf8(const char *str, size_t length) -{ - const gchar *end; - char *temp; - gsize written; - - assert(str != nullptr); - - /* check if the string is already valid UTF-8 */ - if (g_utf8_validate(str, length, &end)) - return nullptr; - - /* no, it's not - try to import it from ISO-Latin-1 */ - temp = g_convert(str, length, "utf-8", "iso-8859-1", - nullptr, &written, nullptr); - if (temp != nullptr) - /* success! */ - return temp; - - /* no, still broken - there's no medication, just patch - invalid sequences */ - return patch_utf8(str, length, end); -} - void Tag::BeginAdd() { @@ -292,71 +251,12 @@ Tag::EndAdd() #endif } -static bool -char_is_non_printable(unsigned char ch) -{ - return ch < 0x20; -} - -static const char * -find_non_printable(const char *p, size_t length) -{ - for (size_t i = 0; i < length; ++i) - if (char_is_non_printable(p[i])) - return p + i; - - return nullptr; -} - -/** - * Clears all non-printable characters, convert them to space. - * Returns nullptr if nothing needs to be cleared. - */ -static char * -clear_non_printable(const char *p, size_t length) -{ - const char *first = find_non_printable(p, length); - char *dest; - - if (first == nullptr) - return nullptr; - - dest = g_strndup(p, length); - - for (size_t i = first - p; i < length; ++i) - if (char_is_non_printable(dest[i])) - dest[i] = ' '; - - return dest; -} - -static char * -fix_tag_value(const char *p, size_t length) -{ - char *utf8, *cleared; - - utf8 = fix_utf8(p, length); - if (utf8 != nullptr) { - p = utf8; - length = strlen(p); - } - - cleared = clear_non_printable(p, length); - if (cleared == nullptr) - cleared = utf8; - else - g_free(utf8); - - return cleared; -} - void Tag::AddItemInternal(tag_type type, const char *value, size_t len) { unsigned int i = num_items; - char *p; - p = fix_tag_value(value, len); + char *p = FixTagString(value, len); if (p != nullptr) { value = p; len = strlen(value); diff --git a/src/tag/TagString.cxx b/src/tag/TagString.cxx new file mode 100644 index 000000000..3e8d8c1b0 --- /dev/null +++ b/src/tag/TagString.cxx @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" +#include "TagString.hxx" + +#include <glib.h> + +#include <assert.h> +#include <string.h> + +/** + * Replace invalid sequences with the question mark. + */ +static char * +patch_utf8(const char *src, size_t length, const gchar *end) +{ + /* duplicate the string, and replace invalid bytes in that + buffer */ + char *dest = g_strdup(src); + + do { + dest[end - src] = '?'; + } while (!g_utf8_validate(end + 1, (src + length) - (end + 1), &end)); + + return dest; +} + +static char * +fix_utf8(const char *str, size_t length) +{ + const gchar *end; + char *temp; + gsize written; + + assert(str != nullptr); + + /* check if the string is already valid UTF-8 */ + if (g_utf8_validate(str, length, &end)) + return nullptr; + + /* no, it's not - try to import it from ISO-Latin-1 */ + temp = g_convert(str, length, "utf-8", "iso-8859-1", + nullptr, &written, nullptr); + if (temp != nullptr) + /* success! */ + return temp; + + /* no, still broken - there's no medication, just patch + invalid sequences */ + return patch_utf8(str, length, end); +} + +static bool +char_is_non_printable(unsigned char ch) +{ + return ch < 0x20; +} + +static const char * +find_non_printable(const char *p, size_t length) +{ + for (size_t i = 0; i < length; ++i) + if (char_is_non_printable(p[i])) + return p + i; + + return nullptr; +} + +/** + * Clears all non-printable characters, convert them to space. + * Returns nullptr if nothing needs to be cleared. + */ +static char * +clear_non_printable(const char *p, size_t length) +{ + const char *first = find_non_printable(p, length); + char *dest; + + if (first == nullptr) + return nullptr; + + dest = g_strndup(p, length); + + for (size_t i = first - p; i < length; ++i) + if (char_is_non_printable(dest[i])) + dest[i] = ' '; + + return dest; +} + +char * +FixTagString(const char *p, size_t length) +{ + char *utf8, *cleared; + + utf8 = fix_utf8(p, length); + if (utf8 != nullptr) { + p = utf8; + length = strlen(p); + } + + cleared = clear_non_printable(p, length); + if (cleared == nullptr) + cleared = utf8; + else + g_free(utf8); + + return cleared; +} diff --git a/src/tag/TagString.hxx b/src/tag/TagString.hxx new file mode 100644 index 000000000..21ea139bf --- /dev/null +++ b/src/tag/TagString.hxx @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_TAG_STRING_HXX +#define MPD_TAG_STRING_HXX + +#include "check.h" +#include "gcc.h" + +#include <stddef.h> + +gcc_malloc gcc_nonnull_all +char * +FixTagString(const char *p, size_t length); + +#endif |