#include <unistd.h>
#include <errno.h>
-static char ** __attribute__((format(printf, 3, 4)))
-lines_from_cmd(const void *ctx, unsigned int *num, char *format, ...)
+static char ** __attribute__((format(printf, 2, 3)))
+lines_from_cmd(const void *ctx, char *format, ...)
{
va_list ap;
char *cmd, *buffer;
err(1, "Reading from '%s'", cmd);
pclose(p);
- return strsplit(ctx, buffer, "\n", num);
+ return strsplit(ctx, buffer, "\n");
}
/* Be careful about trying to compile over running programs (parallel make).
* temp_file helps here. */
static char *compile_info(const void *ctx, const char *dir)
{
- char *info_c_file, *info, *errmsg, *ccandir;
+ char *info_c_file, *info, *ccandir, *compiled, *output;
size_t len;
int fd;
if (!info)
return NULL;
- info_c_file = temp_file(ctx, ".c");
+ info_c_file = maybe_temp_file(ctx, ".c", false, "_info");
fd = open(info_c_file, O_WRONLY|O_CREAT|O_EXCL, 0600);
if (fd < 0)
return NULL;
ccandir = talloc_dirname(ctx, dir);
*strrchr(ccandir, '/') = '\0';
- return compile_and_link(ctx, info_c_file, ccandir, "", "", "",
- &errmsg);
+
+ compiled = maybe_temp_file(ctx, "", false, "info");
+ if (compile_and_link(ctx, info_c_file, ccandir, "", "", "",
+ compiled, &output))
+ return compiled;
+ return NULL;
}
static char **get_one_deps(const void *ctx, const char *dir,
}
cmd = talloc_asprintf(ctx, "%s depends", *infofile);
- deps = lines_from_cmd(cmd, num, "%s", cmd);
+ deps = lines_from_cmd(cmd, "%s", cmd);
if (!deps)
err(1, "Could not run '%s'", cmd);
+ /* FIXME: Do we need num arg? */
+ *num = talloc_array_length(deps) - 1;
return deps;
}
char **infofile)
{
char **deps, **lines, *raw, *fname;
- unsigned int i, n = 0;
+ unsigned int i, n;
fname = talloc_asprintf(ctx, "%s/_info", dir);
raw = grab_file(fname, fname, NULL);
errx(1, "Could not open %s", fname);
/* Replace \n by actual line breaks, and split it. */
- lines = strsplit(raw, replace(raw, raw, "\\n", "\n"), "\n", &n);
+ lines = strsplit(raw, replace(raw, raw, "\\n", "\n"), "\n");
- deps = talloc_array(ctx, char *, n+1);
+ deps = talloc_array(ctx, char *, talloc_array_length(lines));
for (n = i = 0; lines[i]; i++) {
char *str;
}
cmd = talloc_asprintf(ctx, "%s libs", *infofile);
- libs = lines_from_cmd(cmd, num, "%s", cmd);
+ libs = lines_from_cmd(cmd, "%s", cmd);
if (!libs)
err(1, "Could not run '%s'", cmd);
+ /* FIXME: Do we need num arg? */
+ *num = talloc_array_length(libs) - 1;
return libs;
}