config.h

@@ -1,8 +1,8 @@
 #include "defs.h"
 
-#define MAX_USERNAME_LENGTH 128
-#define MAX_HOSTNAME_LENGTH 128
-#define MAX_UPTIME_LENGTH   40
+const int max_username_length = 128;
+const int max_hostname_length = 128;
+const int max_uptime_length   = 40;
 
 struct art_entry arts[] = {
     {

mycfetch.c

@@ -5,9 +5,8 @@
 #include <string.h>
 
 #ifdef _WIN32
-#include <sysinfoapi.h>
+#include <wdm.h>
 #include <winsock.h>
-#include <Lm.h>
 #include <winbase.h>
 #else
 #include <sys/utsname.h>
@@ -28,13 +27,8 @@ void die(int code, char *fmt, ...)
 
 void getuptime(char *buffer, int max_length)
 {
-#ifdef _WIN32
-#define uptime.tv_sec uptime_seconds
-    long long uptime_seconds = GetTickCount64() / 1000;
-#else
     struct timespec uptime;
     clock_gettime(CLOCK_BOOTTIME, &uptime);
-#endif /* _WIN32 */
     int days    = uptime.tv_sec / 86400;
     int hours   = uptime.tv_sec / 3600 % 24;
     int minutes = uptime.tv_sec / 60 % 60;
@@ -49,9 +43,6 @@ void getuptime(char *buffer, int max_length)
     else
         snprintf(buffer, max_length, "Up %d days, %d hours, %d minutes", days, hours, minutes);
 }
-#ifdef _WIN32
-#undef uptime.tv_sec
-#endif /* _WIN32 */
 
 int main(int argc, char **argv)
 {
@@ -70,29 +61,29 @@ int main(int argc, char **argv)
         art = arts[0].art;
     }
 
-    char hostname[MAX_HOSTNAME_LENGTH];
-    char username[MAX_USERNAME_LENGTH];
-    char uptime[MAX_UPTIME_LENGTH];
+    char hostname[max_hostname_length];
+    char username[max_username_length];
+    char uptime[max_uptime_length];
 #ifdef _WIN32
-    SERVER_INFO_101 host_info;
-    NetServerGetInfo(NULL, 101, &host_info);
-    GetUserNameA(username, MAX_USERNAME_LENGTH);
+    RTL_OSVERSIONINFOW version_buffer = {.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOW)};
+    RtlGetVersion(&version_buffer);
+    GetUserNameA(username, max_username_length);
 #else
     struct utsname uname_buf;
 
-    getlogin_r(username, MAX_USERNAME_LENGTH);
+    getlogin_r(username, max_username_length);
     uname(&uname_buf);
-#endif /* _WIN32 */
-    gethostname(hostname, MAX_HOSTNAME_LENGTH);
-    getuptime(uptime, MAX_UPTIME_LENGTH);
+#endif
+    gethostname(hostname, max_hostname_length);
+    getuptime(uptime, max_uptime_length);
 
     printf("%s %s@%s\n", art[0], username, hostname);
     printf("%s --\n",    art[1]);
 #ifdef _WIN32
-    printf("%s NT %d.%d\n", art[2], host_info.sv101_version_major & MAJOR_VERSION_MASK, host_info.sv101_version_minor);
+    printf("%s NT %u.%u %s\n", art[2], version_buffer.dwMajorVersion, version_buffer.dwMinorVersion, version_buffer.szCSDVersion);
 #else
     printf("%s %s %s\n", art[2], uname_buf.sysname, uname_buf.release);
-#endif /* _WIN32 */
+#endif
     printf("%s %s\n",    art[3], uptime);
     return 0;
 }