Correctly check for g_iconv_open() failure. Try to give a meaningful error

* src/trie.c: Correctly check for g_iconv_open() failure.
* src/vte.c (vte_terminal_set_encoding): Try to give a meaningful error when
	g_iconv_open() fails, even though we're screwed.

5 files changed, 78 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index a18fc943..a2262d77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2002-07-14  nalin
+2002-07-16  nalin
+	* src/trie.c: Correctly check for g_iconv_open() failure.
+	* src/vte.c (vte_terminal_set_encoding): Try to give a meaningful
+	error when g_iconv_open() fails, even though we're screwed.
+
+2002-07-15  nalin
 	* src/vte.c: wrap the new Xft/fontconfig-specific code in HAVE_XFT
 	* src/vte.c: Revert some changes in how new cells were initialized,
 	removing various cosmetic problems.
diff --git a/src/trie.c b/src/trie.c
index 776bbc57..88e5312a 100644
--- a/src/trie.c
+++ b/src/trie.c
@@ -478,16 +478,16 @@ vte_trie_add(struct vte_trie *trie, const char *pattern, size_t length,
 	memset(&state, 0, sizeof(state));
 
 	conv = g_iconv_open("WCHAR_T", "UTF-8");
-	if (conv != NULL) {
-		tpattern = (char*)pattern;
-		g_iconv(conv, &tpattern, &length, &wpattern_end, &wlength);
-		if (length == 0) {
-			wlength = (wpattern_end - wpattern) / sizeof(wchar_t);
-			vte_trie_addx(trie, (wchar_t*)wpattern, wlength,
-				      result, quark, 0);
-		}
-		g_iconv_close(conv);
+	g_assert(conv != ((GIConv) -1));
+
+	tpattern = (char*)pattern;
+	g_iconv(conv, &tpattern, &length, &wpattern_end, &wlength);
+	if (length == 0) {
+		wlength = (wpattern_end - wpattern) / sizeof(wchar_t);
+		vte_trie_addx(trie, (wchar_t*)wpattern, wlength,
+			      result, quark, 0);
 	}
+	g_iconv_close(conv);
 
 	g_free(wpattern);
 }
@@ -891,15 +891,14 @@ convert_mbstowcs(const char *i, size_t ilen,
 	GIConv conv;
 	size_t outlen;
 	conv = g_iconv_open("WCHAR_T", "UTF-8");
-	if (conv != NULL) {
-		memset(o, 0, max_olen);
-		outlen = max_olen;
-		g_iconv(conv, (char**)&i, &ilen, (char**)&o, &outlen);
-		g_iconv_close(conv);
-	}
-	if (olen) {
-		*olen = (max_olen - outlen) / sizeof(wchar_t);
-	}
+	g_assert(conv != ((GIConv) -1));
+
+	memset(o, 0, max_olen);
+	outlen = max_olen;
+	g_iconv(conv, (char**)&i, &ilen, (char**)&o, &outlen);
+	g_iconv_close(conv);
+
+	*olen = (max_olen - outlen) / sizeof(wchar_t);
 }
 
 int
diff --git a/src/utf8echo.c b/src/utf8echo.c
index 209a9a49..db610ec0 100644
--- a/src/utf8echo.c
+++ b/src/utf8echo.c
@@ -41,7 +41,7 @@ main(int argc, char **argv)
 	}
 
 	conv = g_iconv_open("UTF-8", "WCHAR_T");
