X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fmswindows.c;h=179773e05fccfd99a9d566b6385540ca0ddbc9c5;hp=51342300c206668f7448a85523f34eb9c1b9389e;hb=HEAD;hpb=4a685764a845d5c74a76fcb49a4671f055b8d5f4 diff --git a/src/mswindows.c b/src/mswindows.c index 51342300..179773e0 100644 --- a/src/mswindows.c +++ b/src/mswindows.c @@ -323,7 +323,7 @@ fork_to_background (void) rv = fake_fork_child (); if (rv < 0) { - fprintf (stderr, "fake_fork_child() failed\n"); + fprintf (stderr, _("fake_fork_child() failed\n")); abort (); } else if (rv == 0) @@ -331,7 +331,7 @@ fork_to_background (void) /* We're the parent. */ fake_fork (); /* If fake_fork() returns, it failed. */ - fprintf (stderr, "fake_fork() failed\n"); + fprintf (stderr, _("fake_fork() failed\n")); abort (); } /* If we get here, we're the child. */ @@ -620,35 +620,35 @@ inet_ntop (int af, const void *src, char *dst, socklen_t cnt) void set_windows_fd_as_blocking_socket (int fd) { - /* 04/2011 + /* 04/2011 gnulib select() converts blocking sockets to nonblocking in windows discussed here: http://old.nabble.com/blocking-socket-is-nonblocking-after-calling-gnulib- select%28%29-in-windows-td31432857.html wget uses blocking sockets so we must convert them back to blocking. - */ - int ret = 0; - int wsagle = 0; - const int zero = 0; - - do - { - if(wsagle == WSAEINPROGRESS) - Sleep(1); /* use windows sleep */ - - WSASetLastError (0); - ret = ioctl (fd, FIONBIO, &zero); - wsagle = WSAGetLastError(); - } + */ + int ret = 0; + int wsagle = 0; + const int zero = 0; + + do + { + if(wsagle == WSAEINPROGRESS) + Sleep(1); /* use windows sleep */ + + WSASetLastError (0); + ret = ioctl (fd, FIONBIO, &zero); + wsagle = WSAGetLastError (); + } while (ret && (wsagle == WSAEINPROGRESS)); - if(ret) + if(ret) { fprintf (stderr, - "ioctl() failed. The socket could not be set as blocking.\n" ); + _("ioctl() failed. The socket could not be set as blocking.\n") ); DEBUGP (("Winsock error: %d\n", WSAGetLastError ())); abort (); } - return; + return; }