git requires a message

diff --git a/bake.c b/bake.c
index 0116f2da16547fae6f6f47e56a6341274f926489..54ebd6b868e138ec4eef77e6f1a7ebbd9b8068d4 100644 (file)
--- a/bake.c
+++ b/bake.c
@@ -3,7 +3,7 @@
  *
  * Licensed under the GNU Public License version 3 only, see LICENSE.
  *
- * @BAKE cc -std=c89 -O2 -I. $@ -o $* $+ # @STOP
+ * @BAKE cc -std=c99 -O2 $@ -o $* $+ # @STOP
  */
 
 #define _POSIX_C_SOURCE 200809L
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #include "config.h"
@@ -42,11 +43,16 @@ typedef struct {
   char * buf;
 } string_t;
 
-const static string_t START = { 5, "@BAKE" };
-const static string_t STOP  = { 5, "@STOP" };
+typedef string_t map_t;
+
+static string_t START = { 5, "@BAKE" };
+static string_t STOP  = { 5, "@STOP" };
 
 /*** Utility functions ***/
 
+#define strneq(a,b,n) (!strncmp(a,b,n))
+#define streq(a,b) (!strcmp(a,b))
+
 static void
 swap(char * a, char * b) {
   *a ^= *b;
@@ -63,81 +69,88 @@ find(string_t x, char * buf, char * end) {
   return NULL;
 }
 
-static char *
-insert(char * new, size_t len, char * str, size_t slen, size_t offset, size_t shift) {
-  size_t max;
-  max = (slen + 1 - offset - shift);
-  memmove(str + offset + len, str + offset + shift, max);
-  memcpy(str + offset, new, len);
-  return str;
+static void
+insert(char * str, size_t slen, char * new, size_t len, size_t shift) {
+  memmove(str + len, str + shift, slen - len - shift);
+  memcpy(str, new, len);
 }
 
 /*** g_short, g_all Functions ***/
 
 #define GLOBALS_COUNT 3
 
-static char * globals[GLOBALS_COUNT];
+static string_t globals[GLOBALS_COUNT];
 
 #define g_filename globals[0]
 #define    g_short globals[1]
 #define      g_all globals[2]
 
-/* doing a ? strlen(a) : "" really bothered me and this could be optimized out */
-static size_t *
-get_globals_length(void) {
-  static size_t len[GLOBALS_COUNT];
-  size_t i;
-  for (i = 0; i < GLOBALS_COUNT; ++i) {
-    len[i] = strlen(globals[i]);
-  }
-  return len;
-}
-
-static char *
-shorten(char * fn) {
-  size_t i, last = 0, len;
-  char * sh;
-  len = strlen(fn);
-  sh = malloc(len + 1);
-  if (!sh) { return NULL; }
-  for (i = 0; i < len; ++i) {
-    if (fn[i] == '.') { last = i; }
+static string_t
+shorten(string_t s) {
+  size_t i, last = 0, len = s.len;
+  char * sh, * fn = s.buf;
+  sh = malloc(len);
+  if (sh) {
+    for (i = 0; i < len; ++i) {
+      if (fn[i] == '.') { last = i; }
+    }
+    last = last ? last : i;
+    strncpy(sh, fn, last);
+    sh[last] = '\0';
   }
-  last = last ? last : i;
-  strncpy(sh, fn, last);
-  sh[last] = '\0';
-  return sh ? sh : calloc(1,1);
+  return (string_t) { last, sh ? sh : calloc(0,0) };
 }
 
-static char *
-all_args(size_t argc, char ** argv) {
+static string_t
+all_args(int argc, char ** argv) {
   char * all = NULL;
+  size_t len = 0;
   if (argc > 2) {
-    size_t i, len = argc;
+    int i;
+    len = (size_t) argc;
 
     for (i = 2; i < argc; ++i)
     { len += strlen(argv[i]); }
 
-    all = malloc(len + 1);
-    if (!all) { return NULL; }
+    all = malloc(len);
+    if (all) {
+      all[len - 1] = '\0';
+      for (len = 0, i = 2; i < argc; ++i) {
+        strcpy(all + len, argv[i]);
+        len += strlen(argv[i]) + 1;
+        if (i + 1 < argc) { all[len - 1] = ' '; }
+      }
+    }
+  }
+  return (string_t) { len, all ? all : calloc(0,0) };
+}
 
-    all[len] = '\0';
-    for (len = 0, i = 2; i < argc; ++i) {
-      strcpy(all + len, argv[i]);
-      len += strlen(argv[i]) + 1;
-      if (i + 1 < argc) { all[len - 1] = ' '; }
+#if 0
+static string_t
+all_args(int argc, char ** argv) {
+  string_t s = (string_t) { 0, NULL };
+  if (argc > 2) {
+    size_t i;
+    for (i = (size_t) argc; i > 2; --i) {
+      s.len += strlen(argv[i]) + 1;
+    }
+    s.buf = malloc(s.len + (size_t) argc);
+    if (s.buf) {
+      size_t len;
+      s.buf[s.len - 1] = '\0';
+      for (len = 0, i = (size_t) argc; i > 2; --i) {
+        strcpy(s.buf + len, argv[i]);
+        len += strlen(argv[i]) + 1;
+        s.buf[len - 1] = ' ';
+      }
     }
   }
-  return all ? all : calloc(1,1);
+  return s;
 }
+#endif
 
 /*** Map ***/
 
-typedef struct {
-  char * str;
-  size_t len;
-} map_t;
-
 static map_t
 map(char * fn) {
   struct stat s;
@@ -149,7 +162,7 @@ map(char * fn) {
     &&   s.st_mode & S_IFREG
     &&   s.st_size) {
       m.len = (size_t) s.st_size;
-      m.str = (char *) mmap(NULL, m.len, PROT_READ, MAP_SHARED, fd, 0);
+      m.buf = (char *) mmap(NULL, m.len, PROT_READ, MAP_SHARED, fd, 0);
     }
     close(fd);
   }
@@ -158,24 +171,25 @@ map(char * fn) {
 
 /*** Important Functions ***/
 
-static char *
-find_region(map_t m, size_t * retlen) {
+static string_t
+find_region(map_t m, string_t startsym, string_t stopsym) {
   extern char * strndup(const char * s, size_t n); /* for splint */
   char * buf = NULL, * start, * stop;
+  size_t len;
 
-  start = find(START, m.str, m.str + m.len);
+  start = find(startsym, m.buf, m.buf + m.len);
 
   if (start) {
-    start += START.len;
+    start += startsym.len;
 
 #ifdef REQUIRE_SPACE
     if (!isspace(*start)) {
-      fprintf(stderr, RED "%s" RESET ": Found start without suffix spacing.\n", g_filename);
-      return buf;
+      fprintf(stderr, RED "%s" RESET ": Found start without suffix spacing.\n", g_filename.buf);
+      return (string_t) { 0 , buf };
     }
 #endif /* REQUIRE_SPACE */
 
-    stop = find(STOP, start, start + m.len - (start - m.str));
+    stop = find(stopsym, start, start + m.len - (start - m.buf));
 
     if (!stop) {
       stop = start;
@@ -188,18 +202,29 @@ find_region(map_t m, size_t * retlen) {
 
     if (stop)
     {
-      *retlen = (size_t) (stop - m.str) - (start - m.str);
-      buf = strndup(start, *retlen);
+      len = (size_t) (stop - m.buf) - (start - m.buf);
+      buf = strndup(start, len);
     }
   }
-  return buf;
+  return (string_t) { len, buf };
+}
+
+static string_t
+file_find_region(char * fn, string_t start, string_t stop) {
+  string_t s = { 0, NULL };
+  map_t m = map(fn);
+  if (m.buf) {
+    s = find_region(m, start, stop);
+    munmap(m.buf, m.len);
+  }
+  return s;
 }
 
 static int
-root(char ** rootp) {
+root(string_t s) {
   char x[1] = {'\0'};
-  char * root = *rootp;
-  size_t len = strlen(root);
+  char * root = s.buf;
+  size_t len = s.len;
   int ret;
 
   while (len && root[len] != '/')
@@ -211,130 +236,131 @@ root(char ** rootp) {
   ret = chdir(root);
   swap(root + len, x);
 
-  *rootp += len + 1;
+/* *rootp += len + 1; */
   return ret;
 }
 
 #define ARRLEN(x) (sizeof(x) / sizeof(x[0]))
 
-static char *
-expand(char * buf, size_t len) {
+static string_t
+expand(string_t s) {
   enum {
     MACRO_FILENAME = 0,
     MACRO_SHORT    = 1,
     MACRO_ARGS     = 2,
   };
 
-  char *macro[] = {
-    [MACRO_FILENAME] = "$@",
-    [MACRO_SHORT   ] = "$*",
-    [MACRO_ARGS    ] = "$+",
-  };
-
-  size_t macro_length[] = {
-    [MACRO_FILENAME] = 2,
-    [MACRO_SHORT   ] = 2,
-    [MACRO_ARGS    ] = 2,
+  string_t macro[] = {
+    [MACRO_FILENAME] = { 2, "$@" },
+    [MACRO_SHORT   ] = { 2, "$*" },
+    [MACRO_ARGS    ] = { 2, "$+" },
   };
 
-  size_t * globals_length = get_globals_length();
-
-  char * ptr;
   size_t i, f;
 
   {
-    size_t max = len + 1;
-    for (i = 0; i < len; ++i) {
+    size_t max = s.len;
+    for (i = 0; i < s.len; ++i) {
       for (f = 0; f < ARRLEN(macro); ++f) {
-        if (!strncmp(buf + i, macro[f], macro_length[f])) {
-          max += globals_length[f];
+        if (!strncmp(s.buf + i, macro[f].buf, macro[f].len)) {
+          max += globals[f].len;
         }
       }
     }
-    buf = realloc(buf, max + 10);
-    len = max - 1;
+    s.buf = realloc(s.buf, max + 27); /* I don't know, man */
+    if (!s.buf) { return (string_t) { 0, NULL}; }
+    memset(s.buf + s.len, 0, max - s.len);
+    s.len = max;
   }
-  for (i = 0; i < len; ++i) {
+  for (i = 0; i < s.len; ++i) {
     for (f = 0; f < ARRLEN(macro); ++f) {
-      if (!strncmp(buf + i, macro[f], macro_length[f])) {
-        buf = insert(globals[f], globals_length[f], buf, len, i, 2);
+      if (!strncmp(s.buf + i, macro[f].buf, macro[f].len)) {
+        insert(s.buf + i, s.len - i, globals[f].buf, globals[f].len, 2);
       }
     }
   }
-  return buf;
+  return s;
 }
 
 /* Strips all prefixing and leading whitespace.
  * Except if the last character beforehand is a newline. */
 static size_t
-strip(char * buf) {
-  size_t i = strlen(buf);
+strip(string_t s) {
+  size_t i = s.len;
 
   if (!i)
   { return 0; }
 
-  while (isspace(buf[i - 1]))
+  while (isspace(s.buf[i]))
   { --i; }
 
-  buf[i] = '\0';
-  for (i = 0; isspace(buf[i]); ++i);
+  s.buf[i] = '\0';
+  for (i = 0; isspace(s.buf[i]); ++i);
 
-  return i - (buf[i - 1] == '\n');
+  return i - (s.buf[i - 1] == '\n');
 }
 
 static int
 run(char * buf) {
+  int ret = 127;
   fputs(GREEN "output" RESET ":\n", stderr);
-  return system(buf);
+  pid_t pid = fork();
+  if (!pid) {
+    execl("/bin/sh", "-c", "'ls bake.c'", NULL);
+  } else {
+    int status;
+    waitpid(pid, &status, 0);
+    if (!WIFEXITED(status)) { ret = 126; }
+    else { ret = WEXITSTATUS(status); }
+  }
+  return ret;
 }
 
 int
 main(int argc, char ** argv) {
   int ret = 0;
-  char * buf = NULL;
-  size_t len;
+  string_t s = { 0, NULL };
 
   if (argc < 2
-  ||  !strcmp(argv[1], "-h")
-  ||  !strcmp(argv[1], "--help"))
+  ||  streq(argv[1], "-h")
+  ||  streq(argv[1], "--help"))
   { goto help; }
 
-  g_filename = argv[1];
+  g_filename = (string_t) { strlen(argv[1]), argv[1] };
 
-  if (!strcmp(argv[1], "-n")
-  ||  !strcmp(argv[1], "--dry-run")) {
-    if (argc > 2) { ret = 1; g_filename = argv[2]; }
+  if (streq(argv[1], "-n")
+  ||  streq(argv[1], "--dry-run")) {
+    if (argc > 2) {
+      ret = 1;
+      g_filename = (string_t) { strlen(argv[2]), argv[2] };
+    }
     else { goto help; }
   }
 
-  { map_t m = map(g_filename);
-    if (m.str) {
-      buf = find_region(m, &len);
-      munmap(m.str, m.len);
-    }
-  }
+  s = file_find_region(g_filename.buf, START, STOP);
 
-  if (!buf) {
+  if (!s.buf) {
     if (errno)
-    { fprintf(stderr, BOLD RED "%s" RESET ": %s\n", g_filename, strerror(errno)); }
+    { fprintf(stderr, BOLD RED "%s" RESET ": %s\n", g_filename.buf, strerror(errno)); }
     else
-    { fprintf(stderr, BOLD RED "%s" RESET ": File unrecognized.\n", g_filename); }
+    { fprintf(stderr, BOLD RED "%s" RESET ": File unrecognized.\n", g_filename.buf); }
     return 1;
   }
 
-  g_all = all_args((size_t) argc, argv);
+  g_all = all_args(argc, argv);
   g_short = shorten(g_filename);
-  root(&g_filename);
-  buf = expand(buf, len);
-  free(g_short); free(g_all);
-  if (!buf) { return 1; }
+  root(g_filename);
+
+  s = expand(s);
+  free(g_short.buf); free(g_all.buf);
+  if (!s.buf) { return 1; }
 
-  fprintf(stderr, GREEN "%s" RESET ": %s\n", argv[0], buf + strip(buf));
-  ret = ret ? 0 : run(buf);
+  fprintf(stderr, GREEN "%s" RESET ": %s\n", argv[0], s.buf + strip(s));
+  ret = ret ? 0 : run(s.buf);
   if (ret)
-  { fprintf(stderr, RED "result" RESET ": " BOLD "%d\n" RESET, ret); }
+  { fprintf(stderr, RED "result" RESET ": " BOLD "%d, %s\n" RESET, errno, strerror(errno)); }
 
-  free(buf);
+  free(s.buf);
   return ret;
 help:
   fprintf(stderr, YELLOW "%s" RESET ": %s", argv[0], HELP DESC);

diff --git a/config.h b/config.h
index ac0d3fb476d44275f297469bb47bea3a5d2a4144..ae744d30ab58bcd48743a5fe3480c7be7c6dd28f 100644 (file)
--- a/config.h
+++ b/config.h
@@ -4,12 +4,12 @@
 #define ENABLE_COLOR
 
 #ifdef ENABLE_COLOR
-# define    RED "\e[91m"
-# define  GREEN "\e[92m"
-# define YELLOW "\e[93m"
-# define    DIM "\e[2m"
-# define   BOLD "\e[1m"
-# define  RESET "\e[0m"
+# define    RED "\033[91m"
+# define  GREEN "\033[92m"
+# define YELLOW "\033[93m"
+# define    DIM "\033[2m"
+# define   BOLD "\033[1m"
+# define  RESET "\033[0m"
 #else
 # define    RED
 # define  GREEN