diff lib/gftp.h @ 124:65048c959029

2003-4-6 Brian Masney <[e-mail]> * lib/config_file.c src/text/gftp-text.c - changed arguments of gftp_read_config_file() and gftp_read_bookmarks() to take an argument to the path of the global config directory. The text/gtk+ port will just pass SHARE_DIR. The native MacOS X port that is in the works needs this (Nathan Robertson is currently working on this port) * lib/gftp.h lib/config_file.c - removed config variable type gftp_option_type_textarray * lib/gftp.h lib/config_file.c - removed copy_function from gftp_option_type_var. This is implemented with memcpy() instead * lib/rfc959.c - remember to rename all instances of firewall_* to ftp_proxy_* * lib/sshv2.c - improved generating the argument list for the ssh client * lib/sshv2.c lib/misc.c lib/gftp.h - added len argument to ptym_open() * lib/protocols.c lib/misc.c lib/config_file.c - use g_strdup() instead of g_malloc()/strcpy()

--- a/lib/gftp.h	Sun Apr 06 15:38:27 2003 +0000
+++ b/lib/gftp.h	Tue Apr 08 01:43:33 2003 +0000
@@ -426,20 +426,19 @@
 typedef enum 
 {
   gftp_option_type_text		= 0,
-  gftp_option_type_textarray	= 1,
-  gftp_option_type_int		= 2,
-  gftp_option_type_float	= 3,
-  gftp_option_type_checkbox	= 4,
-  gftp_option_type_color	= 5,
-  gftp_option_type_notebook	= 6,
-  gftp_option_type_newtable	= 7,
-  gftp_option_type_hidetext	= 8,
-  gftp_option_type_label	= 9,
-  gftp_option_type_textbox	= 10,
-  gftp_option_type_subtree	= 11,
-  gftp_option_type_intcombo	= 12,
-  gftp_option_type_charcombo	= 13,
-  gftp_option_type_table	= 14
+  gftp_option_type_int		= 1,
+  gftp_option_type_float	= 2,
+  gftp_option_type_checkbox	= 3,
+  gftp_option_type_color	= 4,
+  gftp_option_type_notebook	= 5,
+  gftp_option_type_newtable	= 6,
+  gftp_option_type_hidetext	= 7,
+  gftp_option_type_label	= 8,
+  gftp_option_type_textbox	= 9,
+  gftp_option_type_subtree	= 10,
+  gftp_option_type_intcombo	= 11,
+  gftp_option_type_charcombo	= 12,
+  gftp_option_type_table	= 13
 } gftp_option_type_enum;
 
 
@@ -484,7 +483,6 @@
   int (*read_function) (char *str, gftp_config_vars * cv, int line);
   int (*write_function) (gftp_config_vars * cv, FILE * fd, int to_config_file);
   int (*ui_print_function) (char *label, void *ptr, void *user_data);
-  int (*config_copy_function) (void *dest, void *src);
   void *user_data;
 } gftp_option_type_var;
 
@@ -534,8 +532,7 @@
 /* config_file.c */
 void gftp_add_bookmark 			( gftp_bookmarks_var * newentry );
 
-void gftp_read_config_file 		( char **argv,
-					  int get_xpms );
+void gftp_read_config_file 		( char *global_data_path );
 
 void gftp_write_bookmarks_file 		( void );
 
@@ -607,7 +604,8 @@
 
 gftp_request * copy_request 		( gftp_request * req );
 
-int ptym_open 				( char *pts_name );
+int ptym_open 				( char *pts_name,
+					  size_t len );
 
 int ptys_open 				( int fdm, 
 					  char *pts_name );