X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=util.c;h=28e56b5ad452b0ac6aa7973ab7094054707a0483;hb=5b56e51eeae04c352b95b1706b9d69b61feba3e9;hp=5e6e4f3a57ac913d67ab4fa7b649c125ea50a1eb;hpb=1087eb7b2d8447adf9a7deb549d4004a87b46b10;p=polyglot.git

diff --git a/util.c b/util.c
index 5e6e4f3..28e56b5 100644
--- a/util.c
+++ b/util.c
@@ -18,11 +18,17 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#ifndef _MSC_VER
 #include <sys/time.h>
+#endif
 
 #include "main.h"
 #include "util.h"
 
+// macros
+
+#define StringSize 4096
+
 // variables
 
 static bool Error;
@@ -144,6 +150,10 @@ void my_log_open(const char file_name[]) {
 //line buffering doesn't work too well in MSVC and/or windows 
    if (LogFile != NULL) setvbuf(LogFile,NULL,_IOLBF,0); // line buffering
 #endif
+   if(LogFile!=NULL){
+       my_log("POLYGLOT *** LOGFILE OPENED ***\n");
+   }
+
 }
 
 // my_log_close()
@@ -188,7 +198,7 @@ void my_fatal(const char format[], ...) {
     CONSTRUCT_ARG_STRING(format,string);
     
     fprintf(stderr,"%s",string);
-    if (LogFile != NULL) fprintf(LogFile,"%s",string);
+    my_log("POLYGLOT %s",string);
 
     if (Error) { // recursive error
         my_log("POLYGLOT *** RECURSIVE ERROR ***\n");
@@ -233,6 +243,32 @@ bool my_file_read_line(FILE * file, char string[], int size) {
    return TRUE;
 }
 
+// my_file_join()
+
+void my_path_join(char *join_path, const char *path, const char *file){
+    char separator;
+#ifdef _WIN32
+    separator='\\';
+#else
+    separator='/';
+#endif
+    snprintf(join_path,StringSize,"%s%c%s",path,separator,file);
+    join_path[StringSize-1]='\0';
+}
+
+// my_mkdir()
+
+int my_mkdir(const char *path){
+    int ret;
+#ifdef _WIN32
+    ret=_mkdir(path);
+#else
+    ret=mkdir(path,S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+#endif
+    return ret;
+}
+
+
 // my_string_empty()
 
 bool my_string_empty(const char string[]) {
@@ -284,6 +320,44 @@ bool my_string_case_equal(const char string_1[], const char string_2[]) {
    return FALSE;
 }
 
+// my_strtolower()
+
+void my_string_tolower(char *dst, const char *src){
+  int c;
+  ASSERT(src!=NULL);
+  ASSERT(dst!=NULL);
+  while((c=*(src++))){
+    *dst=tolower(c);
+    dst++;
+  }
+  *(dst++)='\0';
+}
+
+// my_string_case_contains()
+
+const char* my_string_case_contains(const char string_1[], const char string_2[]){
+   
+   char tmp1[StringSize];
+   char tmp2[StringSize];
+   char *where;
+
+
+   ASSERT(string_1!=NULL);
+   ASSERT(string_2!=NULL);
+
+   my_string_tolower(tmp1,string_1);
+   my_string_tolower(tmp2,string_2);
+
+   where=strstr(tmp1,tmp2);
+   if(where){
+      return string_1+(where-tmp1);
+   }
+   return NULL;
+
+  
+}
+
+
 // my_strdup()
 
 char * my_strdup(const char string[]) {
@@ -323,6 +397,8 @@ void my_string_set(const char * * variable, const char string[]) {
    *variable = my_strdup(string);
 }
 
+// now_real()
+
 double now_real() {
 #ifndef _WIN32
    struct timeval tv[1];
@@ -337,7 +413,10 @@ double now_real() {
 
    return tv->tv_sec + tv->tv_usec * 1E-6;
 #else
-   return (double) GetTickCount() / 1000.0;  // we can do better here:-)
+   struct _timeb timeptr;
+   _ftime(&timeptr);
+   return(timeptr.time+((double)timeptr.millitm)/1000.0);
+//   return (double) GetTickCount() / 1000.0;  // we can do better here:-)
 #endif
 }