--source option accepts file with long line (4096 caracters)

edf-hpc · Jun 14, 2018 · 7938de5 · 7938de5
1 parent d1c77f2
commit 7938de5
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/vr_exclude.c b/vr_exclude.c
@@ -113,7 +113,7 @@ Vr_Exclude * vr_loadExcludeList (Vr_Exclude * list, const HChar * fname) {
          c<line+LINE_SIZEMAX && *c != 0 && *c != '\t' && *c != ' ';
          ++c) {}
     if (*c == 0 || c>line+LINE_SIZEMAX-1) {
-      VG_(umsg)("ERROR (parse)\n");
+      VG_(umsg)("ERROR (parse) :%s \n",line);
       return list;
     }
     *c = 0;
@@ -283,7 +283,7 @@ Vr_IncludeSource * vr_loadIncludeSourceList (Vr_IncludeSource * list, const HCha
     return list;
   }
 
-  SizeT nLine = 256;
+  SizeT nLine = LINE_SIZEMAX ;
   HChar *line = VG_(malloc)("vr.loadIncludeSources.1", nLine*sizeof(HChar));
   Int lineno = 0;
 
@@ -293,29 +293,29 @@ Vr_IncludeSource * vr_loadIncludeSourceList (Vr_IncludeSource * list, const HCha
     HChar* filename = line;
     // Skip non-blank characters
     for (c = line;
-         c<line+256 && *c != 0 && *c != '\t' && *c != ' ';
+         c<line+LINE_SIZEMAX && *c != 0 && *c != '\t' && *c != ' ';
          ++c) {}
-    if (*c == 0 || c>line+255) {
-      VG_(umsg)("ERROR (parse1)\n");
+    if (*c == 0 || c>line+LINE_SIZEMAX-1) {
+      VG_(umsg)("ERROR (parse1) : %s\n",line);
       return list;
     }
     *c = 0;
 
     // Skip blank characters
     for (++c;
-         c<line+256 && *c != 0 && (*c == '\t' || *c == ' ');
+         c<line+LINE_SIZEMAX && *c != 0 && (*c == '\t' || *c == ' ');
          ++c) {}
     HChar* linenum_ = c;
     // Skip non-blank characters
     for (;
-         c<line+256 && *c != 0 && *c != '\t' && *c != ' ';
+         c<line+LINE_SIZEMAX && *c != 0 && *c != '\t' && *c != ' ';
          ++c) {}
-    if (c>line+255) {
-      VG_(umsg)("ERROR (parse2)\n");
+    if (c>line+LINE_SIZEMAX-1) {
+      VG_(umsg)("ERROR (parse2) : %s\n",line);
       return list;
     }
     if (*c==0) {
-      c = line + 256;
+      c = line + LINE_SIZEMAX;
     } else {
       *c = 0;
       ++c;
@@ -324,7 +324,7 @@ Vr_IncludeSource * vr_loadIncludeSourceList (Vr_IncludeSource * list, const HCha
 
     // Skip blank characters
     for (;
-         c<line+256 && *c != 0 && (*c == '\t' || *c == ' ');
+         c<line+LINE_SIZEMAX && *c != 0 && (*c == '\t' || *c == ' ');
          ++c) {}
     HChar* fnname = c;