aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-04-24 12:01:28 +0100
committerRon Yorston <rmy@pobox.com>2012-04-24 12:06:00 +0100
commit591378ff82a3dcbd0bdccf7a6f7ffb70090a4b35 (patch)
tree3395f33a7948d4ee94743518121072facc261075
parente1ecbdf652f05494c90edda1ffd472dc82a43e8c (diff)
downloadbusybox-w32-591378ff82a3dcbd0bdccf7a6f7ffb70090a4b35.tar.gz
busybox-w32-591378ff82a3dcbd0bdccf7a6f7ffb70090a4b35.tar.bz2
busybox-w32-591378ff82a3dcbd0bdccf7a6f7ffb70090a4b35.zip
win32/uname.c: if networking is enabled use gethostname
-rw-r--r--win32/uname.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/win32/uname.c b/win32/uname.c
index da432e82d..03e94b326 100644
--- a/win32/uname.c
+++ b/win32/uname.c
@@ -7,14 +7,22 @@ int uname(struct utsname *name)
7 const char *unk = "unknown"; 7 const char *unk = "unknown";
8 OSVERSIONINFO os_info; 8 OSVERSIONINFO os_info;
9 SYSTEM_INFO sys_info; 9 SYSTEM_INFO sys_info;
10#if !ENABLE_WIN32_NET
10 DWORD len; 11 DWORD len;
12#endif
11 13
12 strcpy(name->sysname, "Windows_NT"); 14 strcpy(name->sysname, "Windows_NT");
13 15
16#if ENABLE_WIN32_NET
17 if ( gethostname(name->nodename, sizeof(name->nodename)) != 0 ) {
18 strcpy(name->nodename, unk);
19 }
20#else
14 len = sizeof(name->nodename) - 1; 21 len = sizeof(name->nodename) - 1;
15 if ( !GetComputerName(name->nodename, &len) ) { 22 if ( !GetComputerName(name->nodename, &len) ) {
16 strcpy(name->nodename, unk); 23 strcpy(name->nodename, unk);
17 } 24 }
25#endif
18 26
19 memset(&os_info, 0, sizeof(OSVERSIONINFO)); 27 memset(&os_info, 0, sizeof(OSVERSIONINFO));
20 os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); 28 os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);