diff lib/gftp.h @ 151:2f15b3000dbc

2003-4-27 Brian Masney <[e-mail]> * lib/config_file.c (gftp_config_file_read_float) - use strtod instead of strtof(). ANSI C describes strtod, and C99 describes strtof(). Some older systems don't have strtof() * lib/gftp.h - if HAVE_OPENPTY is defined, include pty.h. Fix for GFTP_GET_AI_FAMILY when request or request->hostp is NULL. Added free_hostp boolean to struct gftp_request * lib/misc.c src/gtk/delete_dialog.c src/gtk/transfer.c - added copy_local_options parameter. Add a pointer to newreq->hostp from the source request structure * lib/protocols.c - honor free_hostp * lib/rfc959.c - fix for IPV4/IPV6 detection * src/gtk/misc-gtk.c src/gtk/options_dialog.c - fixed compiler errors when compiling against GTK+ 1.2 * src/gtk/transfer.c - lookup option one_transfer instead of do_one_transfer_at_a_time

--- a/lib/gftp.h	Sun Apr 27 14:35:53 2003 +0000
+++ b/lib/gftp.h	Mon Apr 28 02:07:19 2003 +0000
@@ -80,9 +80,13 @@
 #define AF_LOCAL AF_UNIX
 #endif
 
+#ifdef HAVE_OPENPTY
+#include <pty.h>
+#endif
+
 #ifdef HAVE_GETADDRINFO
 #define HAVE_IPV6
-#define GFTP_GET_AI_FAMILY(request)	(request->hostp->ai_family)
+#define GFTP_GET_AI_FAMILY(request)	(request != NULL && request->hostp != NULL ? request->hostp->ai_family : -1)
 #else
 #define GFTP_GET_AI_FAMILY(request)	AF_INET
 #endif
@@ -308,7 +312,9 @@
 
   int server_type;		/* The type of server we are connected to.
                                    See GFTP_DIRTYPE_* above */
-  unsigned int use_proxy : 1,
+  unsigned int free_hostp : 1, 		/* Should we free the hostp structure 
+					   in gftp_destroy_request() */
+               use_proxy : 1,
                always_connected : 1,
                need_hostport : 1,
                need_userpass : 1,
@@ -615,7 +621,8 @@
 void gftp_copy_local_options 		( gftp_request * dest, 
 					  gftp_request * source );
 
-gftp_request * copy_request 		( gftp_request * req );
+gftp_request * copy_request 		( gftp_request * req,
+					  int copy_local_options );
 
 GList * gftp_sort_filelist 		( GList * filelist, 
 					  int column,