-	if (conv == NULL) {
+	if (conv == ((GIConv*) -1)) {
 		return 1;
 	}
 
diff --git a/src/vte.c b/src/vte.c
index 657d2bd5..027c0664 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -1262,7 +1262,7 @@ vte_terminal_set_encoding(VteTerminal *terminal, const char *codeset)
 {
 	const char *old_codeset;
 	GQuark encoding_quark;
-	GIConv conv;
+	GIConv conv, new_iconv, new_oconvw, new_oconvu;
 	char *ibuf, *obuf, *obufptr;
 	size_t icount, ocount;
 
@@ -1272,35 +1272,58 @@ vte_terminal_set_encoding(VteTerminal *terminal, const char *codeset)
 		codeset = nl_langinfo(CODESET);
 	}
 
+	/* Open new conversions. */
+	new_iconv = g_iconv_open("WCHAR_T", codeset);
+	new_oconvw = g_iconv_open(codeset, "WCHAR_T");
+	new_oconvu = g_iconv_open(codeset, "UTF-8");
+	if (new_iconv == ((GIConv) -1)) {
+		g_warning(_("Unable to convert characters from %s to %s."),
+			  codeset, "WCHAR_T");
+		return;
+	}
+	if (new_oconvw == ((GIConv) -1)) {
+		g_warning(_("Unable to convert characters from %s to %s."),
+			  "WCHAR_T", codeset);
+		g_iconv_close(new_iconv);
+		return;
+	}
+	if (new_oconvu == ((GIConv) -1)) {
+		g_warning(_("Unable to convert characters from %s to %s."),
+			  "UTF-8", codeset);
+		g_iconv_close(new_iconv);
+		g_iconv_close(new_oconvw);
+		return;
+	}
+
 	/* Set up the conversion for incoming-to-wchars. */
-	if (terminal->pvt->incoming_conv != NULL) {
+	if (terminal->pvt->incoming_conv != ((GIConv) -1)) {
 		g_iconv_close(terminal->pvt->incoming_conv);
 	}
-	terminal->pvt->incoming_conv = g_iconv_open("WCHAR_T", codeset);
+	terminal->pvt->incoming_conv = new_iconv;
 
 	/* Set up the conversions for wchar/utf-8 to outgoing. */
-	if (terminal->pvt->outgoing_conv_wide != NULL) {
+	if (terminal->pvt->outgoing_conv_wide != ((GIConv) -1)) {
 		g_iconv_close(terminal->pvt->outgoing_conv_wide);
 	}
-	terminal->pvt->outgoing_conv_wide = g_iconv_open(codeset, "WCHAR_T");
+	terminal->pvt->outgoing_conv_wide = new_oconvw;
 
-	if (terminal->pvt->outgoing_conv_utf8 != NULL) {
+	if (terminal->pvt->outgoing_conv_utf8 != ((GIConv) -1)) {
 		g_iconv_close(terminal->pvt->outgoing_conv_utf8);
 	}
-	terminal->pvt->outgoing_conv_utf8 = g_iconv_open(codeset, "UTF-8");
+	terminal->pvt->outgoing_conv_utf8 = new_oconvu;
 
 	/* Set the terminal's encoding to the new value. */
 	encoding_quark = g_quark_from_string(codeset);
 	terminal->pvt->encoding = g_quark_to_string(encoding_quark);
 
 	/* Convert any buffered output bytes. */
-	if (terminal->pvt->n_outgoing > 0) {
+	if ((terminal->pvt->n_outgoing > 0) && (old_codeset != NULL)) {
 		icount = terminal->pvt->n_outgoing;
 		ibuf = terminal->pvt->outgoing;
 		ocount = icount * VTE_UTF8_BPC + 1;
 		obuf = obufptr = g_malloc(ocount);
 		conv = g_iconv_open(codeset, old_codeset);
-		if (conv != ((GIConv)-1)) {
+		if (conv != ((GIConv) -1)) {
 			if (g_iconv(conv, &ibuf, &icount, &obuf, &ocount) == -1) {
 				/* Darn, it failed.  Leave it alone. */
 				g_free(obufptr);
@@ -3055,7 +3078,7 @@ vte_sequence_handler_set_title_int(VteTerminal *terminal,
 			inbuf_len = wcslen((wchar_t*)inbuf) * sizeof(wchar_t);
 			outbuf_len = (inbuf_len * VTE_UTF8_BPC) + 1;
 			outbuf = outbufptr = g_malloc0(outbuf_len);
-			if (conv != ((GIConv)-1)) {
+			if (conv != ((GIConv) -1)) {
 				if (g_iconv(conv, &inbuf, &inbuf_len,
 					    &outbuf, &outbuf_len) == -1) {
 #ifdef VTE_DEBUG
@@ -5509,7 +5532,7 @@ vte_terminal_process_incoming(gpointer data)
 		/* There are leftovers, so convert them back to the terminal's
 		 * old encoding and save them for later. */
 		unconv = g_iconv_open(encoding, "WCHAR_T");
-		if (unconv != ((GIConv)-1)) {
+		if (unconv != ((GIConv) -1)) {
 			icount = sizeof(wchar_t) * (wcount - start);
 			ibuf = (char*) &wbuf[start];
 			ucount = VTE_UTF8_BPC * (wcount - start) + 1;
@@ -8672,6 +8695,10 @@ vte_terminal_init(VteTerminal *terminal, gpointer *klass)
 	pvt->outgoing = NULL;
 	pvt->n_outgoing = 0;
 	pvt->keypad = VTE_KEYPAD_NORMAL;
+	pvt->encoding = NULL;
+	pvt->incoming_conv = (GIConv) -1;
+	pvt->outgoing_conv_wide = (GIConv) -1;
+	pvt->outgoing_conv_utf8 = (GIConv) -1;
 
 	vte_terminal_set_word_chars(terminal, "-a-zA-Z0-9");
 
@@ -8752,6 +8779,7 @@ vte_terminal_init(VteTerminal *terminal, gpointer *klass)
 	vte_terminal_set_termcap(terminal, NULL, FALSE);
 	vte_terminal_set_emulation(terminal, NULL);
 	vte_terminal_set_encoding(terminal, NULL);
+	g_assert(terminal->pvt->encoding != NULL);
 	for (i = 0; i < G_N_ELEMENTS(pvt->gxencoding); i++) {
 		pvt->gxencoding[i] = NULL;
 	}
@@ -9083,18 +9111,18 @@ vte_terminal_finalize(GObject *object)
 	terminal->pvt->pty_pid = 0;
 
 	/* Free conversion descriptors. */
-	if (terminal->pvt->incoming_conv != NULL) {
+	if (terminal->pvt->incoming_conv != ((GIConv) -1)) {
 		g_iconv_close(terminal->pvt->incoming_conv);
 	}
-	terminal->pvt->incoming_conv = NULL;
-	if (terminal->pvt->outgoing_conv_wide != NULL) {
+	terminal->pvt->incoming_conv = ((GIConv) -1);
+	if (terminal->pvt->outgoing_conv_wide != ((GIConv) -1)) {
 		g_iconv_close(terminal->pvt->outgoing_conv_wide);
 	}
-	terminal->pvt->outgoing_conv_wide = NULL;
-	if (terminal->pvt->outgoing_conv_utf8 != NULL) {
+	terminal->pvt->outgoing_conv_wide = ((GIConv) -1);
+	if (terminal->pvt->outgoing_conv_utf8 != ((GIConv) -1)) {
 		g_iconv_close(terminal->pvt->outgoing_conv_utf8);
 	}
-	terminal->pvt->outgoing_conv_utf8 = NULL;
+	terminal->pvt->outgoing_conv_utf8 = ((GIConv) -1);
 
 	/* Stop listening for child-exited signals. */
 	g_signal_handlers_disconnect_by_func(vte_reaper_get(),
@@ -11539,7 +11567,7 @@ vte_terminal_set_word_chars(VteTerminal *terminal, const char *spec)
 						sizeof(VteWordCharRange));
 	/* Convert the spec from UTF-8 to a string of wchar_t. */
 	conv = g_iconv_open("WCHAR_T", "UTF-8");
-	if (conv == ((GIConv)-1)) {
+	if (conv == ((GIConv) -1)) {
 		/* Aaargh.  We're screwed. */
 		g_warning(_("g_iconv_open() failed setting word characters"));
 		return;
@@ -11689,6 +11717,7 @@ vte_terminal_reset(VteTerminal *terminal, gboolean full, gboolean clear_history)
 	vte_terminal_set_default_attributes(terminal);
 	/* Reset the encoding. */
 	vte_terminal_set_encoding(terminal, NULL);
+	g_assert(terminal->pvt->encoding != NULL);
 	/* Reset selection. */
 	vte_terminal_deselect_all(terminal);
 	/* Reset mouse motion events. */
diff --git a/vte.spec b/vte.spec
index b2c34f39..7659f771 100644
--- a/vte.spec
+++ b/vte.spec
@@ -57,7 +57,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Sat Jul 13 2002 Nalin Dahyabhai <nalin@redhat.com> 0.4.9-1
+* Tue Jul 16 2002 Nalin Dahyabhai <nalin@redhat.com> 0.4.9-1
+- check for iconv failures properly and report them more aggressively
+
+* Mon Jul 15 2002 Nalin Dahyabhai <nalin@redhat.com>
+- cosmetic fixes
+
+* Sat Jul 13 2002 Nalin Dahyabhai <nalin@redhat.com>
 - fix segfaulting during dingus highlighting when the buffer contains non-ASCII
   characters (#67930)