]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - win/inspircd_win32wrapper.cpp
Replace our Windows getopt_long wrapper with ya_getopt.
[user/henk/code/inspircd.git] / win / inspircd_win32wrapper.cpp
index 2836674bbdf9e70f1f38c1e98f856011db3899bd..1a7be09fe710ba7eedb262fdfc6ec2e953616fef 100644 (file)
 #include "inspircd.h"
 #include "configreader.h"
 #include <string>
-#include <errno.h>
-#include <assert.h>
-
-CoreExport const char *insp_inet_ntop(int af, const void *src, char *dst, socklen_t cnt)
-{
-
-       if (af == AF_INET)
-       {
-               struct sockaddr_in in;
-               memset(&in, 0, sizeof(in));
-               in.sin_family = AF_INET;
-               memcpy(&in.sin_addr, src, sizeof(struct in_addr));
-               getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST);
-               return dst;
-       }
-       else if (af == AF_INET6)
-       {
-               struct sockaddr_in6 in;
-               memset(&in, 0, sizeof(in));
-               in.sin6_family = AF_INET6;
-               memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
-               getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
-               return dst;
-       }
-       return NULL;
-}
-
-CoreExport int insp_inet_pton(int af, const char *src, void *dst)
-{
-       int address_length;
-       sockaddr_storage sa;
-       sockaddr_in* sin = reinterpret_cast<sockaddr_in*>(&sa);
-       sockaddr_in6* sin6 = reinterpret_cast<sockaddr_in6*>(&sa);
-
-       switch (af)
-       {
-               case AF_INET:
-                       address_length = sizeof(sockaddr_in);
-                       break;
-               case AF_INET6:
-                       address_length = sizeof(sockaddr_in6);
-                       break;
-               default:
-                       return -1;
-       }
-
-       if (!WSAStringToAddress(static_cast<LPSTR>(const_cast<char *>(src)), af, NULL, reinterpret_cast<LPSOCKADDR>(&sa), &address_length))
-       {
-               switch (af)
-               {
-                       case AF_INET:
-                               memcpy(dst, &sin->sin_addr, sizeof(in_addr));
-                               break;
-                       case AF_INET6:
-                               memcpy(dst, &sin6->sin6_addr, sizeof(in6_addr));
-                               break;
-               }
-               return 1;
-       }
-
-       return 0;
-}
-
-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()
 {
        dwErrorCode = GetLastError();
        if( FormatMessageA( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), NULL) == 0 )
                sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode);
+       for (size_t i = 0; i < _countof(szErrorString); i++)
+       {
+               if ((szErrorString[i] == '\r') || (szErrorString[i] == '\n'))
+                       szErrorString[i] = 0;
+       }
 }
 
 CWin32Exception::CWin32Exception(const CWin32Exception& other)
@@ -222,10 +55,3 @@ DWORD CWin32Exception::GetErrorCode()
 {
        return dwErrorCode;
 }
-
-#include "../src/modules/m_spanningtree/link.h"
-#include "modules/ssl.h"
-template class reference<Link>;
-template class reference<Autoconnect>;
-template class reference<ssl_cert>;
-template class reference<OperInfo>;