diff lib/config_file.c @ 136:84b3e69807a2

2003-4-18 Brian Masney <[e-mail]> * lib/config_file.c lib/gftp.h - removed gftp_option_type_subtree, gftp_option_type_table and gftp_option_type_newtable * lib/config_file.c - implemented gftp_set_request_option() * lib/gftp.h lib/config_file.c - changed declaration of ui_print_function in struct gftp_option_type. Also added ui_save_function field to this structure * lib/gftp.h added local_options_vars num_local_options_vars variables to gftp_request * lib/local.c (local_set_directory) - small improvements to this function * lib/misc.c - added gftp_copy_local_options() * lib/options.h - fix declaration of General tab * lib/protocols.c - free local options * lib/rfc2068.c - check to see if we're connecting to a FTP site via proxy * lib/rfc959.c lib/protocols.c - changes for CRAY directory listings * src/gtk/gftp-gtk.h - added struct gftp_options_dialog_data and struct gftp_textcomboedt_widget_data * src/gtk/options_dialog.c - start to use new configuration interface * src/gtk/transfer.c - remove FIXME note. This is already in lib/gftp.h

--- a/lib/config_file.c	Fri Apr 18 16:02:38 2003 +0000
+++ b/lib/config_file.c	Fri Apr 18 19:38:34 2003 +0000
@@ -437,9 +437,7 @@
 
   for (i=0; cvars[i].key != NULL; i++)
     {
-      if (cvars[i].otype == gftp_option_type_subtree)
-        gftp_setup_global_options (cvars[i].value);
-      else if (cvars[i].key != NULL && *cvars[i].key != '\0')
+      if (cvars[i].key != NULL && *cvars[i].key != '\0')
         g_hash_table_insert (gftp_global_options_htable, 
                              cvars[i].key, &cvars[i]);
     }
@@ -821,13 +819,21 @@
 static int
 gftp_config_file_read_text (char *str, gftp_config_vars * cv, int line)
 {
+  if (cv->flags & GFTP_CVARS_FLAGS_DYNMEM && cv->value != NULL)
+    g_free (cv->value);
+
   if (str != NULL)
     {
       cv->value = g_strdup (str);
+      cv->flags |= GFTP_CVARS_FLAGS_DYNMEM;
       return (0);
     }
   else
-    return (-1);
+    {
+      cv->value = NULL;
+      cv->flags &= ~GFTP_CVARS_FLAGS_DYNMEM;
+      return (-1);
+    }
 }
 
 
@@ -922,6 +928,9 @@
   char *red, *green, *blue;
   gftp_color * color;
 
+  if (cv->flags & GFTP_CVARS_FLAGS_DYNMEM && cv->value != NULL)
+    g_free (cv->value);
+
   parse_args (str, 3, line, &red, &green, &blue);
 
   color = g_malloc (sizeof (*color));
@@ -933,6 +942,7 @@
   g_free (blue);
 
   cv->value = color;
+  cv->flags |= GFTP_CVARS_FLAGS_DYNMEM;
 
   return (0);
 }
@@ -1015,20 +1025,17 @@
 /* Note, the index numbers of this array must match up to the numbers in
    gftp_option_type_enum in gftp.h */
 gftp_option_type_var gftp_option_types[] = {
-  {gftp_config_file_read_text, gftp_config_file_write_text, NULL, NULL},
-  {gftp_config_file_read_textcombo, gftp_config_file_write_text, NULL, NULL},
-  {gftp_config_file_read_text, gftp_config_file_write_text, NULL, NULL},
-  {gftp_config_file_read_text, gftp_config_file_write_hidetext, NULL, NULL},
-  {gftp_config_file_read_int, gftp_config_file_write_int, NULL, NULL},
-  {gftp_config_file_read_checkbox, gftp_config_file_write_int, NULL, NULL},
-  {gftp_config_file_read_intcombo, gftp_config_file_write_intcombo, NULL, NULL},
-  {gftp_config_file_read_float, gftp_config_file_write_float, NULL, NULL},
-  {gftp_config_file_read_color, gftp_config_file_write_color, NULL, NULL},
-  {NULL, NULL, NULL, NULL},
-  {NULL, NULL, NULL, NULL},
-  {NULL, NULL, NULL, NULL},
-  {NULL, NULL, NULL, NULL},
-  {NULL, NULL, NULL, NULL}
+  {gftp_config_file_read_text, gftp_config_file_write_text, NULL, NULL, NULL},
+  {gftp_config_file_read_textcombo, gftp_config_file_write_text, NULL, NULL, NULL},
+  {gftp_config_file_read_text, gftp_config_file_write_text, NULL, NULL, NULL},
+  {gftp_config_file_read_text, gftp_config_file_write_hidetext, NULL, NULL, NULL},
+  {gftp_config_file_read_int, gftp_config_file_write_int, NULL, NULL, NULL},
+  {gftp_config_file_read_checkbox, gftp_config_file_write_int, NULL, NULL, NULL},
+  {gftp_config_file_read_intcombo, gftp_config_file_write_intcombo, NULL, NULL, NULL},
+  {gftp_config_file_read_float, gftp_config_file_write_float, NULL, NULL, NULL},
+  {gftp_config_file_read_color, gftp_config_file_write_color, NULL, NULL, NULL},
+  {NULL, NULL, NULL, NULL, NULL},
+  {NULL, NULL, NULL, NULL, NULL}
 };
 
 
@@ -1080,6 +1087,34 @@
 void
 gftp_set_request_option (gftp_request * request, char * key, void *value)
 {
+  gftp_config_vars * tmpconfigvar;
+
+  if (request->local_options_hash == NULL)
+    request->local_options_hash = g_hash_table_new (string_hash_function,
+                                                    string_hash_compare);
+
+  if ((tmpconfigvar = g_hash_table_lookup (request->local_options_hash,
+                                           key)) != NULL)
+    memcpy (&tmpconfigvar->value, value, sizeof (tmpconfigvar->value));
+  else
+    {
+      if (gftp_global_options_htable == NULL &&
+          (tmpconfigvar = g_hash_table_lookup (gftp_global_options_htable,
+                                               key)) == NULL)
+        {
+          fprintf (stderr, _("FATAL gFTP Error: Config option '%s' not found in global hash table\n"), key);
+          exit (1);
+        }
+      
+      request->num_local_options_vars++;
+      request->local_options_vars = g_realloc (request->local_options_vars, 
+                                               sizeof (gftp_config_vars) * (request->num_local_options_vars + 1));
+
+      memcpy (&request->local_options_vars[request->num_local_options_vars],
+              tmpconfigvar, sizeof (*tmpconfigvar));
+      memcpy (&request->local_options_vars[request->num_local_options_vars].value, value, sizeof (value));
+      
+    }
 }