Changeset b7ee89b for functions.c

Timestamp:

Oct 17, 2009, 6:08:15 PM (15 years ago)

Author:

Karl Ramm <kcr@1ts.org>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

6ea3890

Parents:

435001d

git-author:

Karl Ramm <kcr@1ts.org> (09/24/09 11:05:55)

git-committer:

Karl Ramm <kcr@1ts.org> (10/17/09 18:08:15)

Message:

Cleanup and use owl_getline{,_chomp} and owl_slurp

File:

• functions.c (modified) (7 diffs)

functions.c

@@ -1363 +1363 @@
   owl_fmtext fm;
   FILE *file;
-  char buff[1024];
+  char *s = NULL;
 
   file=fopen(filename, "r");
@@ -1372 +1372 @@
 
   owl_fmtext_init_null(&fm);
-  while (fgets(buff, 1024, file)) {
-    owl_fmtext_append_normal(&fm, buff);
-    /*    owl_fmtext_append_normal(&fm, "\n"); */
-  }
+  while (owl_getline(&s, file))
+    owl_fmtext_append_normal(&fm, s);
+  owl_free(s);
 
   owl_function_popless_fmtext(&fm);
@@ -2022 +2021 @@
   const char *redirect = " 2>&1 < /dev/null";
   char *newbuff;
-  char *out, buff2[1024];
-  int size;
+  char *out;
   FILE *p;
 
@@ -2041 +2039 @@
     owl_popexec_new(newbuff);
   } else {
-    p=popen(newbuff, "r");
-    out=owl_malloc(1024);
-    size=1024;
-    strcpy(out, "");
-    while (fgets(buff2, 1024, p)!=NULL) {
-      size+=1024;
-      out=owl_realloc(out, size);
-      strcat(out, buff2);
-    }
+    p = popen(newbuff, "r");
+    out = owl_slurp(p);
     pclose(p);
     
@@ -3338 +3329 @@
   char *path;
   FILE *file;
-  char buff[LINE];
+  char *s = NULL;
   int fail_silent = 0;
 
@@ -3347 +3338 @@
     path = owl_util_makepath(filename);
   }
-  file=fopen(path, "r");
+  file = fopen(path, "r");
   owl_free(path);
   if (!file) {
@@ -3355 +3346 @@
     return;
   }
-  while (fgets(buff, LINE, file)!=NULL) {
-    if (buff[0] == '\0' || buff[0] == '#') continue;
-    if (buff[strlen(buff) - 1] == '\n')
-      buff[strlen(buff) - 1] = '\0';
-    owl_function_command(buff);
-  }
+  while (owl_getline_chomp(&s, file)) {
+    if (s[0] == '\0' || s[0] == '#')
+      continue;
+    owl_function_command(s);
+  }
+
+  owl_free(s);
   fclose(file);
 }