mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-23 04:46:55 +03:00
* vfs/ftpfs.c (ftpfs_open_socket): Let the user interrupt ftpfs in
hostname lookup / connection state.
This commit is contained in:
parent
c29b321563
commit
115ef55682
@ -1,3 +1,8 @@
|
||||
2006-02-05 Arpie <arpi@mplayerhq.hu>
|
||||
|
||||
* ftpfs.c (ftpfs_open_socket): Let the user interrupt ftpfs in
|
||||
hostname lookup / connection state.
|
||||
|
||||
2006-02-03 Roland Illig <roland.illig@gmx.de>
|
||||
|
||||
* fish.c: Replaced the printf-like attribute with __printf__,
|
||||
|
@ -663,6 +663,8 @@ ftpfs_open_socket (struct vfs_class *me, struct vfs_s_super *super)
|
||||
free_host = 1;
|
||||
}
|
||||
|
||||
enable_interrupt_key(); /* clear the interrupt flag */
|
||||
|
||||
/* Get host address */
|
||||
memset ((char *) &server_address, 0, sizeof (server_address));
|
||||
server_address.sin_family = AF_INET;
|
||||
@ -670,6 +672,7 @@ ftpfs_open_socket (struct vfs_class *me, struct vfs_s_super *super)
|
||||
if (server_address.sin_addr.s_addr == INADDR_NONE) {
|
||||
hp = gethostbyname (host);
|
||||
if (hp == NULL){
|
||||
disable_interrupt_key();
|
||||
print_vfs_message (_("ftpfs: Invalid host address."));
|
||||
ftpfs_errno = EINVAL;
|
||||
if (free_host)
|
||||
@ -686,6 +689,7 @@ ftpfs_open_socket (struct vfs_class *me, struct vfs_s_super *super)
|
||||
|
||||
/* Connect */
|
||||
if ((my_socket = socket (AF_INET, SOCK_STREAM, 0)) < 0) {
|
||||
disable_interrupt_key();
|
||||
ftpfs_errno = errno;
|
||||
if (free_host)
|
||||
g_free (host);
|
||||
@ -696,8 +700,6 @@ ftpfs_open_socket (struct vfs_class *me, struct vfs_s_super *super)
|
||||
if (free_host)
|
||||
g_free (host);
|
||||
|
||||
enable_interrupt_key (); /* clear the interrupt flag */
|
||||
|
||||
if (connect (my_socket, (struct sockaddr *) &server_address,
|
||||
sizeof (server_address)) < 0){
|
||||
ftpfs_errno = errno;
|
||||
|
Loading…
Reference in New Issue
Block a user