[PATCH] Make pk_cmd_exec_script suck less

[John Darrington]

        * src/pk-cmd.c (pk_cmd_exec_script): Use getline instead of a loop and 
getc.
---
 ChangeLog    |  5 +++++
 src/pk-cmd.c | 41 ++++++++++++++---------------------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc5d2d2..73f5e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2019-11-24 John Darrington <address@hidden>
 
+       * src/pk-cmd.c (pk_cmd_exec_script): Use getline instead
+       of a loop and getc.
+
+2019-11-24 John Darrington <address@hidden>
+
             * src/pk-file (pk_file_readable): New function.
             (pk_cmd_load_file): Use it to check files before
             opening.
diff --git a/src/pk-cmd.c b/src/pk-cmd.c
index 74d5cf0..bc0be69 100644
--- a/src/pk-cmd.c
+++ b/src/pk-cmd.c
@@ -667,7 +667,6 @@ pk_cmd_exec (char *str)
 int
 pk_cmd_exec_script (const char *filename)
 {
-  int is_eof;
   FILE *fd = fopen (filename, "r");
 
   if (fd == NULL)
@@ -680,39 +679,25 @@ pk_cmd_exec_script (const char *filename)
      starting with the '#' character are comments, and ignored.
      Likewise, empty lines are also ignored.  */
 
-  is_eof = 0;
+  char *line = NULL;
+  size_t line_len = 0;
   while (1)
     {
-      size_t i;
       int ret;
-#define MAX_LINE 1025
-      char line[MAX_LINE]; /* XXX: yes this sucks.  */
-
-      if (is_eof)
-        break;
 
       /* Read a line from the file.  */
-      i = 0;
-      while (1)
-        {
-          int c = fgetc (fd);
+      errno = 0;
+      ssize_t n = getline (&line, &line_len, fd);
 
-          assert (i < MAX_LINE);
+      if (n == -1)
+       {
+         if (errno != 0)
+           perror (filename);
+         break;
+       }
 
-          if (c == EOF)
-            {
-              line[i] = '\0';
-              is_eof = 1;
-              break;
-            }
-          else if ((char)c == '\n')
-            {
-              line[i] = '\0';
-              break;
-            }
-          else
-            line[i++] = (char)c;
-        }
+      if (line[n - 1] == '\n')
+       line[n - 1] = '\0';
 
       /* If the line is empty, or it starts with '#', or it contains
          just blank characters, just ignore it.  */
@@ -733,10 +718,12 @@ pk_cmd_exec_script (const char *filename)
         goto error;
     }
 
+  free (line);
   fclose (fd);
   return 0;
 
  error:
+  free (line);
   fclose (fd);
   return 1;
 }
-- 
2.11.0