X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/b36be3a1a6a4b3374669cadf3455b8f75912f089..cca956b199841d754e8a78391d2e2c7efce4a3ee:/lib/macros-builtin.c diff --git a/lib/macros-builtin.c b/lib/macros-builtin.c index 53b2712..ec5628d 100644 --- a/lib/macros-builtin.c +++ b/lib/macros-builtin.c @@ -25,17 +25,14 @@ * generated from the comments at the head of each function. */ -#include -#include "types.h" +#include "common.h" -#include -#include #include -#include #include #include #include +#include "hash.h" #include "mem.h" #include "macros.h" #include "sink.h" @@ -43,10 +40,10 @@ #include "log.h" #include "wstat.h" #include "kvp.h" -#include "hash.h" #include "split.h" #include "printf.h" #include "vector.h" +#include "filepart.h" static struct vector include_path; @@ -61,14 +58,42 @@ const char *mx_bool2str(int n) { } /** @brief Write a boolean result */ -static int mx_bool_result(struct sink *output, int result) { +int mx_bool_result(struct sink *output, int result) { if(sink_writes(output, mx_bool2str(result)) < 0) return -1; else return 0; } -/* @include{TEMPLATE} +/** @brief Search the include path */ +char *mx_find(const char *name, int report) { + char *path; + int n; + + if(name[0] == '/') { + if(access(name, O_RDONLY) < 0) { + if(report) + error(errno, "cannot read %s", name); + return 0; + } + path = xstrdup(name); + } else { + /* Search the include path */ + for(n = 0; n < include_path.nvec; ++n) { + byte_xasprintf(&path, "%s/%s", include_path.vec[n], name); + if(access(path, O_RDONLY) == 0) + break; + } + if(n >= include_path.nvec) { + if(report) + error(0, "cannot find '%s' in search path", name); + return 0; + } + } + return path; +} + +/*! @include{TEMPLATE}@ * * Includes TEMPLATE. * @@ -90,35 +115,15 @@ static int exp_include(int attribute((unused)) nargs, char **args, struct sink *output, void *u) { - const char *name = args[0]; - char *path; + const char *path; int fd, n; char buffer[4096]; struct stat sb; - - if(name[0] == '/') { - if(access(name, O_RDONLY) < 0) { - error(errno, "cannot read template %s", name); - if(sink_printf(output, "[[cannot open template '%s']]", name) < 0) - return -1; - return -3; - } - path = xstrdup(name); - } else { - int n; - /* Search the include path */ - for(n = 0; n < include_path.nvec; ++n) { - byte_xasprintf(&path, "%s/%s", include_path.vec[n], name); - if(access(path, O_RDONLY) == 0) - break; - } - if(n >= include_path.nvec) { - error(0, "cannot find template '%s'", name); - if(sink_printf(output, "[[cannot find template '%s']]", name) < 0) - return -1; - return -3; - } + if(!(path = mx_find(args[0], 1/*report*/))) { + if(sink_printf(output, "[[cannot find '%s']]", args[0]) < 0) + return 0; + return 0; } /* If it's a template expand it */ if(strlen(path) >= 5 && !strncmp(path + strlen(path) - 5, ".tmpl", 5)) @@ -143,7 +148,7 @@ static int exp_include(int attribute((unused)) nargs, return 0; } -/* @include{COMMAND} +/*! @include{COMMAND}@ * * Executes COMMAND via the shell (using "sh -c") and copies its * standard output to the template output. The shell command output @@ -192,7 +197,7 @@ static int exp_shell(int attribute((unused)) nargs, return 0; } -/* @if{CONDITION}{IF-TRUE}{IF-FALSE} +/*! @if{CONDITION}{IF-TRUE}{IF-FALSE}@ * * If CONDITION is "true" then evaluates to IF-TRUE. Otherwise * evaluates to IF-FALSE. The IF-FALSE part is optional. @@ -214,7 +219,7 @@ static int exp_if(int nargs, return 0; } -/* @and{BRANCH}{BRANCH}... +/*! @and{BRANCH}{BRANCH}...@ * * Expands to "true" if all the branches are "true" otherwise to "false". If * there are no brances then the result is "true". Only as many branches as @@ -240,7 +245,7 @@ static int exp_and(int nargs, return mx_bool_result(output, result); } -/* @or{BRANCH}{BRANCH}... +/*! @or{BRANCH}{BRANCH}...@ * * Expands to "true" if any of the branches are "true" otherwise to "false". * If there are no brances then the result is "false". Only as many branches @@ -266,7 +271,7 @@ static int exp_or(int nargs, return mx_bool_result(output, result); } -/* @not{CONDITION} +/*! @not{CONDITION}@ * * Expands to "true" unless CONDITION is "true" in which case "false". */ @@ -277,7 +282,7 @@ static int exp_not(int attribute((unused)) nargs, return mx_bool_result(output, !mx_str2bool(args[0])); } -/* @#{...} +/*! @#{...}@ * * Expands to nothing. The argument(s) are not fully evaluated, and no side * effects occur. @@ -289,7 +294,7 @@ static int exp_comment(int attribute((unused)) nargs, return 0; } -/* @urlquote{STRING} +/*! @urlquote{STRING}@ * * URL-quotes a string, i.e. replaces any characters not safe to use unquoted * in a URL with %-encoded form. @@ -304,7 +309,7 @@ static int exp_urlquote(int attribute((unused)) nargs, return 0; } -/* @eq{S1}{S2}... +/*! @eq{S1}{S2}...@ * * Expands to "true" if all the arguments are identical, otherwise to "false" * (i.e. if any pair of arguments differs). @@ -328,7 +333,7 @@ static int exp_eq(int nargs, return mx_bool_result(output, result); } -/* @ne{S1}{S2}... +/*! @ne{S1}{S2}...@ * * Expands to "true" if all of the arguments differ from one another, otherwise * to "false" (i.e. if any value appears more than once). @@ -352,7 +357,7 @@ static int exp_ne(int nargs, return mx_bool_result(output, result); } -/* @discard{...} +/*! @discard{...}@ * * Expands to nothing. Unlike the comment expansion @#{...}, side effects of * arguments are not suppressed. So this can be used to surround a collection @@ -365,7 +370,7 @@ static int exp_discard(int attribute((unused)) nargs, return 0; } -/* @define{NAME}{ARG1 ARG2...}{DEFINITION} +/*! @define{NAME}{ARG1 ARG2...}{DEFINITION}@ * * Define a macro. The macro will be called NAME and will act like an * expansion. When it is expanded, the expansion is replaced by DEFINITION, @@ -388,12 +393,43 @@ static int exp_define(int attribute((unused)) nargs, return 0; } +/*! @basename{PATH} + * + * Expands to the UNQUOTED basename of PATH. + */ +static int exp_basename(int attribute((unused)) nargs, + char **args, + struct sink attribute((unused)) *output, + void attribute((unused)) *u) { + return sink_writes(output, d_basename(args[0])) < 0 ? -1 : 0; +} + +/*! @dirname{PATH} + * + * Expands to the UNQUOTED directory name of PATH. + */ +static int exp_dirname(int attribute((unused)) nargs, + char **args, + struct sink attribute((unused)) *output, + void attribute((unused)) *u) { + return sink_writes(output, d_dirname(args[0])) < 0 ? -1 : 0; +} + +/*! @q{STRING} + * + * Expands to STRING. + */ +static int exp_q(int attribute((unused)) nargs, + char **args, + struct sink attribute((unused)) *output, + void attribute((unused)) *u) { + return sink_writes(output, args[0]) < 0 ? -1 : 0; +} + +/** @brief Register built-in expansions */ void mx_register_builtin(void) { - mx_register_magic("#", 0, INT_MAX, exp_comment); - mx_register_magic("and", 0, INT_MAX, exp_and); - mx_register_magic("define", 3, 3, exp_define); - mx_register_magic("if", 2, 3, exp_if); - mx_register_magic("or", 0, INT_MAX, exp_or); + mx_register("basename", 1, 1, exp_basename); + mx_register("dirname", 1, 1, exp_dirname); mx_register("discard", 0, INT_MAX, exp_discard); mx_register("eq", 0, INT_MAX, exp_eq); mx_register("include", 1, 1, exp_include); @@ -401,6 +437,19 @@ void mx_register_builtin(void) { mx_register("not", 1, 1, exp_not); mx_register("shell", 1, 1, exp_shell); mx_register("urlquote", 1, 1, exp_urlquote); + mx_register("q", 1, 1, exp_q); + mx_register_magic("#", 0, INT_MAX, exp_comment); + mx_register_magic("and", 0, INT_MAX, exp_and); + mx_register_magic("define", 3, 3, exp_define); + mx_register_magic("if", 2, 3, exp_if); + mx_register_magic("or", 0, INT_MAX, exp_or); +} + +/** @brief Add a directory to the search path + * @param s Directory to add + */ +void mx_search_path(const char *s) { + vector_append(&include_path, xstrdup(s)); } /*