Changeset 34752

Timestamp:

Nov 30, 2012, 10:28:06 AM (14 years ago)

Author:

eugene

Message:

handle \r as well as \n for EOL

File:

• branches/eam_branches/ipp-20120905/Ohana/src/libohana/src/string.c (modified) (2 diffs)

branches/eam_branches/ipp-20120905/Ohana/src/libohana/src/string.c

@@ -130 +130 @@
   status = EOF + 1;
   
-  for (i = 0, c = 0; (c != '\n') && (status != EOF); i++) {
+  for (i = 0, c = 0; (c != '\n') && (c != '\r') && (status != EOF); i++) {
     status = fscanf (f, "%c", &c);
     line[i] = c;
@@ -154 +154 @@
   status = EOF + 1;
   
-  for (i = 0, c = 0; (c != '\n') && (status != EOF) && (i < maxlen); i++) {
+  for (i = 0, c = 0; (c != '\n') && (c != '\r') && (status != EOF) && (i < maxlen); i++) {
     status = fscanf (f, "%c", &c);
     line[i] = c;