moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Formatting tweaks by David Fritz.

Browse Source
This commit is contained in:
hniksic 2004-02-23 19:29:55 -08:00
parent b4e408b3a6
commit 6b955d9fe7
3 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2004-02-23 David Fritz <zeroxdf@att.net>
* mswindows.h: Ditto.
* mswindows.c: Misc. formatting/comment tweaks throughout.
2004-02-20 David Fritz <zeroxdf@att.net> 2004-02-20 David Fritz <zeroxdf@att.net>
* main.c (print_help): Remove call to ws_help(). * main.c (print_help): Remove call to ws_help().

31
src/mswindows.c
View File

@ -1,5 +1,6 @@
/* mswindows.c -- Windows-specific support /* mswindows.c -- Windows-specific support
Copyright (C) 1995, 1996, 1997, 1998, 2004 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 2004
Free Software Foundation, Inc.
This file is part of GNU Wget. This file is part of GNU Wget.
@ -104,8 +105,6 @@ windows_main_junk (int *argc, char **argv, char **exec_name)
*p = '\0'; *p = '\0';
} }
/* Winsock stuff. */
static void static void
ws_cleanup (void) ws_cleanup (void)
{ {
@ -195,6 +194,9 @@ ws_percenttitle (double percent)
} }
} }
/* Returns a pointer to the fully qualified name of the directory that
contains the Wget binary (wget.exe). The returned path does not have a
trailing path separator. Returns NULL on failure. */
char * char *
ws_mypath (void) ws_mypath (void)
{ {
@ -221,6 +223,7 @@ ws_mypath (void)
return wspathsave; return wspathsave;
} }
/* Perform Windows specific initialization. */
void void
ws_startup (void) ws_startup (void)
{ {
@ -235,7 +238,6 @@ ws_startup (void)
requested = MAKEWORD (1, 1); requested = MAKEWORD (1, 1);
err = WSAStartup (requested, &data); err = WSAStartup (requested, &data);
if (err != 0) if (err != 0)
{ {
fprintf (stderr, _("%s: Couldn't find usable socket driver.\n"), fprintf (stderr, _("%s: Couldn't find usable socket driver.\n"),
@ -250,6 +252,7 @@ ws_startup (void)
WSACleanup (); WSACleanup ();
exit (1); exit (1);
} }
atexit (ws_cleanup); atexit (ws_cleanup);
pwr_mode = set_sleep_mode (0); pwr_mode = set_sleep_mode (0);
SetConsoleCtrlHandler (ws_handler, TRUE); SetConsoleCtrlHandler (ws_handler, TRUE);
@ -283,12 +286,10 @@ borland_utime (const char *path, const struct utimbuf *times)
} }
#endif #endif
/* /* Prevent Windows entering sleep/hibernation-mode while Wget is doing
* Prevent Windows entering sleep/hibernation-mode while wget is doing a lengthy transfer. Windows does not, by default, consider network
* a lengthy transfer. Windows does by default not consider network activity in console-programs as activity! Works on Win-98/ME/2K
* activity in console-programs as activity ! Works on Win-98/ME/2K and up. */
* and up.
*/
static DWORD static DWORD
set_sleep_mode (DWORD mode) set_sleep_mode (DWORD mode)
{ {
@ -315,11 +316,11 @@ set_sleep_mode (DWORD mode)
/* run_with_timeout Windows implementation. */ /* run_with_timeout Windows implementation. */
/* Stack size 0 uses default thread stack-size (reserve+commit). /* Stack size 0 uses default thread stack-size (reserve+commit).
* Determined by what's in the PE header. Determined by what's in the PE header. */
*/
#define THREAD_STACK_SIZE 0 #define THREAD_STACK_SIZE 0
struct thread_data { struct thread_data
{
void (*fun) (void *); void (*fun) (void *);
void *arg; void *arg;
DWORD ws_error; DWORD ws_error;
@ -376,7 +377,7 @@ run_with_timeout (double seconds, void (*fun) (void *), void *arg)
return 0; return 0;
} }
/* Should never happen, but test for recursivety anyway */ /* Should never happen, but test for recursivety anyway. */
assert (thread_hnd == NULL); assert (thread_hnd == NULL);
thread_arg.fun = fun; thread_arg.fun = fun;
@ -405,7 +406,7 @@ run_with_timeout (double seconds, void (*fun) (void *), void *arg)
rc = 1; rc = 1;
} }
CloseHandle (thread_hnd); /* clear-up after TerminateThread() */ CloseHandle (thread_hnd); /* Clear-up after TerminateThread(). */
thread_hnd = NULL; thread_hnd = NULL;
return rc; return rc;
} }

15
src/mswindows.h
View File

@ -1,5 +1,6 @@
/* Declarations for windows /* Declarations for windows
Copyright (C) 1995, 1997, 1997, 1998 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 1997, 1998, 2004
Free Software Foundation, Inc.
This file is part of GNU Wget. This file is part of GNU Wget.
@ -34,16 +35,16 @@ so, delete this exception statement from your version. */
#error Include mswindows.h inside or after "wget.h" #error Include mswindows.h inside or after "wget.h"
#endif #endif
/* Prevent inclusion of <winsock*.h> in <windows.h>. */
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN /* Prevent inclusion of <winsock*.h> in <windows.h> */ #define WIN32_LEAN_AND_MEAN
#endif #endif
#include <windows.h> #include <windows.h>
/* Use the correct winsock header; <ws2tcpip.h> includes <winsock2.h> only on /* Use the correct winsock header; <ws2tcpip.h> includes <winsock2.h> only
* Watcom/MingW. We cannot use <winsock.h> for IPv6. Using getaddrinfo() requires on Watcom/MingW. We cannot use <winsock.h> for IPv6. Using
* <ws2tcpip.h> getaddrinfo() requires <ws2tcpip.h>. */
*/
#if defined(ENABLE_IPV6) || defined(HAVE_GETADDRINFO) #if defined(ENABLE_IPV6) || defined(HAVE_GETADDRINFO)
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
@ -84,7 +85,7 @@ so, delete this exception statement from your version. */
#define PATH_SEPARATOR '\\' #define PATH_SEPARATOR '\\'
/* Microsoft says stat is _stat, Borland doesn't */ /* Microsoft says stat is _stat, Borland doesn't. */
#ifdef _MSC_VER #ifdef _MSC_VER
# define stat _stat # define stat _stat
#endif #endif