Changeset 32 in TRACY3 for trunk/tracy/tracy/src/read_script.cc

Timestamp:

Apr 9, 2014, 3:50:11 PM (10 years ago)

Author:

zhangj

Message:

active the transport of the twiss functions and orbits of the transfer line.

File:

• trunk/tracy/tracy/src/read_script.cc (modified) (5 diffs)

trunk/tracy/tracy/src/read_script.cc

@@ -78 +78 @@
  
   
-  char    str[max_str]="voidstring", dummy[max_str]="voidstring",dummy2[max_str]="voidstring", nextpara[max_str]="voidpara";
-  char    in[max_str];  //temporary line with preceding white space
+  char    str[max_str]="", dummy[max_str]="",dummy2[max_str]="", nextpara[max_str]="";
+  char    in[max_str]="";  //temporary line with preceding white space
   char    *line = NULL; //line to store the command without preceding white space
   size_t   len = 0;
   ssize_t  read;
-  char    name[max_str]="voidname";
+  char    name[max_str]=""; //initialize with empty character array.
  // char    lat_file[max_str]="voidlattice";
-  char    EndName[]="void";
+  char    EndName[5]="";
 
   FILE    *inf;
@@ -92 +92 @@
   long int    NameLen=0L;
   int idummy=0;
-  char full_param_file_name[max_str];
-  char lat_FileName[max_str];
+  char full_param_file_name[max_str]="";
+  char lat_FileName[max_str]="";
  //bool TuneTracFlag;
   char *pch;
@@ -115 +115 @@
      
      LineNum++;
-     if(prt){
+     if(!prt){
        printf("Line # %ld \n",LineNum);
        printf("Retrieved line of length %zu : \n",read);
@@ -126 +126 @@
     if (strstr(line, "#") == NULL && line[0] != '\n' &&
         line[0] != '\r' && strcmp(line, "\r\n") != 0 ){
+    
+        
       // get initial command token
       sscanf(line, "%s", name); 
@@ -134 +136 @@
       //find the sequence of the bool flag in user input script 
       NameLen = strlen(name);
-      EndName[0] = name[NameLen-4];
-      EndName[1] = name[NameLen-3];
-      EndName[2] = name[NameLen-2];
-      EndName[3] = name[NameLen-1];          
-      
+      if(NameLen >= 4 ){
+        EndName[0] = name[NameLen-4];
+        EndName[1] = name[NameLen-3];
+        EndName[2] = name[NameLen-2];
+        EndName[3] = name[NameLen-1];          
+      }
       //find the bool flag whose last 4 character are 'Flag' 
       if(strcmp(EndName,"Flag")==0)