fix code

diff --git a/appli.c b/appli.c
index 9020aada56c1a76b316fb15790b810617e3c1012..aa1245ef816f4bb89612ebb59ad85d66dbe1cccc 100644 (file)
--- a/appli.c
+++ b/appli.c
@@ -2,10 +2,7 @@
 /* cflags: */
 /* linker: cmd.o tui.o -lpdcurses */
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "cmd.h"
 #include "tui.h"

diff --git a/cmd.c b/cmd.c
index c8c95314b16e5e330ff748cf787d5f4f2b56792e..66cedd9e4e32e89d34ee88d9a0c26dcf07919175 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -1,13 +1,12 @@
-//#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "cmd.h"
 
 #define BUFFERSIZE 4096
 
-static char *_load_file (FILE *fd)
+static char *_read_stream (FILE *sd)
 {
     char *buffer = NULL;
     size_t size = 0;
@@ -15,8 +14,8 @@ static char *_load_file (FILE *fd)
         size += BUFFERSIZE + (size == 0);
         buffer = (char *) realloc (buffer, size);
         memset (buffer + size - BUFFERSIZE - 1, 0, BUFFERSIZE + 1);
-        fread (buffer + size - BUFFERSIZE - 1, 1, BUFFERSIZE, fp);
-    } while (!feof (fp));
+        fread (buffer + size - BUFFERSIZE - 1, 1, BUFFERSIZE, sd);
+    } while (!feof (sd));
 
     return buffer;
 }
@@ -28,7 +27,7 @@ char *exec_cmd (char *cmd)
 
     FILE *fp = popen (cmd, "r");
     if (fp != NULL) {
-        buffer = _load_file (fp);
+        buffer = _read_stream (fp);
         status = pclose(fp);
     }
 
@@ -40,14 +39,14 @@ char *exec_cmd (char *cmd)
     return buffer;
 }
 
-char *load_cmd (char *name)
+char *load_file (char *name)
 {
     int status = -1;
     char *buffer = NULL;
 
     FILE *fd = fopen (name, "r");
     if (fd != NULL) {
-        buffer = _load_file (fd);
+        buffer = _read_stream (fd);
         status = fclose (fd);
     }
 
@@ -61,10 +60,9 @@ char *load_cmd (char *name)
 
 char *read_stdin (void)
 {
-    int status = -1;
     char *buffer = NULL;
 
-    buffer = _load_file (stdin);
+    buffer = _read_stream (stdin);
 
     return buffer;
 }
@@ -102,10 +100,9 @@ char **split_lines (char *buffer, int max)
 void free_lines (char **lines)
 {
     int i = 0;
+
     while (lines[i]) {
         free (lines[i++]);
     }
     free (lines);
-
-    return rc;
 }