Changeset 632

Timestamp:

Apr 14, 2015, 1:23:07 AM (9 years ago)

Author:

djay

Message:

Make sure to rename the cached zip file only when its name contains ".zca".

File:

• trunk/zoo-project/zoo-kernel/service_internal_otb.c (modified) (3 diffs)

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

@@ -272 +272 @@
                     if(tmpVal!=NULL){
                       if(strncasecmp(tmpVal->value,"application/zip",14)==0){
-                        char tmpName[1024];
-                        symlink(test->value,ReplaceAll(test->value,".zca",".zip").c_str());
-                        sprintf(tmpName,"/vsizip/%s",ReplaceAll(test->value,".zca",".zip").c_str());
+                        char *tmpName=(char*)malloc((strlen(test->value)+9)*sizeof(char));
+                        std::string test0(test->value);
+                        if(test0.find(".zca")!=std::string::npos){
+                          symlink(test->value,ReplaceAll(test->value,".zca",".zip").c_str());
+                          sprintf(tmpName,"/vsizip/%s",ReplaceAll(test->value,".zca",".zip").c_str());
+                        }else
+                          sprintf(tmpName,"/vsizip/%s",test->value);
                         char **files=VSIReadDir(tmpName);
                         int nFiles = CSLCount( files );
-                        char tmpSSName[1024];
-                        sprintf(tmpSSName,"%s/Input_%s_%s",tmpPath->value,s->name,tmpSid->value);
+                        char *tmpSSName=(char*)malloc((strlen(tmpPath->value)+strlen(paramKey.c_str())+strlen(tmpSid->value)+9)*sizeof(char));
+                        sprintf(tmpSSName,"%s/Input_%s_%s",tmpPath->value,paramKey.c_str(),tmpSid->value);
                         mkdir(tmpSSName,0777);
                             
-                        char tmpSName[1024];
                         for(int kk=0;kk<nFiles;kk++){
+                          char *tmpSName=(char*)malloc((strlen(tmpName)+strlen(files[kk])+2)*sizeof(char));
                           sprintf(tmpSName,"%s/%s",tmpName,files[kk]);
                           VSILFILE* fmain=VSIFOpenL(tmpSName, "rb");
@@ -293 +297 @@
                             VSIFReadL(content,1,count*sizeof(char),fmain);
                           
-                            char tmpSSSName[1024];
+                            char *tmpSSSName=(char*)malloc((strlen(tmpSSName)+strlen(files[kk])+2)*sizeof(char));
                             sprintf(tmpSSSName,"%s/%s",tmpSSName,files[kk]);
                             
@@ -306 +310 @@
                               test=getMapFromMaps(inputs,paramKey.c_str(),"cache_file");
                             }
+                            free(tmpSSSName);
                           }
+                          free(tmpSName);
                         }
+                        free(tmpSSName);
+                        free(tmpName);
                       }
                     }