/* Code to move a ccan module into the ccan_ namespace. */
-#include <err.h>
#include <errno.h>
-#include <unistd.h>
#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
#include <stdbool.h>
#include <ctype.h>
#include <sys/types.h>
#include <dirent.h>
-#include "talloc/talloc.h"
-
-#define CFLAGS "-O3 -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I. -Iccan_tools/libtap/src/"
-
-#define IDENT_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
- "abcdefghijklmnopqrstuvwxyz" \
- "01234567889_"
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include "ccan/str/str.h"
+#include "ccan/take/take.h"
+#include "ccan/rbuf/rbuf.h"
+#include "ccan/tal/path/path.h"
+#include "ccan/tal/grab_file/grab_file.h"
+#include "ccan/err/err.h"
+#include "ccan/noerr/noerr.h"
+#include "tools.h"
static bool verbose = false;
static int indent = 0;
#define verbose_indent() (indent += 2)
#define verbose_unindent() (indent -= 2)
-#define streq(a,b) (strcmp((a),(b)) == 0)
-
-#define strstarts(str,prefix) (strncmp((str),(prefix),strlen(prefix)) == 0)
-
-static inline bool strends(const char *str, const char *postfix)
-{
- if (strlen(str) < strlen(postfix))
- return false;
-
- return streq(str + strlen(str) - strlen(postfix), postfix);
-}
-
-static int close_no_errno(int fd)
-{
- int ret = 0, serrno = errno;
- if (close(fd) < 0)
- ret = errno;
- errno = serrno;
- return ret;
-}
-
-static int unlink_no_errno(const char *filename)
-{
- int ret = 0, serrno = errno;
- if (unlink(filename) < 0)
- ret = errno;
- errno = serrno;
- return ret;
-}
-
-static void *grab_fd(const void *ctx, int fd)
-{
- int ret;
- unsigned int max = 16384, size = 0;
- char *buffer;
-
- buffer = talloc_array(ctx, char, max+1);
- while ((ret = read(fd, buffer + size, max - size)) > 0) {
- size += ret;
- if (size == max)
- buffer = talloc_realloc(ctx, buffer, char, max*=2 + 1);
- }
- if (ret < 0) {
- talloc_free(buffer);
- buffer = NULL;
- } else
- buffer[size] = '\0';
-
- return buffer;
-}
-
-/* This version adds one byte (for nul term) */
-static void *grab_file(const void *ctx, const char *filename)
-{
- int fd;
- char *buffer;
-
- if (streq(filename, "-"))
- fd = dup(STDIN_FILENO);
- else
- fd = open(filename, O_RDONLY, 0);
-
- if (fd < 0)
- return NULL;
-
- buffer = grab_fd(ctx, fd);
- close_no_errno(fd);
- return buffer;
-}
-
-/* This is a dumb one which copies. We could mangle instead. */
-static char **split(const void *ctx, const char *text, const char *delims,
- unsigned int *nump)
-{
- char **lines = NULL;
- unsigned int max = 64, num = 0;
-
- lines = talloc_array(ctx, char *, max+1);
-
- while (*text != '\0') {
- unsigned int len = strcspn(text, delims);
- lines[num] = talloc_array(lines, char, len + 1);
- memcpy(lines[num], text, len);
- lines[num][len] = '\0';
- text += len;
- text += strspn(text, delims);
- if (++num == max)
- lines = talloc_realloc(ctx, lines, char *, max*=2 + 1);
- }
- lines[num] = NULL;
- if (nump)
- *nump = num;
- return lines;
-}
-
static char **get_dir(const char *dir)
{
DIR *d;
struct dirent *ent;
- char **names = NULL;
- unsigned int size = 0;
+ char **names = tal_arr(NULL, char *, 0), *n;
d = opendir(dir);
if (!d)
return NULL;
while ((ent = readdir(d)) != NULL) {
- names = talloc_realloc(dir, names, char *, size + 2);
- names[size++]
- = talloc_asprintf(names, "%s/%s", dir, ent->d_name);
+ n = tal_fmt(names, "%s/%s", dir, ent->d_name);
+ tal_expand(&names, &n, 1);
}
- names[size++] = NULL;
+ n = NULL;
+ tal_expand(&names, &n, 1);
closedir(d);
return names;
}
-static char ** __attribute__((format(printf, 2, 3)))
-lines_from_cmd(const void *ctx, char *format, ...)
-{
- va_list ap;
- char *cmd, *buffer;
- FILE *p;
-
- va_start(ap, format);
- cmd = talloc_vasprintf(ctx, format, ap);
- va_end(ap);
-
- p = popen(cmd, "r");
- if (!p)
- err(1, "Executing '%s'", cmd);
-
- buffer = grab_fd(ctx, fileno(p));
- if (!buffer)
- err(1, "Reading from '%s'", cmd);
- pclose(p);
-
- return split(ctx, buffer, "\n", NULL);
-}
-
struct replace
{
struct replace *next;
if (streq(i->string, str))
return;
- new = talloc(*repl, struct replace);
+ new = tal(*repl, struct replace);
new->next = *repl;
- new->string = talloc_strdup(new, str);
+ new->string = tal_strdup(new, str);
*repl = new;
}
struct replace *new;
unsigned int len = strspn(s, IDENT_CHARS);
- new = talloc(*repl, struct replace);
+ new = tal(*repl, struct replace);
new->next = *repl;
- new->string = talloc_strndup(new, s, len);
+ new->string = tal_strndup(new, s, len);
*repl = new;
}
-static char *basename(const void *ctx, const char *dir)
-{
- char *p = strrchr(dir, '/');
-
- if (!p)
- return (char *)dir;
- return talloc_strdup(ctx, p+1);
-}
-
static void look_for_macros(char *contents, struct replace **repl)
{
char *p;
for (p = contents; *p; p++) {
if (*p == '\n')
state = LINESTART;
- else if (!isspace(*p)) {
+ else if (!cisspace(*p)) {
if (state == LINESTART && *p == '#')
state = HASH;
else if (state==HASH && !strncmp(p, "define", 6)) {
len = strspn(p, IDENT_CHARS);
if (len) {
char *s;
- s = talloc_strndup(contents, p, len);
+ s = tal_strndup(contents, p, len);
/* Don't wrap idempotent wrappers */
if (!strstarts(s, "CCAN_")) {
verbose("Found %s\n", s);
{
unsigned brackets = 0;
bool seen_brackets = false;
- char *answer = talloc_strdup(ctx, "");
+ char *answer = tal_strdup(ctx, "");
for (;;) {
if ((*p)[0] == '/' && (*p)[1] == '/')
return answer;
}
/* Compress whitespace into a single ' ' */
- if (isspace(c)) {
+ if (cisspace(c)) {
c = ' ';
- while (isspace((*p)[1]))
+ while (cisspace((*p)[1]))
(*p)++;
} else if (c == '{' || c == '(' || c == '[') {
if (c == '(')
brackets--;
if (answer[0] != '\0' || c != ' ') {
- answer = talloc_realloc(NULL, answer, char,
- strlen(answer) + 2);
- answer[strlen(answer)+1] = '\0';
- answer[strlen(answer)] = c;
+ tal_append_fmt(&answer, "%c", c);
}
if (c == '}' && seen_brackets && brackets == 0) {
(*p)++;
char *hdr, *contents;
/* Get hold of header, assume that's it. */
- hdr = talloc_asprintf(dir, "%s/%s.h", dir, basename(dir, dir));
+ hdr = tal_fmt(dir, "%s.h",
+ path_join(NULL, dir, take(path_basename(NULL, dir))));
+
contents = grab_file(dir, hdr);
if (!contents)
err(1, "Reading %s", hdr);
static void write_replacement_file(const char *dir, struct replace **repl)
{
- char *replname = talloc_asprintf(dir, "%s/.namespacize", dir);
+ char *replname = path_join(dir, dir, ".namespacize");
int fd;
struct replace *r;
for (r = *repl; r; r = r->next) {
if (write(fd,r->string,strlen(r->string)) != strlen(r->string)
|| write(fd, "\n", 1) != 1) {
- unlink_no_errno(replname);
+ unlink_noerr(replname);
if (errno == 0)
errx(1, "Short write to %s: disk full?",
replname);
close(fd);
}
-static int unlink_destroy(char *name)
+static void unlink_destroy(char *name)
{
unlink(name);
- return 0;
}
static char *find_word(char *f, const char *str)
while ((p = strstr(p, str)) != NULL) {
/* Check it's not in the middle of a word. */
- if (p > f && (isalnum(p[-1]) || p[-1] == '_')) {
+ if (p > f && (cisalnum(p[-1]) || p[-1] == '_')) {
p++;
continue;
}
- if (isalnum(p[strlen(str)]) || p[strlen(str)] == '_') {
+ if (cisalnum(p[strlen(str)]) || p[strlen(str)] == '_') {
p++;
continue;
}
while ((p = find_word(file, repl->string)) != NULL) {
unsigned int off;
- char *new = talloc_array(file, char, strlen(file)+6);
+ char *new = tal_arr(file, char, strlen(file)+6);
off = p - file;
memcpy(new, file, off);
- if (isupper(repl->string[0]))
+ if (cisupper(repl->string[0]))
memcpy(new + off, "CCAN_", 5);
else
memcpy(new + off, "ccan_", 5);
}
/* If we exit for some reason, we want this erased. */
- newname = talloc_asprintf(talloc_autofree_context(), "%s.tmp",
- filename);
+ newname = tal_fmt(autofree(), "%s.tmp", filename);
fd = open(newname, O_WRONLY|O_CREAT|O_EXCL, 0644);
if (fd < 0)
err(1, "Creating %s", newname);
- talloc_set_destructor(newname, unlink_destroy);
+ tal_add_destructor(newname, unlink_destroy);
if (write(fd, file, strlen(file)) != strlen(file)) {
if (errno == 0)
errx(1, "Short write to %s: disk full?", newname);
if (strends(*files, "/test"))
setup_adjust_files(*files, repl, adj);
else if (strends(*files, ".c") || strends(*files, ".h")) {
- struct adjusted *a = talloc(dir, struct adjusted);
+ struct adjusted *a = tal(dir, struct adjusted);
a->next = *adj;
a->file = *files;
a->tmpfile = rewrite_file(a->file, repl);
static void rename_files(const struct adjusted *adj)
{
while (adj) {
- if (rename(adj->tmpfile, adj->file) != 0)
+ if (!move_file(adj->tmpfile, adj->file))
warn("Could not rename over '%s', we're in trouble",
adj->file);
adj = adj->next;
struct adjusted *adj = NULL;
/* Remove any ugly trailing slashes. */
- name = talloc_strdup(NULL, dir);
- while (strends(name, "/"))
- name[strlen(name)-1] = '\0';
-
+ name = path_canon(NULL, dir);
analyze_headers(name, &replace);
write_replacement_file(name, &replace);
setup_adjust_files(name, replace, &adj);
rename_files(adj);
- talloc_free(name);
- talloc_free(replace);
+ tal_free(name);
+ tal_free(replace);
}
static struct replace *read_replacement_file(const char *depdir)
{
struct replace *repl = NULL;
- char *replname = talloc_asprintf(depdir, "%s/.namespacize", depdir);
+ char *replname = path_join(depdir, depdir, ".namespacize");
char *file, **line;
file = grab_file(replname, replname);
return NULL;
}
- for (line = split(file, file, "\n", NULL); *line; line++)
+ for (line = tal_strsplit(file, file, "\n", STR_EMPTY_OK); *line; line++)
add_replace(&repl, *line);
return repl;
}
-static char *build_info(const void *ctx, const char *dir)
-{
- char *file, *cfile, *cmd;
-
- cfile = talloc_asprintf(ctx, "%s/%s", dir, "_info.c");
- file = talloc_asprintf(cfile, "%s/%s", dir, "_info");
- cmd = talloc_asprintf(file, "gcc " CFLAGS " -o %s %s", file, cfile);
- if (system(cmd) != 0)
- errx(1, "Failed to compile %s", file);
-
- return file;
-}
-
-static char **get_deps(const void *ctx, const char *dir)
-{
- char **deps, *cmd;
-
- cmd = talloc_asprintf(ctx, "%s depends", build_info(ctx, dir));
- deps = lines_from_cmd(cmd, cmd);
- if (!deps)
- err(1, "Could not run '%s'", cmd);
- return deps;
-}
-
-static char *parent_dir(const void *ctx, const char *dir)
-{
- char *parent, *slash;
-
- parent = talloc_strdup(ctx, dir);
- slash = strrchr(parent, '/');
- if (slash)
- *slash = '\0';
- else
- parent = talloc_strdup(ctx, ".");
- return parent;
-}
-
static void adjust_dir(const char *dir)
{
- char *parent = parent_dir(NULL, dir);
+ char *parent = path_dirname(autofree(), dir);
char **deps;
verbose("Adjusting %s\n", dir);
verbose_indent();
- for (deps = get_deps(parent, dir); *deps; deps++) {
+ for (deps = get_deps(parent, dir, "depends", false, compile_info);
+ *deps;
+ deps++) {
char *depdir;
struct adjusted *adj = NULL;
struct replace *repl;
- depdir = talloc_asprintf(parent, "%s/%s", parent, *deps);
+ depdir = path_join(parent, parent, *deps);
repl = read_replacement_file(depdir);
if (repl) {
verbose("%s has been namespacized\n", depdir);
rename_files(adj);
} else
verbose("%s has not been namespacized\n", depdir);
- talloc_free(depdir);
+ tal_free(depdir);
}
verbose_unindent();
+ tal_free(parent);
}
static void adjust_dependents(const char *dir)
{
- char *parent = parent_dir(NULL, dir);
- char *base = basename(parent, dir);
+ char *parent = path_dirname(NULL, dir);
+ char *base = path_basename(parent, dir);
char **file;
verbose("Looking for dependents in %s\n", parent);
verbose_indent();
for (file = get_dir(parent); *file; file++) {
- char *infoc, **deps;
+ char *info, **deps;
bool isdep = false;
- if (basename(*file, *file)[0] == '.')
+ if (path_basename(*file, *file)[0] == '.')
continue;
- infoc = talloc_asprintf(*file, "%s/_info.c", *file);
- if (access(infoc, R_OK) != 0)
+ info = path_join(*file, *file, "_info");
+ if (access(info, R_OK) != 0)
continue;
- for (deps = get_deps(*file, *file); *deps; deps++) {
- if (streq(*deps, base))
+ for (deps = get_deps(*file, *file, "depends", false,
+ compile_info);
+ *deps; deps++) {
+ if (!strstarts(*deps, "ccan/"))
+ continue;
+ if (streq(*deps + strlen("ccan/"), base))
isdep = true;
}
if (isdep)
projects / ccan / blobdiff