comparison lib/rfc959.c @ 182:33b394ebba68

2003-6-15 Brian Masney <masneyb@gftp.org> * lib/cache.c lib/gftp.h - added gftp_generate_cache_description(). * lib/cache.c lib/gftp.h src/text/gftp-text.c src/gtk/delete-dialog.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/mkdir-dialog.c - Added description parameter to gftp_delete_cache_entry(). * lib/protocols.c lib/gftp.h - added gftp_fd_open(). It will call open() and then set the socket option close on exec * lib/cache.c lib/local.c lib/misc.c - use gftp_fd_open() instead of open() * lib/rfc959.c lib/protocols.c - on newly created sockets, make sure the close on exec socket option is set * lib/options.h src/text/gftp-text.c src/gtk/transfer.c - added preserve_permissions option * lib/protocols.c (gftp_parse_url) - allow an @ to be in the username * src/text/gftp-text.c - after transfering a file, honor preserve_permissions if it is set * src/gtk/delete-dialog.c - improvments to clearing the expired cache entries
author masneyb
date Sun, 15 Jun 2003 21:28:02 +0000
parents aec4b4541d3a
children 13ca1defdc75
comparison
equal deleted inserted replaced
181:0153a867819c 182:33b394ebba68
587 g_strerror (errno)); 587 g_strerror (errno));
588 gftp_disconnect (request); 588 gftp_disconnect (request);
589 return (GFTP_ERETRYABLE); 589 return (GFTP_ERETRYABLE);
590 } 590 }
591 591
592 if (fcntl (parms->data_connection, F_SETFD, 1) == -1)
593 {
594 request->logging_function (gftp_logging_error, request->user_data,
595 _("Error: Cannot set close on exec flag: %s\n"),
596 g_strerror (errno));
597
598 return (GFTP_ERETRYABLE);
599 }
600
592 data_addr_len = sizeof (data_addr); 601 data_addr_len = sizeof (data_addr);
593 memset (&data_addr, 0, data_addr_len); 602 memset (&data_addr, 0, data_addr_len);
594 data_addr.sin_family = AF_INET; 603 data_addr.sin_family = AF_INET;
595 604
596 gftp_lookup_request_option (request, "passive_transfer", &passive_transfer); 605 gftp_lookup_request_option (request, "passive_transfer", &passive_transfer);
722 { 731 {
723 request->logging_function (gftp_logging_error, request->user_data, 732 request->logging_function (gftp_logging_error, request->user_data,
724 _("Failed to create a socket: %s\n"), 733 _("Failed to create a socket: %s\n"),
725 g_strerror (errno)); 734 g_strerror (errno));
726 gftp_disconnect (request); 735 gftp_disconnect (request);
736 return (GFTP_ERETRYABLE);
737 }
738
739 if (fcntl (parms->data_connection, F_SETFD, 1) == -1)
740 {
741 request->logging_function (gftp_logging_error, request->user_data,
742 _("Error: Cannot set close on exec flag: %s\n"),
743 g_strerror (errno));
744
727 return (GFTP_ERETRYABLE); 745 return (GFTP_ERETRYABLE);
728 } 746 }
729 747
730 data_addr_len = sizeof (data_addr); 748 data_addr_len = sizeof (data_addr);
731 /* This condition shouldn't happen. We better check anyway... */ 749 /* This condition shouldn't happen. We better check anyway... */