X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.cpp;h=f2562020dc7469f69819f4e32aeb8e7e4439c532;hb=d9b177227279d0c312c489634a8abe8b25a83f8a;hp=fc739f9bd17916ecb8c083d097efa3dec461094d;hpb=c6e40d36b42a7ebf832c3a57d2816a47ee9c9a76;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index fc739f9bd..f2562020d 100644
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -1,13 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2019, 2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2011 Adam <Adam@anope.org>
- *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2009 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 John Brooks <john.brooks@dereferenced.net>
- *   Copyright (C) 2007 Burlex <???@???>
+ *   Copyright (C) 2007-2008 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -27,119 +28,7 @@
 #include "inspircd.h"
 #include "configreader.h"
 #include <string>
-#include <errno.h>
-#include <assert.h>
-
-CoreExport DIR * opendir(const char * path)
-{
-	std::string search_path = std::string(path) + "\\*.*";
-	WIN32_FIND_DATAA fd;
-	HANDLE f = FindFirstFileA(search_path.c_str(), &fd);
-	if (f != INVALID_HANDLE_VALUE)
-	{
-		DIR * d = new DIR;
-		memcpy(&d->find_data, &fd, sizeof(WIN32_FIND_DATA));
-		d->find_handle = f;
-		d->first = true;
-		return d;
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-CoreExport dirent * readdir(DIR * handle)
-{
-	if (handle->first)
-		handle->first = false;
-	else
-	{
-		if (!FindNextFileA(handle->find_handle, &handle->find_data))
-			return 0;
-	}
-
-	strncpy(handle->dirent_pointer.d_name, handle->find_data.cFileName, MAX_PATH);
-	return &handle->dirent_pointer;
-}
-
-CoreExport void closedir(DIR * handle)
-{
-	FindClose(handle->find_handle);
-	delete handle;
-}
-
-int optind = 1;
-char optarg[514];
-int getopt_long(int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind)
-{
-	// burlex todo: handle the shortops, at the moment it only works with longopts.
-
-	if (___argc == 1 || optind == ___argc)			// No arguments (apart from filename)
-		return -1;
-
-	const char * opt = ___argv[optind];
-	optind++;
-
-	// if we're not an option, return an error.
-	if (strnicmp(opt, "--", 2) != 0)
-		return 1;
-	else
-		opt += 2;
-
-
-	// parse argument list
-	int i = 0;
-	for (; __longopts[i].name != 0; ++i)
-	{
-		if (!strnicmp(__longopts[i].name, opt, strlen(__longopts[i].name)))
-		{
-			// woot, found a valid argument =)
-			char * par = 0;
-			if ((optind) != ___argc)
-			{
-				// grab the parameter from the next argument (if its not another argument)
-				if (strnicmp(___argv[optind], "--", 2) != 0)
-				{
-//					optind++;		// Trash this next argument, we won't be needing it.
-					par = ___argv[optind-1];
-				}
-			}
-
-			// increment the argument for next time
-//			optind++;
-
-			// determine action based on type
-			if (__longopts[i].has_arg == required_argument && !par)
-			{
-				// parameter missing and its a required parameter option
-				return 1;
-			}
-
-			// store argument in optarg
-			if (par)
-				strncpy(optarg, par, 514);
-
-			if (__longopts[i].flag != 0)
-			{
-				// this is a variable, we have to set it if this argument is found.
-				*__longopts[i].flag = 1;
-				return 0;
-			}
-			else
-			{
-				if (__longopts[i].val == -1 || par == 0)
-					return 1;
-
-				return __longopts[i].val;
-			}
-			break;
-		}
-	}
-
-	// return 1 (invalid argument)
-	return 1;
-}
+#include "ya_getopt.c"
 
 CWin32Exception::CWin32Exception() : exception()
 {
@@ -167,3 +56,16 @@ DWORD CWin32Exception::GetErrorCode()
 {
 	return dwErrorCode;
 }
+
+WindowsStream::WindowsStream(DWORD handle)
+	: BackgroundColor(0)
+	, ForegroundColor(FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN)
+{
+	this->Handle = GetStdHandle(handle);
+	CONSOLE_SCREEN_BUFFER_INFO bufinf;
+	if (GetConsoleScreenBufferInfo(this->Handle, &bufinf))
+	{
+		this->BackgroundColor = bufinf.wAttributes & 0x00F0;
+		this->ForegroundColor = bufinf.wAttributes & 0x00FF;
+	}
+}