Move main loop and curses init to view

[lackey] / src / util.c

diff --git a/src/util.c b/src/util.c
index 420dbd56dd99b7279bcd0f21639859d2981c30e4..1ebecfc02dae764fead047a08765eecbc4c0e3ca 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2012-2013 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,22 +15,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE_EXTENDED
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
-#include <ncurses.h>
 
 #include "date.h"
 #include "cal.h"
 #include "view.h"
 #include "util.h"
 
-/* For testing */
-#pragma weak COMPACT
+#pragma weak view_debug
 
 /* Static data */
 static FILE *debug_fd = NULL;
 
+/* View debugging */
+extern void view_debug(const char *fmt, va_list ap);
+
 /* Helper functions */
 static void message(FILE *output_fd, const char *prefix, const char *fmt, va_list ap)
 {
@@ -42,6 +47,7 @@ static void message(FILE *output_fd, const char *prefix, const char *fmt, va_lis
                fprintf(output_fd, "%s: ", prefix);
                vfprintf(output_fd, fmt, tmp);
                fprintf(output_fd, "\n");
+               fflush(output_fd);
        }
 
        /* Log to debug file */
@@ -50,20 +56,13 @@ static void message(FILE *output_fd, const char *prefix, const char *fmt, va_lis
                fprintf(debug_fd, "%s: ", prefix);
                vfprintf(debug_fd, fmt, tmp);
                fprintf(debug_fd, "\n");
+               fflush(debug_fd);
        }
 
        /* Log to status bar */
-       if (&COMPACT && stdscr) {
-               int rev = COMPACT ? A_BOLD : 0;
+       if (&view_debug) {
                va_copy(tmp, ap);
-               if (!COMPACT)
-                       mvhline(LINES-2, 0, ACS_HLINE, COLS);
-               move(LINES-1, 0);
-               attron(COLOR_PAIR(COLOR_ERROR) | rev);
-               vwprintw(stdscr, fmt, tmp);
-               attroff(COLOR_PAIR(COLOR_ERROR) | rev);
-               if (!COMPACT)
-                       clrtoeol();
+               view_debug(fmt, tmp);
        }
 }
 
@@ -81,6 +80,22 @@ void strsub(char *str, char find, char repl)
                        *cur = repl;
 }
 
+char *strcopy(const char *str)
+{
+       if (str == NULL)
+               return NULL;
+       return strdup(str);
+}
+
+int match(const char *a, const char *b)
+{
+       if (a == b)
+               return 1;
+       if (!a || !b)
+               return 0;
+       return !strcmp(a, b);
+}
+
 /* Memory functions */
 void *alloc0(int size)
 {
@@ -90,6 +105,39 @@ void *alloc0(int size)
        return data;
 }
 
+/* File functions */
+char *read_file(const char *path, int *len)
+{
+       /* we could use stat, but we'll try to be portable */
+       FILE *fd = fopen(path, "rt+");
+       if (!fd)
+               return NULL;
+
+       int   block = 512; // read size
+       int   size  = 512; // buffer size
+       int   slen  = 0;   // string length
+       char *buf   = malloc(size);
+       if (!buf)
+               goto err;
+
+       while (!feof(fd)) {
+               if (slen + block + 1 > size) {
+                       size *= 2;
+                       buf   = realloc(buf, size);
+                       if (!buf)
+                               goto err;
+               }
+               slen += fread(&buf[slen], 1, block, fd);
+               buf[slen] = '\0';
+       }
+
+err:
+       if (len)
+               *len = slen;
+       fclose(fd);
+       return buf;
+}
+
 /* Debugging functions */
 void debug(char *fmt, ...)
 {
@@ -107,9 +155,6 @@ void error(char *fmt, ...)
        fflush(stderr);
        message(stderr, "error", fmt, ap);
        va_end(ap);
-       if (stdscr) {
-               getch();
-               endwin();
-       }
+       view_exit();
        exit(-1);
 }