Skip to content
Snippets Groups Projects
Commit e33b98e8 authored by rswindell's avatar rswindell
Browse files

Moved winsock initialization to before command-line arg parsing to make -H

(gethostname) work on Win32.
parent 7bb674d5
Branches
Tags
No related merge requests found
...@@ -660,6 +660,9 @@ int main(int argc, char **argv, char** environ) ...@@ -660,6 +660,9 @@ int main(int argc, char **argv, char** environ)
memset(&scfg,0,sizeof(scfg)); memset(&scfg,0,sizeof(scfg));
scfg.size=sizeof(scfg); scfg.size=sizeof(scfg);
if(!winsock_startup())
bail(2);
for(argn=1;argn<argc && module==NULL;argn++) { for(argn=1;argn<argc && module==NULL;argn++) {
if(argv[argn][0]=='-') { if(argv[argn][0]=='-') {
switch(argv[argn][1]) { switch(argv[argn][1]) {
...@@ -753,9 +756,6 @@ int main(int argc, char **argv, char** environ) ...@@ -753,9 +756,6 @@ int main(int argc, char **argv, char** environ)
if(!(scfg.sys_misc&SM_LOCAL_TZ)) if(!(scfg.sys_misc&SM_LOCAL_TZ))
putenv("TZ=UTC0"); putenv("TZ=UTC0");
if(!winsock_startup())
bail(2);
/* Install Ctrl-C/Break signal handler here */ /* Install Ctrl-C/Break signal handler here */
#if defined(_WIN32) #if defined(_WIN32)
SetConsoleCtrlHandler(ControlHandler, TRUE /* Add */); SetConsoleCtrlHandler(ControlHandler, TRUE /* Add */);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment