From 187649de817b618c967d234f0707008e90e52504 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Wed, 10 Feb 2016 23:06:12 -0600
Subject: [PATCH] Don't include toys.h from config2help.c (so cross-compiling
 from systems we don't run on is easier), and use HELP_ instead of help_ for
 macro prefixes to avoid name collisions (such as help_exit() the function).

---
 lib/help.c            |  2 +-
 scripts/config2help.c | 30 +++++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/lib/help.c b/lib/help.c
index 29965043..9ff575bc 100644
--- a/lib/help.c
+++ b/lib/help.c
@@ -9,7 +9,7 @@ void show_help(FILE *out) {;}
 
 #undef NEWTOY
 #undef OLDTOY
-#define NEWTOY(name,opt,flags) help_##name "\0"
+#define NEWTOY(name,opt,flags) HELP_##name "\0"
 #define OLDTOY(name,oldname,flags) "\xff" #oldname "\0"
 static char *help_data =
 #include "generated/newtoys.h"
diff --git a/scripts/config2help.c b/scripts/config2help.c
index f3bb8c3f..7bc3badd 100644
--- a/scripts/config2help.c
+++ b/scripts/config2help.c
@@ -1,11 +1,24 @@
-#include "toys.h"
-
-// Humor toys.h
-struct toy_context toys;
-char libbuf[4096], toybuf[4096];
+//#include "toys.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <regex.h>
+#include <inttypes.h>
+#include <termios.h>
+#include <poll.h>
+struct statvfs {int i;};
+#include "lib/portability.h"
+#include "lib/lib.h"
+
+// Humor toys.h (lie through our teeth, C's linker doesn't care).
+char toys[4096], libbuf[4096], toybuf[4096];
 void show_help(FILE *out) {;}
 void toy_exec(char *argv[]) {;}
-void toy_init(struct toy_list *which, char *argv[]) {;}
+void toy_init(void *which, char *argv[]) {;}
 
 // Parse config files into data structures.
 
@@ -16,6 +29,7 @@ struct symbol {
   struct double_list *help;
 } *sym;
 
+// remove leading spaces
 char *trim(char *s)
 {
   while (isspace(*s)) s++;
@@ -23,6 +37,7 @@ char *trim(char *s)
   return s;
 }
 
+// if line starts with name (as whole word) return pointer after it, else NULL
 char *keyword(char *name, char *line)
 {
   int len = strlen(name);
@@ -36,6 +51,7 @@ char *keyword(char *name, char *line)
   return line;
 }
 
+// dlist_pop() freeing wrapper structure for you.
 char *dlist_zap(struct double_list **help)
 {
   struct double_list *dd = dlist_pop(help);
@@ -366,7 +382,7 @@ int main(int argc, char *argv[])
       char *s = xstrdup(sym->name);
 
       for (i = 0; s[i]; i++) s[i] = tolower(s[i]);
-      printf("#define help_%s \"", s);
+      printf("#define HELP_%s \"", s);
       free(s);
 
       dd = sym->help;
-- 
2.39.2