commit 18a48c3c1c1aa183a1b1ab033be34329685199f6
author humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 14 19:42:08 2013 +0000
committer humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 14 19:42:08 2013 +0000
tree 8d771a3e536f005854bfd1e23dc59d0ac7fbebeb
parent 6d29eda49129893d8f5e385bfbe8473af154b82b

replace getline with fgets for portability

BUG=

Review URL: https://codereview.appspot.com/7085058

git-svn-id: http://skia.googlecode.com/svn/trunk@7163 2bbb7eff-a529-9590-31e7-b0007b416f81

src/utils/SkRTConf.cpp

diff --git a/src/utils/SkRTConf.cpp b/src/utils/SkRTConf.cpp
index 2ccfd06..38bc64c 100644
--- a/src/utils/SkRTConf.cpp
+++ b/src/utils/SkRTConf.cpp
@@ -16,29 +16,23 @@
         return;
     }
     
-    char *line = NULL;
-    size_t n = 0;
+    char line[1024];
     
     while (!sk_feof(fp)) {
-        if (line) {
-            sk_free(line);
-        }
-        line = NULL;
         
-        if (sk_getline(&line, &n, fp) == -1) break;
+        if (!sk_fgets(line, sizeof(line), fp)) {
+            break;
+        }
                 
         char *commentptr = strchr(line, '#');
         if (commentptr == line) {
             continue;
         }
         if (NULL != commentptr) {
-            char *tmp = (char *) sk_malloc_throw(commentptr-line+1);
-            strncpy(tmp, line, commentptr-line);
-            sk_free(line);
-            line = tmp;
+            *commentptr = '\0';
         }
         
-        char sep[] = " \t";
+        char sep[] = " \t\r\n";
         
         char *keyptr = strtok(line, sep);
         if (!keyptr) {