[gnumeric] Handle NULL characters in cvs import. [#648354]

[Andreas J. Guelzow <guelzow src gnome org>]

commit 8574c3d90f3296402b0314ae8538941c3676d116
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Thu Apr 21 21:04:38 2011 -0600

    Handle NULL characters in cvs import. [#648354]
    
    2011-04-21  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/stf.c (stf_warning): new
    	(stf_open_and_read): add context argument and change all callers,
    	check for null characters in input. Fixes #648354
    	(stf_preparse): change type pf context argument and change all
    	callers.
    	(stf_read_workbook_auto_csvtab): use stf_warning

 ChangeLog |    9 +++++++
 NEWS      |    1 +
 src/stf.c |   81 +++++++++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 65 insertions(+), 26 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c6ad280..4bd9a34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-21  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/stf.c (stf_warning): new
+	(stf_open_and_read): add context argument and change all callers,
+	check for null characters in input. Fixes #648354
+	(stf_preparse): change type pf context argument and change all
+	callers.
+	(stf_read_workbook_auto_csvtab): use stf_warning
+	
 2011-04-12  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/wbc-gtk-actions.c (actions): change 
diff --git a/NEWS b/NEWS
index 903c2da..1b2eda1 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Andreas:
 	* Fix shift-arrow movement for sheet objects. [#645805]
 	* Expand the description of SSMEDIAN. [#647247]
 	* Redesign autofilter Top10 dialog. [#646641]
+	* Handle NULL characters in cvs import. [#648354]
 
 Morten:
 	* Fix problems with localized function docs.
diff --git a/src/stf.c b/src/stf.c
index bb271d2..d282530 100644
--- a/src/stf.c
+++ b/src/stf.c
@@ -58,6 +58,29 @@
 #include <locale.h>
 
 
+static void
+stf_warning (GOIOContext *context, char const *msg)
+{
+	/*
+	 * Using go_cmd_context_error_import will destroy the
+	 * successfully imported portion.  We ought to have a
+	 * way to issue a warning.
+	 */
+	if (IS_WBC_GTK (context->impl))
+		go_gtk_notice_dialog
+			(wbcg_toplevel (WBC_GTK (context->impl)),
+			 GTK_MESSAGE_WARNING,
+			 "%s", msg);
+	else
+		g_warning ("%s", msg);
+#if 0
+	go_cmd_context_error_import
+		(GO_CMD_CONTEXT (context),
+		 msg);
+#endif
+}
+
+
 /**
  * stf_open_and_read
  * @filename : name of the file to open&read
@@ -69,11 +92,13 @@
  * returns : a buffer containing the file contents
  **/
 static char *
-stf_open_and_read (GsfInput *input, size_t *readsize)
+stf_open_and_read (GOIOContext *context, GsfInput *input, size_t *readsize)
 {
 	gpointer result;
 	gulong    allocsize;
 	gsf_off_t size = gsf_input_size (input);
+	char *cpointer;
+	int null_chars = 0;
 
 	if (gsf_input_seek (input, 0, G_SEEK_SET))
 		return NULL;
@@ -97,19 +122,40 @@ stf_open_and_read (GsfInput *input, size_t *readsize)
 		result = NULL;
 	}
 
+	cpointer = (char *)result;
+	while (*cpointer != 0)
+		cpointer++;
+	while (cpointer != ((char *)result + *readsize)) {
+		null_chars++;
+		*cpointer = ' ';
+		while (*cpointer != 0)
+			cpointer++;
+	}	
+	if (null_chars > 0) {
+		gchar const *format;
+		gchar *msg;
+		format = ngettext ("The file contains %d NULL character. "
+				   "It has been changed to a space.", 
+				   "The file contains %d NULL characters. "
+				   "They have been changed to spaces.",
+				   null_chars);
+		msg = g_strdup_printf (format, null_chars);
+		stf_warning (context, msg);
+		g_free (msg);
+	}
 	return result;
 }
 
 static char *
-stf_preparse (GOCmdContext *context, GsfInput *input, size_t *data_len)
+stf_preparse (GOIOContext *context, GsfInput *input, size_t *data_len)
 {
 	char *data;
 
-	data = stf_open_and_read (input, data_len);
+	data = stf_open_and_read (context, input, data_len);
 
 	if (!data) {
 		if (context)
-			go_cmd_context_error_import (context,
+			go_cmd_context_error_import (GO_CMD_CONTEXT (context),
 				_("Error while trying to read file"));
 		return NULL;
 	}
@@ -211,7 +257,7 @@ stf_read_workbook (GOFileOpener const *fo,  gchar const *enc,
 		goto out;
 	}
 
-	data = stf_preparse (GO_CMD_CONTEXT (context), input, &data_len);
+	data = stf_preparse (context, input, &data_len);
 	if (!data)
 		goto out;
 
@@ -377,7 +423,7 @@ stf_read_workbook_auto_csvtab (GOFileOpener const *fo, gchar const *enc,
 	book = wb_view_get_workbook (wbv);
 	old_sheet = wb_view_cur_sheet (wbv);
 
-	data = stf_preparse (GO_CMD_CONTEXT (context), input, &data_len);
+	data = stf_preparse (context, input, &data_len);
 	if (!data)
 		return;
 
@@ -427,26 +473,9 @@ stf_read_workbook_auto_csvtab (GOFileOpener const *fo, gchar const *enc,
 		workbook_recalc_all (book);
 		resize_columns (sheet);
 		if (po->cols_exceeded || po->rows_exceeded) {
-			const char *msg =
-				_("Some data did not fit on the sheet and was dropped.");
-
-			/*
-			 * Using go_cmd_context_error_import will destroy the
-			 * successfully imported portion.  We ought to have a
-			 * way to issue a warning.
-			 */
-			if (IS_WBC_GTK (context->impl))
-				go_gtk_notice_dialog
-					(wbcg_toplevel (WBC_GTK (context->impl)),
-					 GTK_MESSAGE_WARNING,
-					 "%s", msg);
-			else
-				g_warning ("%s", msg);
-#if 0
-				go_cmd_context_error_import
-					(GO_CMD_CONTEXT (context),
-					 msg);
-#endif
+			stf_warning (context, 
+				     _("Some data did not fit on the "
+				       "sheet and was dropped."));
 		}
 	} else {
 		workbook_sheet_delete (sheet);