Changeset 34753 for trunk/Ohana/src/opihi/cmd.data/read_vectors.c

Timestamp:

Nov 30, 2012, 10:29:40 AM (14 years ago)

Author:

eugene

Message:

merge changes from eam 20120905

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• . (modified) (1 prop)
• read_vectors.c (modified) (4 diffs)

trunk/Ohana/src/opihi/cmd.data/read_vectors.c

@@ -30 +30 @@
   int i, j, Nskip, Narg, Nvec, *col, IsCSV, VERBOSE;
   int Nbytes, Nstart, NELEM, Nelem, nread, *coltype;
-  char *colstr, *c0, *c1, *buffer, *extname;
+  char *colstr, *c0, *c1, *extname;
   Vector **vec;
+
+  char *buffer = NULL;
 
   /* auto-sense table type */
@@ -155 +157 @@
   bzero (buffer, 0x10001);
   for (i = 0; i < Nskip; i++) {
-    scan_line (f, buffer);
+    if (scan_line_maxlen (f, buffer, 0x10000) == EOF) {
+      gprint (GP_ERR, "problem reading file %s\n", filename);
+      free (vec);
+      free (col);
+      return FALSE;
+    }
   }
 
@@ -179 +186 @@
     while (bufferStatus) {
       c1 = strchr (c0, '\n'); // find the end of this current line
+      if (!c1) {
+        c1 = strchr (c0, '\r'); // try \r for non-UNIX files (what do we do about a Mac? \n\r?)
+      }
       if (c1 == (char *) NULL) {
         Nstart = strlen (c0);
@@ -260 +270 @@
   free (vec);
   free (col);
-  free (buffer);
+  if (buffer) free (buffer);
   return (TRUE);