From 8a6e1fbb6dbb642fb2d051ab016acfdf08ae1596 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 21 Jul 2021 15:45:45 +0000
Subject: [PATCH] Remove code for pre-NT Windows.

---
 services.cc | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/services.cc b/services.cc
index 16c6505c7..b9318f17f 100644
--- a/services.cc
+++ b/services.cc
@@ -115,7 +115,7 @@ static int nmap_services_init() {
 
   char filename[512];
   FILE *fp;
-  char servicename[128], proto[16];
+  char servicename[128], proto[16] = { 0 };
   u16 portno;
   const char *p;
   char line[1024];
@@ -123,7 +123,7 @@ static int nmap_services_init() {
   int res;
   double ratio;
   int ratio_n, ratio_d;
-  char ratio_str[32];
+  char ratio_str[32] = { 0 };
 
   numtcpports = 0;
   numudpports = 0;
@@ -133,26 +133,15 @@ static int nmap_services_init() {
   ratio_format = 0;
 
   if (nmap_fetchfile(filename, sizeof(filename), "nmap-services") != 1) {
-#ifndef WIN32
     error("Unable to find nmap-services!  Resorting to /etc/services");
+#ifndef WIN32
     strcpy(filename, "/etc/services");
 #else
-        int len, wnt = GetVersion() < 0x80000000;
-    error("Unable to find nmap-services!  Resorting to /etc/services");
-        if(wnt)
-                len = GetSystemDirectory(filename, 480);	//	be safe
-        else
-                len = GetWindowsDirectory(filename, 480);	//	be safe
-        if(!len)
-                error("Get%sDirectory failed (%d) @#!#@",
-                 wnt ? "System" : "Windows", GetLastError());
-        else
-        {
-                if(wnt)
-                        strcpy(filename + len, "\\drivers\\etc\\services");
-                else
-                        strcpy(filename + len, "\\services");
-        }
+    int len = GetSystemDirectory(filename, 480);	//	be safe
+    if(!len)
+      fatal("GetSystemDirectory failed (%d) @#!#@", GetLastError());
+    else
+      strcpy(filename + len, "\\drivers\\etc\\services");
 #endif
   }