diff options
author | Ron Yorston <rmy@pobox.com> | 2012-04-24 11:54:02 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-04-24 11:54:02 +0100 |
commit | e1ecbdf652f05494c90edda1ffd472dc82a43e8c (patch) | |
tree | 6f1c3f86b3ec2daa09f4685db87bc694a099b090 | |
parent | 3d2d2184b0afc591f4ccf9e510b832b459251695 (diff) | |
download | busybox-w32-e1ecbdf652f05494c90edda1ffd472dc82a43e8c.tar.gz busybox-w32-e1ecbdf652f05494c90edda1ffd472dc82a43e8c.tar.bz2 busybox-w32-e1ecbdf652f05494c90edda1ffd472dc82a43e8c.zip |
Initialise winsock once in appletlib, not in applets
-rw-r--r-- | libbb/appletlib.c | 2 | ||||
-rw-r--r-- | networking/wget.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 116e275be..76c4d8ff3 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
@@ -187,6 +187,8 @@ void lbb_prepare(const char *applet | |||
187 | if (ENABLE_LOCALE_SUPPORT && getpid() != 1) | 187 | if (ENABLE_LOCALE_SUPPORT && getpid() != 1) |
188 | setlocale(LC_ALL, ""); | 188 | setlocale(LC_ALL, ""); |
189 | 189 | ||
190 | IF_WIN32_NET(init_winsock();) | ||
191 | |||
190 | #if ENABLE_FEATURE_INDIVIDUAL | 192 | #if ENABLE_FEATURE_INDIVIDUAL |
191 | /* Redundant for busybox (run_applet_and_exit covers that case) | 193 | /* Redundant for busybox (run_applet_and_exit covers that case) |
192 | * but needed for "individual applet" mode */ | 194 | * but needed for "individual applet" mode */ |
diff --git a/networking/wget.c b/networking/wget.c index ea46d1795..1991a1072 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -886,7 +886,6 @@ int wget_main(int argc UNUSED_PARAM, char **argv) | |||
886 | #endif | 886 | #endif |
887 | 887 | ||
888 | INIT_G(); | 888 | INIT_G(); |
889 | IF_WIN32_NET(init_winsock();) | ||
890 | 889 | ||
891 | IF_FEATURE_WGET_TIMEOUT(G.timeout_seconds = 900;) | 890 | IF_FEATURE_WGET_TIMEOUT(G.timeout_seconds = 900;) |
892 | G.proxy_flag = "on"; /* use proxies if env vars are set */ | 891 | G.proxy_flag = "on"; /* use proxies if env vars are set */ |