From bd299580117735f7870de2d2b75d6d42d28655ed Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Thu, 16 Feb 2017 13:19:30 -0200
Subject: [PATCH] Corrigindo exportação/importação da lista de arquivos a transferir.

---
 src/pw3270/v3270ft/ftdialog.cbp  | 24 ++++++++++++------------
 src/pw3270/v3270ft/load.c        | 72 +++++++++++++++++++++++++++++++++++++++++++++---------------------------
 src/pw3270/v3270ft/private.h     |  1 -
 src/pw3270/v3270ft/save.c        | 53 ++++++++++++++++++++++++++++++++++++++++-------------
 src/pw3270/v3270ft/tables.c      |  2 +-
 src/pw3270/v3270ft/testprogram.c |  2 +-
 6 files changed, 99 insertions(+), 55 deletions(-)

diff --git a/src/pw3270/v3270ft/ftdialog.cbp b/src/pw3270/v3270ft/ftdialog.cbp
index ae9a6ae..071cacf 100644
--- a/src/pw3270/v3270ft/ftdialog.cbp
+++ b/src/pw3270/v3270ft/ftdialog.cbp
@@ -33,7 +33,8 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="`pkg-config --cflags gtk+-3.0 lib3270`" />
-			<Add directory="../include" />
+			<Add directory="../../include" />
+			<Add directory="../../include/pw3270" />
 		</Compiler>
 		<Linker>
 			<Add option="`pkg-config --libs gtk+-3.0 lib3270`" />
@@ -45,27 +46,26 @@
 		<Unit filename="../include/v3270.h" />
 		<Unit filename="../include/v3270ft.h" />
 		<Unit filename="../include/v3270ftprogress.h" />
-		<Unit filename="../v3270/actions.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../v3270/colors.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../v3270/cursor.c">
+		<Unit filename="../v3270/accessible.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../v3270/accessible.h" />
 		<Unit filename="../v3270/draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../v3270/font.c">
+		<Unit filename="../v3270/hostselect.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../v3270/hostselect.h" />
 		<Unit filename="../v3270/iocallback.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../v3270/keyboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../v3270/macros.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../v3270/marshal.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -80,13 +80,13 @@
 		<Unit filename="../v3270/properties.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../v3270/signals.c">
+		<Unit filename="../v3270/security.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../v3270/text.c">
+		<Unit filename="../v3270/selection.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../v3270/v3270.c">
+		<Unit filename="../v3270/widget.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="filelist.c">
diff --git a/src/pw3270/v3270ft/load.c b/src/pw3270/v3270ft/load.c
index b16588e..ce009e5 100644
--- a/src/pw3270/v3270ft/load.c
+++ b/src/pw3270/v3270ft/load.c
@@ -38,6 +38,29 @@
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
+static LIB3270_FT_OPTION getFlagByName(const gchar *option, const char *optval) {
+
+	LIB3270_FT_OPTION	  rc	= 0;
+	int					  f;
+	gchar				* key	= g_strconcat(option,".",optval,NULL);
+
+	for(f=0;f<NUM_OPTIONS_WIDGETS;f++) {
+
+//		debug("%u %s",f,ft_option[f].name);
+
+		if(!g_ascii_strcasecmp(key,ft_option[f].name)) {
+			rc = ft_option[f].opt;
+			debug("%s=%08lx",key,(unsigned int) rc);
+			break;
+		}
+
+	}
+
+	g_free(key);
+
+	return rc;
+}
+
 static void entry_start(GMarkupParseContext *context, const gchar *element_name, const gchar **names,const gchar **values, struct v3270ft_entry *info, GError **error) {
 
 	int f;
@@ -72,8 +95,8 @@ static void entry_start(GMarkupParseContext *context, const gchar *element_name,
 
 	} if(!g_ascii_strcasecmp(element_name,"option")) {
 
-		const gchar *option;
-		const gchar	*optval;
+		const gchar *option = NULL;
+		const gchar	*optval = NULL;
 
 		if(!g_markup_collect_attributes(
 				element_name,names,values,error,
@@ -86,43 +109,39 @@ static void entry_start(GMarkupParseContext *context, const gchar *element_name,
 
 		}
 
-		// Check for options
-		for(f=0;f<NUM_OPTIONS_WIDGETS;f++) {
+		debug("%s=%s",option,optval);
 
-			char *name	= g_strdup(ft_option[f].name);
-			char *value	= strchr(name,'.');
+		if(!g_ascii_strcasecmp(option,"recfm")) {
 
-			if(value) {
-				*(value++) = 0;
-			}
+			// Recfm, limpo todas as flags correspondentes e remonto
+			info->options &= ~(LIB3270_FT_RECORD_FORMAT_DEFAULT|LIB3270_FT_RECORD_FORMAT_FIXED|LIB3270_FT_RECORD_FORMAT_VARIABLE|LIB3270_FT_RECORD_FORMAT_UNDEFINED);	// Reseta flags
+			info->options |= getFlagByName(option,optval);
+
+		} else if(!g_ascii_strcasecmp(option,"units")) {
 
-			if( !g_ascii_strcasecmp(option,name)) {
+			// Units, limpo todas as flags correspondentes e remonto
+			info->options &= ~(LIB3270_FT_ALLOCATION_UNITS_DEFAULT|LIB3270_FT_ALLOCATION_UNITS_TRACKS|LIB3270_FT_ALLOCATION_UNITS_CYLINDERS|LIB3270_FT_ALLOCATION_UNITS_AVBLOCK);
+			info->options |= getFlagByName(option,optval);
 
-				if(!value) {
+		} else {
 
-					// Opção é boolean
+			for(f=0;f<NUM_OPTIONS_WIDGETS;f++) {
 
-//					debug("%s=%s",option,optval);
+				if(!g_ascii_strcasecmp(option,ft_option[f].name)) {
 
-					if( toupper(*optval) == 'Y' || toupper(*optval) == 'S' || *optval == '1') {
+					if(!g_ascii_strcasecmp(optval,"yes")) {
 						info->options |= ft_option[f].opt;
+					} else if(!g_ascii_strcasecmp(optval,"no")) {
+						info->options &= ~ft_option[f].opt;
+					} else {
+						g_warning("Unexpected value for %s: %s",option,optval);
 					}
-
-				} else if(!g_ascii_strcasecmp(value,optval)) {
-
-					// Opção tem valor
-//					debug("%s=%s",option,optval);
-
-					info->options |= ft_option[f].opt;
-
+					break;
 				}
 
-
-				g_free(name);
-				return;
 			}
 
-			g_free(name);
+
 		}
 
 		// Check for FT values
@@ -137,7 +156,6 @@ static void entry_start(GMarkupParseContext *context, const gchar *element_name,
 			}
 		}
 
-
 	}
 
 
diff --git a/src/pw3270/v3270ft/private.h b/src/pw3270/v3270ft/private.h
index 2f9844a..aff05e8 100644
--- a/src/pw3270/v3270ft/private.h
+++ b/src/pw3270/v3270ft/private.h
@@ -69,7 +69,6 @@
 
 	};
 
-
 	struct v3270ft_type {
 		LIB3270_FT_OPTION	  opt;
 		const gchar			* name;
diff --git a/src/pw3270/v3270ft/save.c b/src/pw3270/v3270ft/save.c
index a22d422..908de17 100644
--- a/src/pw3270/v3270ft/save.c
+++ b/src/pw3270/v3270ft/save.c
@@ -30,12 +30,30 @@
 
  #include "private.h"
 
-
 /*--[ Statics ]--------------------------------------------------------------------------------------*/
 
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
+static const gchar * getNameByFlag(LIB3270_FT_OPTION opt, LIB3270_FT_OPTION mask) {
+
+	const gchar * rc = "Default";
+	const gchar * ptr;
+	int			  f;
+
+	opt &= mask;
+
+	for(f=0;f<NUM_OPTIONS_WIDGETS;f++) {
+
+		if(opt == ft_option[f].opt) {
+			ptr = strchr(ft_option[f].name,'.');
+			rc = ptr ? ptr+1 : ft_option[f].name;
+		}
+	}
+
+	return rc;
+}
+
  void get_item(struct v3270ft_entry *entry, GString *str) {
 
 	int f;
@@ -44,22 +62,31 @@
 	g_string_append_printf(str,"\t\t<file type=\"%s\" path=\"%s\"/>\n","local",entry->local);
 	g_string_append_printf(str,"\t\t<file type=\"%s\" path=\"%s\"/>\n","remote",entry->remote);
 
-	for(f=0;f<NUM_OPTIONS_WIDGETS;f++) {
+	g_string_append_printf(str,"\t\t<option name=\"%s\" value=\"%s\"/>\n",
+			"ascii", entry->options & LIB3270_FT_OPTION_ASCII ? "yes" : "no");
 
-		if( (entry->options & ft_option[f].opt) == ft_option[f].opt) {
-			char *name	= g_strdup(ft_option[f].name);
-			char *value	= strchr(name,'.');
+	g_string_append_printf(str,"\t\t<option name=\"%s\" value=\"%s\"/>\n",
+			"crlf", entry->options & LIB3270_FT_OPTION_CRLF ? "yes" : "no");
 
-			if(value)
-				*(value++) = 0;
-			else
-				value = "yes";
+	g_string_append_printf(str,"\t\t<option name=\"%s\" value=\"%s\"/>\n",
+			"append", entry->options & LIB3270_FT_OPTION_APPEND ? "yes" : "no");
 
-			g_string_append_printf(str,"\t\t<option name=\"%s\" value=\"%s\"/>\n",name,value);
+	g_string_append_printf(str,"\t\t<option name=\"%s\" value=\"%s\"/>\n",
+			"remap", entry->options & LIB3270_FT_OPTION_REMAP ? "yes" : "no");
 
-			g_free(name);
-		}
-	}
+	g_string_append_printf(str,"\t\t<option name=\"%s\" value=\"%s\"/>\n",
+			"recfm", getNameByFlag(entry->options,
+								LIB3270_FT_RECORD_FORMAT_DEFAULT
+								|LIB3270_FT_RECORD_FORMAT_FIXED
+								|LIB3270_FT_RECORD_FORMAT_VARIABLE
+								|LIB3270_FT_RECORD_FORMAT_UNDEFINED));
+
+	g_string_append_printf(str,"\t\t<option name=\"%s\" value=\"%s\"/>\n",
+			"units", getNameByFlag(entry->options,
+								LIB3270_FT_ALLOCATION_UNITS_DEFAULT
+								|LIB3270_FT_ALLOCATION_UNITS_TRACKS
+								|LIB3270_FT_ALLOCATION_UNITS_CYLINDERS
+								|LIB3270_FT_ALLOCATION_UNITS_AVBLOCK));
 
 	for(f=0;f<LIB3270_FT_VALUE_COUNT;f++) {
 		g_string_append_printf(str,"\t\t<option name=\"%s\" value=\"%u\"/>\n",ft_value[f].name,entry->value[f]);
diff --git a/src/pw3270/v3270ft/tables.c b/src/pw3270/v3270ft/tables.c
index 87712e3..a917f4e 100644
--- a/src/pw3270/v3270ft/tables.c
+++ b/src/pw3270/v3270ft/tables.c
@@ -34,7 +34,7 @@
 
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
 
-const struct v3270ft_option ft_option[] = {
+const struct v3270ft_option ft_option[NUM_OPTIONS_WIDGETS] = {
 
 	// Transfer options
 	{
diff --git a/src/pw3270/v3270ft/testprogram.c b/src/pw3270/v3270ft/testprogram.c
index 274f839..f7845ee 100644
--- a/src/pw3270/v3270ft/testprogram.c
+++ b/src/pw3270/v3270ft/testprogram.c
@@ -97,7 +97,7 @@ static void activate(GtkApplication* app, gpointer user_data) {
 	g_key_file_load_from_dirs(conf,"pw3270.conf",(const gchar **) search, &filename,G_KEY_FILE_NONE,NULL);
 	g_message("Configuration from %s",filename);
 
-	v3270_set_from_keyfile(terminal,conf);
+	// v3270_set_from_keyfile(terminal,conf);
 
 	g_key_file_unref(conf);
 
--
libgit2 0.21.2