#include "util.h"
#include "conf-files.h"
#include "fileio.h"
+#include "build.h"
static const char conf_file_dirs[] =
"/etc/binfmt.d\0"
assert(path);
- r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f);
+ r = search_and_fopen_nulstr(path, "re", NULL, conf_file_dirs, &f);
if (r < 0) {
if (ignore_enoent && r == -ENOENT)
return 0;
return r;
}
- log_debug("apply: %s\n", path);
+ log_debug("apply: %s", path);
for (;;) {
char l[LINE_MAX], *p;
int k;
p = strstrip(l);
if (!*p)
continue;
- if (strchr(COMMENTS, *p))
+ if (strchr(COMMENTS "\n", *p))
continue;
k = apply_rule(p);
printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n"
"Registers binary formats.\n\n"
- " -h --help Show this help\n",
+ " -h --help Show this help\n"
+ " --version Show package version\n",
program_invocation_short_name);
return 0;
static int parse_argv(int argc, char *argv[]) {
+ enum {
+ ARG_VERSION = 0x100,
+ };
+
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
- { NULL, 0, NULL, 0 }
+ { "version", no_argument, NULL, ARG_VERSION },
+ {}
};
int c;
switch (c) {
case 'h':
- help();
+ return help();
+
+ case ARG_VERSION:
+ puts(PACKAGE_STRING);
+ puts(SYSTEMD_FEATURES);
return 0;
case '?':
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
}