buildup to an improved improved bake

install.sh

@@ -4,7 +4,7 @@
 TARGET=${TARGET:-/usr/local}
 INSTALL=${INSTALL:-bake shake}
 
-cd $(dirname "$(readlink -f "$0")")
+cd $(dirname "$(readlink -f "$0")")/src
 chmod +x shake
 
 ./shake bake.c -s $@ && \

source/bake.c

@@ -1,7 +1,5 @@
 /* @BAKE cc -std=c99 -O2 -Wall -Wextra -Wpedantic -Wno-implicit-fallthrough -o @SHORT @FILENAME @ARGS @STOP */
-/* @BAKE cc -std=c99 -O2 -Wall -Wextra -Wpedantic -Wno-implicit-fallthrough -o '@{\} @{\}@SHORT\}}' @FILENAME @ARGS @STOP */
+/* @BAKE cc -std=c99 -O2 -Wall -Wextra -Wpedantic -Wno-implicit-fallthrough -o @SHORT $+ @STOP */
-/* @BAKE cc -std=c99 -O2 -Wall -Wextra -Wpedantic -Wno-implicit-fallthrough -o '@{\}}' @FILENAME @ARGS @STOP */
-/* @BAKE cc -std=c99 -O2 -Wall -Wextra -Wpedantic -Wno-implicit-fallthrough -o '@{a}' @FILENAME @ARGS @STOP */
 #define _GNU_SOURCE
 
 #include <ctype.h>
@@ -364,6 +362,7 @@ int main (int argc, char ** argv) {
   if (!WIFEXITED (run)) {
     return 1;
   }
+
   return WEXITSTATUS (run);
 }
 

source/bake2.c

