Changeset 385

Timestamp:

Jan 10, 2013, 3:39:16 AM (12 years ago)

Author:

djay

Message:

Add QREncode service. Fix memory leaks. Avoid printing anything from the conf_read function to be able to detect and return valid headers.

Location:

trunk/zoo-project

Files:

• zoo-kernel/main_conf_read.y (modified) (1 diff)
• zoo-kernel/service_internal.c (modified) (2 diffs)
• zoo-kernel/zoo_service_loader.c (modified) (4 diffs)
• zoo-services/qrencode (added)
• zoo-services/qrencode/Makefile (added)
• zoo-services/qrencode/cgi-env (added)
• zoo-services/qrencode/cgi-env/QREncode.zcfg (added)
• zoo-services/qrencode/makefile.vc (added)
• zoo-services/qrencode/qrenc-service.c (added)

trunk/zoo-project/zoo-kernel/main_conf_read.y

@@ -314 +314 @@
   crin = fopen(file,"r");
   if (crin==NULL){
-    printf("error : le fichier specifie n'existe pas ou n'est pas accessible en lecture\n") ;
     return 2 ;
   }

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -1746 +1746 @@
       printf("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
     }
-  }else
+  }else{
     printf("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
+  }
   n=createExceptionReportNode(m,s,1);
   xmlDocSetRootElement(doc, n);
@@ -2016 +2017 @@
         printf("%s",mime);
         if(rs!=NULL)
-          fwrite(toto->value,atoi(rs->value),1,stdout);
+          fwrite(toto->value,1,atoi(rs->value),stdout);
         else
-          fwrite(toto->value,strlen(toto->value),1,stdout);
+          fwrite(toto->value,1,strlen(toto->value),stdout);
 #ifdef DEBUG
         dumpMap(toto);

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -561 +561 @@
   char conf_file[10240];
   snprintf(conf_file,10240,"%s/%s/main.cfg",ntmp,r_inputs->value);
-  conf_read(conf_file,m);
+  if(conf_read(conf_file,m)==2){
+    errorException(NULL, _("Unable to load the main.cfg file."),"InternalError");
+    free(m);
+    return 1;
+  }
 #ifdef DEBUG
   fprintf(stderr, "***** BEGIN MAPS\n"); 
@@ -635 +639 @@
     freeMap(&request_inputs);
     free(request_inputs);
-    free(REQUEST);
     return 1;
   }
@@ -838 +841 @@
       free(SERVICE_URL);
       fflush(stdout);
-#ifndef LINUX_FREE_ISSUE
-      if(s1)
-        free(s1);
-#endif
       return 0;
     }
@@ -851 +850 @@
 #endif  
         closedir(dirp);
+        freeMaps(&m);
+        free(m);
+        free(REQUEST);
+        free(SERVICE_URL);
+        fflush(stdout);
         return 0;
       }