aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2018-08-03 16:09:57 -0500
committerRob Landley <rob@landley.net>2018-08-03 16:09:57 -0500
commitb51fcf8e7946aa3a059634804bd426f1b6fab571 (patch)
tree8d9020572257289c98277f96aecc9097f4f1c8fa
parent7335fe79284725ef6356d14f39db3539b28f52b1 (diff)
downloadtoybox-b51fcf8e7946aa3a059634804bd426f1b6fab571.tar.gz
Don't include toys.h and lib/*.c in config2help.c, the host vs cross compiler
build context (probes for portability.h) is too fiddly to keep stright, just copy the parts we need into the host tool.
-rw-r--r--scripts/config2help.c103
-rwxr-xr-xscripts/make.sh3
2 files changed, 94 insertions, 12 deletions
diff --git a/scripts/config2help.c b/scripts/config2help.c
index d2389392..be53547d 100644
--- a/scripts/config2help.c
+++ b/scripts/config2help.c
@@ -8,6 +8,7 @@
#include <ctype.h>
#include <stdio.h>
#include <string.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -18,15 +19,95 @@
#include <poll.h>
#include <sys/socket.h>
-struct statvfs {int i;};
-#include "lib/portability.h"
-#include "lib/lib.h"
+/****************** functions copied from lib/*.c ********************/
-// 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(void *which, char *argv[]) {;}
+struct double_list {
+ struct double_list *next, *prev;
+ char *data;
+};
+
+// Die unless we can allocate memory.
+void *xmalloc(size_t size)
+{
+ void *ret = malloc(size);
+ if (!ret) {
+ fprintf(stderr, "xmalloc(%ld)", (long)size);
+ exit(1);
+ }
+
+ return ret;
+}
+
+// Die unless we can allocate enough space to sprintf() into.
+char *xmprintf(char *format, ...)
+{
+ va_list va, va2;
+ int len;
+ char *ret;
+
+ va_start(va, format);
+ va_copy(va2, va);
+
+ // How long is it?
+ len = vsnprintf(0, 0, format, va);
+ len++;
+ va_end(va);
+
+ // Allocate and do the sprintf()
+ ret = xmalloc(len);
+ vsnprintf(ret, len, format, va2);
+ va_end(va2);
+
+ return ret;
+}
+
+// Die unless we can open/create a file, returning FILE *.
+FILE *xfopen(char *path, char *mode)
+{
+ FILE *f = fopen(path, mode);
+ if (!f) {
+ fprintf(stderr, "No file %s", path);
+ exit(1);
+ }
+ return f;
+}
+
+void *dlist_pop(void *list)
+{
+ struct double_list **pdlist = (struct double_list **)list, *dlist = *pdlist;
+
+ if (dlist->next == dlist) *pdlist = 0;
+ else {
+ dlist->next->prev = dlist->prev;
+ dlist->prev->next = *pdlist = dlist->next;
+ }
+
+ return dlist;
+}
+
+void dlist_add_nomalloc(struct double_list **list, struct double_list *new)
+{
+ if (*list) {
+ new->next = *list;
+ new->prev = (*list)->prev;
+ (*list)->prev->next = new;
+ (*list)->prev = new;
+ } else *list = new->next = new->prev = new;
+}
+
+
+// Add an entry to the end of a doubly linked list
+struct double_list *dlist_add(struct double_list **list, char *data)
+{
+ struct double_list *new = xmalloc(sizeof(struct double_list));
+
+ new->data = data;
+ dlist_add_nomalloc(list, new);
+
+ return new;
+}
+
+/****************** end copies of lib/*.c *************/
// Parse config files into data structures.
@@ -167,7 +248,7 @@ void parse(char *filename)
// source or config keyword at left edge?
if (*line && !isspace(*line)) {
if ((s = keyword("config", line))) {
- new = xzalloc(sizeof(struct symbol));
+ memset(new = xmalloc(sizeof(struct symbol)), 0, sizeof(struct symbol));
new->next = sym;
new->name = s;
sym = new;
@@ -399,7 +480,9 @@ int main(int argc, char *argv[])
if (sym->help) {
int i;
- char *s = xstrdup(sym->name);
+ char *s;
+
+ strcpy(s = xmalloc(strlen(sym->name)+1), sym->name);
for (i = 0; s[i]; i++) s[i] = tolower(s[i]);
printf("#define HELP_%s \"", s);
diff --git a/scripts/make.sh b/scripts/make.sh
index 72d53709..a268eafd 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -253,8 +253,7 @@ fi
if [ generated/config2help -ot scripts/config2help.c ]
then
- do_loudly $HOSTCC scripts/config2help.c -I . lib/xwrap.c lib/llist.c \
- lib/lib.c lib/portability.c -o generated/config2help || exit 1
+ do_loudly $HOSTCC scripts/config2help.c -o generated/config2help || exit 1
fi
if isnewer generated/help.h generated/Config.in
then