Re-tagging 0.13.0 release to fix a couple of bugs with the tarball.

git-svn-id: https://svn.musicpd.org/mpd/tags/release-0.13.0@6325 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 168 insertions, 0 deletions

diff --git a/trunk/src/charConv.c b/trunk/src/charConv.c
new file mode 100644
index 000000000..69777c47a
--- /dev/null
+++ b/trunk/src/charConv.c
@@ -0,0 +1,168 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "charConv.h"
+#include "mpd_types.h"
+#include "utf8.h"
+#include "utils.h"
+
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+
+#ifdef HAVE_ICONV
+#include <iconv.h>
+static iconv_t char_conv_iconv;
+#endif
+
+static char *char_conv_to;
+static char *char_conv_from;
+static mpd_sint8 char_conv_same;
+static mpd_sint8 char_conv_use_iconv;
+
+/* 1 is to use latin1ToUtf8
+   0 is not to use latin1/utf8 converter
+  -1 is to use utf8ToLatin1*/
+static mpd_sint8 char_conv_latin1ToUtf8;
+
+#define BUFFER_SIZE	1024
+
+static void closeCharSetConversion(void);
+
+int setCharSetConversion(char *to, char *from)
+{
+	if (char_conv_to && char_conv_from) {
+		if (char_conv_latin1ToUtf8 &&
+		    !strcmp(from, char_conv_to) &&
+		    !strcmp(to, char_conv_from)) {
+			char *swap = char_conv_from;
+			char_conv_from = char_conv_to;
+			char_conv_to = swap;
+			char_conv_latin1ToUtf8 *= -1;
+			return 0;
+		} else if (!strcmp(to, char_conv_to) &&
+		           !strcmp(from,char_conv_from)) {
+			return 0;
+		}
+	}
+
+	closeCharSetConversion();
+
+	if (0 == strcmp(to, from)) {
+		char_conv_same = 1;
+		char_conv_to = xstrdup(to);
+		char_conv_from = xstrdup(from);
+		return 0;
+	}
+
+	if (strcmp(to, "UTF-8") == 0 && strcmp(from, "ISO-8859-1") == 0) {
+		char_conv_latin1ToUtf8 = 1;
+	} else if (strcmp(to, "ISO-8859-1") == 0 && strcmp(from, "UTF-8") == 0) {
+		char_conv_latin1ToUtf8 = -1;
+	}
+
+	if (char_conv_latin1ToUtf8 != 0) {
+		char_conv_to = xstrdup(to);
+		char_conv_from = xstrdup(from);
+		return 0;
+	}
+#ifdef HAVE_ICONV
+	if ((char_conv_iconv = iconv_open(to, from)) == (iconv_t) (-1))
+		return -1;
+
+	char_conv_to = xstrdup(to);
+	char_conv_from = xstrdup(from);
+	char_conv_use_iconv = 1;
+
+	return 0;
+#endif
+
+	return -1;
+}
+
+char *convStrDup(char *string)
+{
+	if (!char_conv_to)
+		return NULL;
+
+	if (char_conv_same)
+		return xstrdup(string);
+
+#ifdef HAVE_ICONV
+	if (char_conv_use_iconv) {
+		char buffer[BUFFER_SIZE];
+		size_t inleft = strlen(string);
+		char *ret;
+		size_t outleft;
+		size_t retlen = 0;
+		size_t err;
+		char *bufferPtr;
+
+		ret = xmalloc(1);
+		ret[0] = '\0';
+
+		while (inleft) {
+			bufferPtr = buffer;
+			outleft = BUFFER_SIZE;
+			err =
+			    iconv(char_conv_iconv, &string, &inleft, &bufferPtr,
+				  &outleft);
+			if (outleft == BUFFER_SIZE
+			    || (err == -1L && errno != E2BIG)) {
+				free(ret);
+				return NULL;
+			}
+
+			ret = xrealloc(ret, retlen + BUFFER_SIZE - outleft + 1);
+			memcpy(ret + retlen, buffer, BUFFER_SIZE - outleft);
+			retlen += BUFFER_SIZE - outleft;
+			ret[retlen] = '\0';
+		}
+
+		return ret;
+	}
+#endif
+
+	switch (char_conv_latin1ToUtf8) {
+	case 1:
+		return latin1StrToUtf8Dup(string);
+		break;
+	case -1:
+		return utf8StrToLatin1Dup(string);
+		break;
+	}
+
+	return NULL;
+}
+
+static void closeCharSetConversion(void)
+{
+	if (char_conv_to) {
+#ifdef HAVE_ICONV
+		if (char_conv_use_iconv)
+			iconv_close(char_conv_iconv);
+#endif
+		free(char_conv_to);
+		free(char_conv_from);
+		char_conv_to = NULL;
+		char_conv_from = NULL;
+		char_conv_same = 0;
+		char_conv_latin1ToUtf8 = 0;
+		char_conv_use_iconv = 0;
+	}
+}