@@ -0,0 +1,192 @@
+/* @BAKE cc -I. -std=c99 -O2 -Wall -Wextra -Wpedantic -Wno-parentheses -Wno-implicit-fallthrough -o @SHORT sds.c @FILENAME @ARGS @STOP */
+#define _GNU_SOURCE
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include <sds.h>
+
+#define ARRLEN(x) (sizeof (x) / sizeof (x [0]))
+
+#define START "@" "BAKE" " "
+#define STOP  "@" "STOP"
+
+#define ENABLE_COLOR 1
+
+#include "color.h"
+
+static int map(char * filename, char ** buffer, size_t * buffer_length) {
+  int err = 0, fd = open(filename, O_RDONLY);
+  if (fd != -1) {
+    struct stat s;
+    if (!fstat(fd, &s) && s.st_mode & S_IFREG && s.st_size) {
+      *buffer_length = (size_t) s.st_size;
+      *buffer = (char *) mmap(NULL, s.st_size, PROT_READ, MAP_SHARED, fd, 0);
+    } else {
+      err = 1;
+    }
+    close(fd);
+  }
+  return err;
+}
+
+void root(const char * filename) {
+  char * string = strdupa(filename), * terminator = strrchr(string, '/');
+  if (terminator) {
+    terminator = '\0';
+    chdir(string);
+  }
+}
+
+void err(char * msg) { fprintf(stderr, "%s\n", msg); abort(); }
+
+void help(void) { abort(); }
+
+
+void selection_list(char * buffer, size_t buffer_length, sds ** rlist, size_t * rlist_length) {
+  sds * list = malloc(0);
+  size_t list_length = 0;
+
+  char * search = buffer;
+  char * start;
+  while (start = memmem(search, buffer_length, START, strlen(START))) {
+    buffer_length -= start - buffer + strlen(START);
+    search = start + strlen(START);
+    char * end = memmem(search, buffer_length, STOP, strlen(STOP));
+    if (!end) { end = memchr(search, '\n', buffer_length);}
+    if (start && end) {
+      list = realloc(list, ++list_length * sizeof(sds));
+      list[list_length-1] = sdsnewlen(start,end-start);
+    }
+  }
+
+  *rlist = list;
+  *rlist_length = list_length;
+}
+
+int main(int argc, char ** argv) {
+  char * filename = NULL;
+  int run = 1, select = 0, olist = 0;
+
+  for (int off = 1; off < argc; ++off) {
+    if (argv [off][0] != '-') { filename = argv [off]; ++off; break; }
+    if (argv [off][1] != '-') {
+      while (*(++argv [off]))
+      switch (argv [off][0]) {
+      select:  case 's':
+        select = atoi(argv [off] + 1);
+        if (!select) {
+          ++off;
+          if (off >= argc) { help(); }
+          select = atoi(argv [off]);
+        }
+        if (select) { goto next; }
+      default: case 'h': help();
+               case 'l': olist = 1;
+               case 'n': run = 0;   break;
+               /* case 'c': color = 0; break; */
+               /* case 'x': ex = 1; break; */
+               case 'q': fclose(stderr); fclose(stdout); break;
+      }
+      continue;
+    }
+    argv[off] += 2;
+         if (strcmp(argv[off],  "select") == 0) { goto select; }
+    else if (strcmp(argv[off],    "list") == 0) { olist = 1; run = 0; }
+    else if (strcmp(argv[off], "dry-run") == 0) { run = 0; }
+    /* else if (strcmp(argv[off],   "color") == 0) { color = 0; } */
+    /* else if (strcmp(argv[off], "expunge") == 0) { ex = 1; } */
+    else if (strcmp(argv[off],   "quiet") == 0) { fclose(stderr); fclose(stdout); }
+    else if (strcmp(argv[off],    "help") == 0) { help(); }
+  next:;
+  }
+
+  if (argc == 1 || !filename) { help(); }
+
+  root(filename);
+
+  char * buffer = NULL;
+  size_t buffer_length = 0;
+
+  if (map(filename, &buffer, &buffer_length) || !buffer) { err("Could not access file"); }
+
+  /* select */
+  sds * list;
+  size_t list_length;
+  selection_list(buffer, buffer_length, &list, &list_length);
+
+  if (olist) {
+    for (size_t i = 0; i < list_length; ++i) {
+      printf("%s\n", list[i]);
+  }}
+
+  for (size_t i = 0; i < list_length; ++i) {
+    if (olist || (size_t) select != i) { sdsfree(list[i]); }
+  }
+
+  sds command = list[select];
+  free(list);
+
+  if (olist) { return 0; }
+
+  /* expand */
+
+  char * macro [] = {
+    "$*",
+    "$+",
+    "$@",
+    "@ARGS",
+    "@FILE",
+    "@FILENAME",
+    "@LINE"
+    "@SHORT",
+  };
+
+  char * search;
+  size_t search_length = sdslen(command);
+  for (size_t i = 0; i < ARRLEN(macro); ++i) {
+    search = command;
+    while (search = memmem(search, search_length, macro[i], strlen(macro[i]))) {
+      search += strlen(macro[i]);
+      printf("Found %s\n", macro[i]);
+    }
+  }
+
+  /* execute */
+  printf("command: '%s'\n", command);
+  sdsfree(command);
+
+  if (!run) { return 0; }
+
+  fprintf (stderr, GREEN "output" RESET ":\n");
+
+  pid_t pid;
+  if ((pid = fork ()) == 0) {
+    execl ("/bin/sh", "sh", "-c", command, NULL);
+    return 0; /* execl overwrites the process anyways */
+  }
+
+  if (pid == -1) {
+    fprintf (stderr, GREEN "%s" RESET ": %s, %s\n", argv [0], "Fork Error", strerror (errno));
+    return 1;
+  }
+
+  /* reuse of run as status return */
+  if (waitpid (pid, &run, 0) < 0) {
+    fprintf (stderr, GREEN "%s" RESET ": " RED "%s" RESET ", %s\n", argv [0], "Wait PID Error", strerror (errno));
+    return 1;
+  }
+
+  if (!WIFEXITED (run)) {
+    return 1;
+  }
+
+  return WEXITSTATUS (run);
+}

source/color.h

@@ -0,0 +1,56 @@
+/* static int color = ENABLE_COLOR; */
+
+#if ENABLE_COLOR
+# define    RED "\033[91m"
+# define  GREEN "\033[92m"
+# define YELLOW "\033[93m"
+# define   BOLD "\033[1m"
+# define  RESET "\033[0m"
+#else
+# define    RED
+# define  GREEN
+# define YELLOW
+# define   BOLD
+# define  RESET
+#endif
+
+#if 0
+
+# define color_printf(...) color_fprintf (stdout, __VA_ARGS__)
+/* not perfect, too simple, doesn't work with a var, only a literal. */
+# define color_fputs(fp, msg) color_fprintf (fp, msg "\n")
+# define color_puts(msg) color_fputs (stdout, msg)
+
+static void
+color_fprintf (FILE * fp, char * format, ...) {
+  va_list ap;
+  char * buf;
+
+  va_start (ap, format);
+
+  if (color) {
+    vfprintf (fp, format, ap);
+    va_end (ap);
+    return;
+  }
+  vasprintf (&buf, format, ap);
+
+  if (buf) {
+    /* char * expanded, * colors [] = { */
+      /* YELLOW, "", */
+      /* GREEN,  "", */
+      /* RED,    "", */
+      /* BOLD,   "", */
+      /* RESET,  "" */
+    /* }; */
+    /* size_t count = ARRLEN (colors); */
+    /* expanded = expand (buf, strlen (buf), colors, count - 2); */
+    /* expanded = expand (expanded, strlen (buf), colors + count - 2, 2); */
+    /* fwrite (expanded, strlen (expanded), 1, fp); */
+  }
+
+  free (buf);
+  va_end (ap);
+}
+
+#endif

