X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fwin32%2Fsilcwin32util.c;h=0148a8e02b19e7f40cb7d752bdd8a9486685daf4;hb=e7b6c157b80152bf9fb9266e6bdd93f9fb0db776;hp=7bc2d69a98981964d1109786057a0bf657252052;hpb=d1e71f42379e8b5cd0748a7aeae8561b02cfe53d;p=silc.git

diff --git a/lib/silcutil/win32/silcwin32util.c b/lib/silcutil/win32/silcwin32util.c
index 7bc2d69a..0148a8e0 100644
--- a/lib/silcutil/win32/silcwin32util.c
+++ b/lib/silcutil/win32/silcwin32util.c
@@ -4,12 +4,12 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2001 - 2005 Pekka Riikonen
+  Copyright (C) 2001 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.
-  
+
   This program 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
@@ -18,45 +18,24 @@
 */
 /* $Id$ */
 
-#include "silcincludes.h"
-
-/* XXX GNU regex may work on Win32 too!! */
-char *silc_string_regexify(const char *string)
-{
-  return strdup(string);
-}
-
-char *silc_string_regex_combine(const char *string1, const char *string2)
-{
-  return strdup(string1);
-}
-
-int silc_string_regex_match(const char *regex, const char *string)
-{
-  return TRUE;
-}
-
-int silc_string_match(const char *string1, const char *string2)
-{
-  return TRUE;
-}
+#include "silc.h"
 
 #define FILETIME_1970 0x019db1ded53e8000
 const BYTE DWLEN = sizeof(DWORD) * 8;
 
 /* Return current time in struct timeval. Code ripped from some xntp
-   implementation on http://src.openresources.com. */
+   implementation. */
 
 int silc_gettimeofday(struct timeval *tv)
 {
   FILETIME ft;
-  __int64 msec;
-  
+  __int64 usec;
+
   GetSystemTimeAsFileTime(&ft);
-  msec = (__int64) ft.dwHighDateTime << DWLEN | ft.dwLowDateTime;
-  msec = (msec - FILETIME_1970) / 10;
-  tv->tv_sec  = (long) (msec / 1000000);
-  tv->tv_usec = (long) (msec % 1000000);
+  usec = (__int64) ft.dwHighDateTime << DWLEN | ft.dwLowDateTime;
+  usec = (usec - FILETIME_1970) / 10;
+  tv->tv_sec  = (long) (usec / 1000000);
+  tv->tv_usec = (long) (usec % 1000000);
 
   return 0;
 }
@@ -66,10 +45,15 @@ char *silc_get_username(void)
   DWORD maxlen = 128;
   char username[128];
   GetUserName(username, &maxlen);
-  return strdup(username);
+  return silc_strdup(username);
 }
 
 char *silc_get_real_name(void)
 {
   return silc_get_username();
 }
+
+int silc_file_set_nonblock(int fd)
+{
+  return 0;
+}