#include <ccan/err/err.h>
-#include <ccan/grab_file/grab_file.h>
#include <ccan/str/str.h>
-#include <ccan/str_talloc/str_talloc.h>
-#include <ccan/talloc/talloc.h>
+#include <ccan/tal/path/path.h>
+#include <ccan/tal/grab_file/grab_file.h>
#include "read_config_header.h"
#include "tools.h"
#include <string.h>
toklen = strspn(*line, IDENT_CHARS);
if (!toklen)
return NULL;
- ret = talloc_strndup(ctx, *line, toklen);
+ ret = tal_strndup(ctx, *line, toklen);
*line += toklen;
return ret;
}
return string;
}
-char *read_config_header(const char *ccan_dir,
- const char **compiler, const char **cflags,
- bool verbose)
+char *read_config_header(const char *ccan_dir, bool verbose)
{
- char *fname = talloc_asprintf(NULL, "%s/config.h", ccan_dir);
+ char *fname = path_join(NULL, ccan_dir, "config.h");
char **lines;
unsigned int i;
char *config_header;
- config_header = grab_file(NULL, fname, NULL);
- talloc_free(fname);
+ config_header = grab_file(NULL, fname);
+ tal_free(fname);
if (!config_header)
- goto out;
+ return NULL;
- lines = strsplit(config_header, config_header, "\n");
- for (i = 0; i < talloc_array_length(lines) - 1; i++) {
+ lines = tal_strsplit(config_header, config_header, "\n", STR_EMPTY_OK);
+ for (i = 0; i < tal_count(lines) - 1; i++) {
char *sym;
const char **line = (const char **)&lines[i];
if (!get_token(line, "define"))
continue;
sym = get_symbol_token(lines, line);
- if (streq(sym, "CCAN_COMPILER") && !compiler) {
- *compiler = demangle_string(lines[i]);
- if (!*compiler)
+ if (streq(sym, "CCAN_COMPILER")) {
+ compiler = demangle_string(lines[i]);
+ if (!compiler)
errx(1, "%s:%u:could not parse CCAN_COMPILER",
fname, i+1);
if (verbose)
printf("%s: compiler set to '%s'\n",
- fname, *compiler);
- } else if (streq(sym, "CCAN_CFLAGS") && !cflags) {
- *cflags = demangle_string(lines[i]);
- if (!*cflags)
+ fname, compiler);
+ } else if (streq(sym, "CCAN_CFLAGS")) {
+ cflags = demangle_string(lines[i]);
+ if (!cflags)
errx(1, "%s:%u:could not parse CCAN_CFLAGS",
fname, i+1);
if (verbose)
printf("%s: compiler flags set to '%s'\n",
- fname, *cflags);
+ fname, cflags);
}
}
-
-out:
- if (!*compiler)
- *compiler = CCAN_COMPILER;
- if (!*cflags)
- *cflags = CCAN_CFLAGS;
-
return config_header;
}