source/sds.h

@@ -0,0 +1,274 @@
+/* SDSLib 2.0 -- A C dynamic strings library
+ *
+ * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2015, Oran Agra
+ * Copyright (c) 2015, Redis Labs, Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __SDS_H
+#define __SDS_H
+
+#define SDS_MAX_PREALLOC (1024*1024)
+extern const char *SDS_NOINIT;
+
+#include <sys/types.h>
+#include <stdarg.h>
+#include <stdint.h>
+
+typedef char *sds;
+
+/* Note: sdshdr5 is never used, we just access the flags byte directly.
+ * However is here to document the layout of type 5 SDS strings. */
+struct __attribute__ ((__packed__)) sdshdr5 {
+    unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr8 {
+    uint8_t len; /* used */
+    uint8_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr16 {
+    uint16_t len; /* used */
+    uint16_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr32 {
+    uint32_t len; /* used */
+    uint32_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr64 {
+    uint64_t len; /* used */
+    uint64_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+
+#define SDS_TYPE_5  0
+#define SDS_TYPE_8  1
+#define SDS_TYPE_16 2
+#define SDS_TYPE_32 3
+#define SDS_TYPE_64 4
+#define SDS_TYPE_MASK 7
+#define SDS_TYPE_BITS 3
+#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (void*)((s)-(sizeof(struct sdshdr##T)));
+#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
+#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
+
+static inline size_t sdslen(const sds s) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            return SDS_TYPE_5_LEN(flags);
+        case SDS_TYPE_8:
+            return SDS_HDR(8,s)->len;
+        case SDS_TYPE_16:
+            return SDS_HDR(16,s)->len;
+        case SDS_TYPE_32:
+            return SDS_HDR(32,s)->len;
+        case SDS_TYPE_64:
+            return SDS_HDR(64,s)->len;
+    }
+    return 0;
+}
+
+static inline size_t sdsavail(const sds s) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5: {
+            return 0;
+        }
+        case SDS_TYPE_8: {
+            SDS_HDR_VAR(8,s);
+            return sh->alloc - sh->len;
+        }
+        case SDS_TYPE_16: {
+            SDS_HDR_VAR(16,s);
+            return sh->alloc - sh->len;
+        }
+        case SDS_TYPE_32: {
+            SDS_HDR_VAR(32,s);
+            return sh->alloc - sh->len;
+        }
+        case SDS_TYPE_64: {
+            SDS_HDR_VAR(64,s);
+            return sh->alloc - sh->len;
+        }
+    }
+    return 0;
+}
+
+static inline void sdssetlen(sds s, size_t newlen) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            {
+                unsigned char *fp = ((unsigned char*)s)-1;
+                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
+            }
+            break;
+        case SDS_TYPE_8:
+            SDS_HDR(8,s)->len = newlen;
+            break;
+        case SDS_TYPE_16:
+            SDS_HDR(16,s)->len = newlen;
+            break;
+        case SDS_TYPE_32:
+            SDS_HDR(32,s)->len = newlen;
+            break;
+        case SDS_TYPE_64:
+            SDS_HDR(64,s)->len = newlen;
+            break;
+    }
+}
+
+static inline void sdsinclen(sds s, size_t inc) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            {
+                unsigned char *fp = ((unsigned char*)s)-1;
+                unsigned char newlen = SDS_TYPE_5_LEN(flags)+inc;
+                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
+            }
+            break;
+        case SDS_TYPE_8:
+            SDS_HDR(8,s)->len += inc;
+            break;
+        case SDS_TYPE_16:
+            SDS_HDR(16,s)->len += inc;
+            break;
+        case SDS_TYPE_32:
+            SDS_HDR(32,s)->len += inc;
+            break;
+        case SDS_TYPE_64:
+            SDS_HDR(64,s)->len += inc;
+            break;
+    }
+}
+
+/* sdsalloc() = sdsavail() + sdslen() */
+static inline size_t sdsalloc(const sds s) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            return SDS_TYPE_5_LEN(flags);
+        case SDS_TYPE_8:
+            return SDS_HDR(8,s)->alloc;
+        case SDS_TYPE_16:
+            return SDS_HDR(16,s)->alloc;
+        case SDS_TYPE_32:
+            return SDS_HDR(32,s)->alloc;
+        case SDS_TYPE_64:
+            return SDS_HDR(64,s)->alloc;
+    }
+    return 0;
+}
+
+static inline void sdssetalloc(sds s, size_t newlen) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            /* Nothing to do, this type has no total allocation info. */
+            break;
+        case SDS_TYPE_8:
+            SDS_HDR(8,s)->alloc = newlen;
+            break;
+        case SDS_TYPE_16:
+            SDS_HDR(16,s)->alloc = newlen;
+            break;
+        case SDS_TYPE_32:
+            SDS_HDR(32,s)->alloc = newlen;
+            break;
+        case SDS_TYPE_64:
+            SDS_HDR(64,s)->alloc = newlen;
+            break;
+    }
+}
+
+sds sdsnewlen(const void *init, size_t initlen);
+sds sdsnew(const char *init);
+sds sdsempty(void);
+sds sdsdup(const sds s);
+void sdsfree(sds s);
+sds sdsgrowzero(sds s, size_t len);
+sds sdscatlen(sds s, const void *t, size_t len);
+sds sdscat(sds s, const char *t);
+sds sdscatsds(sds s, const sds t);
+sds sdscpylen(sds s, const char *t, size_t len);
+sds sdscpy(sds s, const char *t);
+
+sds sdscatvprintf(sds s, const char *fmt, va_list ap);
+#ifdef __GNUC__
+sds sdscatprintf(sds s, const char *fmt, ...)
+    __attribute__((format(printf, 2, 3)));
+#else
+sds sdscatprintf(sds s, const char *fmt, ...);
+#endif
+
+sds sdscatfmt(sds s, char const *fmt, ...);
+sds sdstrim(sds s, const char *cset);
+void sdsrange(sds s, ssize_t start, ssize_t end);
+void sdsupdatelen(sds s);
+void sdsclear(sds s);
+int sdscmp(const sds s1, const sds s2);
+sds *sdssplitlen(const char *s, ssize_t len, const char *sep, int seplen, int *count);
+void sdsfreesplitres(sds *tokens, int count);
+void sdstolower(sds s);
+void sdstoupper(sds s);
+sds sdsfromlonglong(long long value);
+sds sdscatrepr(sds s, const char *p, size_t len);
+sds *sdssplitargs(const char *line, int *argc);
+sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
+sds sdsjoin(char **argv, int argc, char *sep);
+sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
+
+/* Low level functions exposed to the user API */
+sds sdsMakeRoomFor(sds s, size_t addlen);
+void sdsIncrLen(sds s, ssize_t incr);
+sds sdsRemoveFreeSpace(sds s);
+size_t sdsAllocSize(sds s);
+void *sdsAllocPtr(sds s);
+
+/* Export the allocator used by SDS to the program using SDS.
+ * Sometimes the program SDS is linked to, may use a different set of
+ * allocators, but may want to allocate or free things that SDS will
+ * respectively free or allocate. */
+void *sds_malloc(size_t size);
+void *sds_realloc(void *ptr, size_t size);
+void sds_free(void *ptr);
+
+#ifdef REDIS_TEST
+int sdsTest(int argc, char *argv[]);
+#endif
+
+#endif

source/sdsalloc.h

@@ -0,0 +1,42 @@
+/* SDSLib 2.0 -- A C dynamic strings library
+ *
+ * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2015, Oran Agra
+ * Copyright (c) 2015, Redis Labs, Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* SDS allocator selection.
+ *
+ * This file is used in order to change the SDS allocator at compile time.
+ * Just define the following defines to what you want to use. Also add
+ * the include of your alternate allocator if needed (not needed in order
+ * to use the default libc allocator). */
+
+#define s_malloc malloc
+#define s_realloc realloc
+#define s_free free