Changeset 896 for branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c

Timestamp:

Feb 25, 2019, 1:57:11 PM (5 years ago)

Author:

knut

Message:

Added some recent changes from trunk (r889), including some new utility functions and exception handling and new (conditional) definition of type bool. Added some new logic concerning Python and Mono environment and search paths. Fixed problem with Mono updateStatus function. Changed response_print.h to #include locale.h unconditionally and xlocale.h conditionally; xlocale.h is non-standard and can probably be dropped.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c (modified) (4 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c

@@ -118 +118 @@
         ;
 #endif
-    tmp=strtok(buffer,";");
+    tmp=strtok((char*) buffer,";"); // knut: added cast to char*
     int cnt=0;
     _HINTERNET *psInternet=(_HINTERNET *)data;
@@ -322 +322 @@
  * @return 1 if the host is listed as protected, 0 in other case
  */
-int isProtectedHost(const char* protectedHosts,const char* url){
-  char *token, *saveptr;
-  token = strtok_r (url, "//", &saveptr);
-  int cnt=0;
-  char* host;
-  while(token!=NULL && cnt<=1){
-    if(cnt==1 && strstr(protectedHosts,token)!=NULL){
-      return 1;
-    }
-    token = strtok_r (NULL, "/", &saveptr);
-    cnt+=1;
-  }
-  return 0;
+int isProtectedHost(const char* protectedHosts, const char* url) {
+        char *token, *saveptr;
+        int cnt;
+        char* host;
+
+        // knut: make a copy of url since strtok family modifies first argument and cannot be used on constant strings  
+        char* urlcpy = (char*)malloc(sizeof(char)*(strlen(url) + 1));
+        urlcpy = strncpy(urlcpy, url, strlen(url) + 1); // since count > strlen(url), a null character is properly appended
+
+        //token = strtok_r (url, "//", &saveptr);
+        token = strtok_r(urlcpy, "//", &saveptr);   // knut
+        cnt = 0;
+        while (token != NULL && cnt <= 1) {
+                fprintf(stderr, "%s %d %s \n", __FILE__, __LINE__, token);
+                if (cnt == 1)
+                        fprintf(stderr, "%s %d %s \n", __FILE__, __LINE__, strstr(protectedHosts, token));
+                fflush(stderr);
+                if (cnt == 1 && strstr(protectedHosts, token) != NULL) {
+                        fprintf(stderr, "%s %d %s \n", __FILE__, __LINE__, strstr(protectedHosts, token));
+                        free(urlcpy);
+                        return 1;
+                }
+                token = strtok_r(NULL, "/", &saveptr);
+                cnt += 1;
+        }
+        free(urlcpy);
+        return 0;
 }
 
@@ -457 +471 @@
   int ldwFlags=INTERNET_FLAG_NEED_FILE;
   struct MemoryStruct header;
-  map* memUse=getMapFromMaps(conf,"main","memory");
+  map* memUse=getMapFromMaps((maps*) conf,"main","memory"); // knut: addad cast to maps*
 
   hInternet->ihandle[hInternet->nb].handle=curl_easy_init( );
@@ -505 +519 @@
       map* tmpPath=NULL;
       if(conf!=NULL){
-        tmpPath=getMapFromMaps(conf,"main","tmpPath");
+        tmpPath=getMapFromMaps((maps*) conf,"main","tmpPath"); // knut added cast to maps*
       }
       if(tmpPath==NULL)