Implementation of uname for WIN32

4 files changed, 125 insertions, 0 deletions

diff --git a/coreutils/uname.c b/coreutils/uname.c
index d1c50e222..c259b1771 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -56,7 +56,11 @@ typedef struct {
         struct utsname name;
         char processor[sizeof(((struct utsname*)NULL)->machine)];
         char platform[sizeof(((struct utsname*)NULL)->machine)];
+#if ENABLE_PLATFORM_MINGW32
+        char os[sizeof("MS/Windows")];
+#else
         char os[sizeof("GNU/Linux")];
+#endif
 } uname_info_t;
 
 static const char options[] ALIGN1 = "snrvmpioa";
@@ -123,7 +127,11 @@ int uname_main(int argc UNUSED_PARAM, char **argv)
 #endif
         strcpy(uname_info.processor, unknown_str);
         strcpy(uname_info.platform, unknown_str);
+#if ENABLE_PLATFORM_MINGW32
+        strcpy(uname_info.os, "MS/Windows");
+#else
         strcpy(uname_info.os, "GNU/Linux");
+#endif
 #if 0
         /* Fedora does something like this */
         strcpy(uname_info.processor, uname_info.name.machine);
diff --git a/win32/Kbuild b/win32/Kbuild
index bc005c23a..ef3af7458 100644
--- a/win32/Kbuild
+++ b/win32/Kbuild
@@ -11,4 +11,5 @@ lib-$(CONFIG_PLATFORM_MINGW32) += process.o
 lib-$(CONFIG_PLATFORM_MINGW32) += regex.o
 lib-$(CONFIG_WIN32_NET) += net.o
 lib-$(CONFIG_PLATFORM_MINGW32) += termios.o
+lib-$(CONFIG_PLATFORM_MINGW32) += uname.o
 lib-$(CONFIG_PLATFORM_MINGW32) += winansi.o
diff --git a/win32/sys/utsname.h b/win32/sys/utsname.h
new file mode 100644
index 000000000..6f12efd58
--- /dev/null
+++ b/win32/sys/utsname.h
@@ -0,0 +1,66 @@
+/* Copyright (C) 1991,92,94,96,97,99,2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/*
+ *      POSIX Standard: 4.4 System Identification       <sys/utsname.h>
+ */
+
+#ifndef _SYS_UTSNAME_H
+#define _SYS_UTSNAME_H  1
+
+#define _UTSNAME_LENGTH 65
+
+#ifndef _UTSNAME_SYSNAME_LENGTH
+# define _UTSNAME_SYSNAME_LENGTH _UTSNAME_LENGTH
+#endif
+#ifndef _UTSNAME_NODENAME_LENGTH
+# define _UTSNAME_NODENAME_LENGTH _UTSNAME_LENGTH
+#endif
+#ifndef _UTSNAME_RELEASE_LENGTH
+# define _UTSNAME_RELEASE_LENGTH _UTSNAME_LENGTH
+#endif
+#ifndef _UTSNAME_VERSION_LENGTH
+# define _UTSNAME_VERSION_LENGTH _UTSNAME_LENGTH
+#endif
+#ifndef _UTSNAME_MACHINE_LENGTH
+# define _UTSNAME_MACHINE_LENGTH _UTSNAME_LENGTH
+#endif
+
+/* Structure describing the system and machine.  */
+struct utsname
+  {
+    /* Name of the implementation of the operating system.  */
+    char sysname[_UTSNAME_SYSNAME_LENGTH];
+
+    /* Name of this node on the network.  */
+    char nodename[_UTSNAME_NODENAME_LENGTH];
+
+    /* Current release level of this implementation.  */
+    char release[_UTSNAME_RELEASE_LENGTH];
+    /* Current version level of this release.  */
+    char version[_UTSNAME_VERSION_LENGTH];
+
+    /* Name of the hardware type the system is running on.  */
+    char machine[_UTSNAME_MACHINE_LENGTH];
+  };
+
+/* Put information about the system in NAME.  */
+extern int uname (struct utsname *__name);
+
+
+#endif /* sys/utsname.h  */
diff --git a/win32/uname.c b/win32/uname.c
new file mode 100644
index 000000000..1c73d073e
--- /dev/null
+++ b/win32/uname.c
@@ -0,0 +1,50 @@
+#include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>
+
+int uname(struct utsname *name)
+{
+        const char *unk = "unknown";
+        OSVERSIONINFOEX os_info;
+        SYSTEM_INFO sys_info;
+        DWORD len;
+
+        strcpy(name->sysname, "Windows_NT");
+
+        len = sizeof(name->nodename) - 1;
+        if ( !GetComputerName(name->nodename, &len) ) {
+                strcpy(name->nodename, unk);
+        }
+
+        memset(&os_info, 0, sizeof(OSVERSIONINFOEX));
+        os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+
+        strcpy(name->release, unk);
+        strcpy(name->version, unk);
+        if (GetVersionEx(&os_info)) {
+                sprintf(name->release, "%d.%d", os_info.dwMajorVersion,
+                                os_info.dwMinorVersion);
+                sprintf(name->version, "%d", os_info.dwBuildNumber);
+        }
+
+        strcpy(name->machine, unk);
+        GetSystemInfo(&sys_info);
+        switch (sys_info.wProcessorArchitecture) {
+        case PROCESSOR_ARCHITECTURE_AMD64:
+                strcpy(name->machine, "x86_64");
+                break;
+        case PROCESSOR_ARCHITECTURE_IA64:
+                strcpy(name->machine, "ia64");
+                break;
+        case PROCESSOR_ARCHITECTURE_INTEL:
+                if (sys_info.wProcessorLevel < 6) {
+                        strcpy(name->machine, "i386");
+                }
+                else {
+                        strcpy(name->machine, "i686");
+                }
+                break;
+        }
+
+        return 0;
+}