chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: sync kdbus.h (API change: switch to absolute timeouts)
[elogind.git]
/
src
/
binfmt
/
binfmt.c
diff --git
a/src/binfmt/binfmt.c
b/src/binfmt/binfmt.c
index 5a42b3dbef769b9561b09ef8a5be52b19095fb81..c1c152239bed496e8c37d353e8bc7d3b2c1182b1 100644
(file)
--- a/
src/binfmt/binfmt.c
+++ b/
src/binfmt/binfmt.c
@@
-34,6
+34,7
@@
#include "util.h"
#include "conf-files.h"
#include "fileio.h"
#include "util.h"
#include "conf-files.h"
#include "fileio.h"
+#include "build.h"
static const char conf_file_dirs[] =
"/etc/binfmt.d\0"
static const char conf_file_dirs[] =
"/etc/binfmt.d\0"
@@
-85,7
+86,7
@@
static int apply_file(const char *path, bool ignore_enoent) {
assert(path);
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;
if (r < 0) {
if (ignore_enoent && r == -ENOENT)
return 0;
@@
-94,7
+95,7
@@
static int apply_file(const char *path, bool ignore_enoent) {
return r;
}
return r;
}
- log_debug("apply: %s
\n
", path);
+ log_debug("apply: %s", path);
for (;;) {
char l[LINE_MAX], *p;
int k;
for (;;) {
char l[LINE_MAX], *p;
int k;
@@
-121,21
+122,24
@@
static int apply_file(const char *path, bool ignore_enoent) {
return r;
}
return r;
}
-static int help(void) {
-
+static void help(void) {
printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n"
"Registers binary formats.\n\n"
printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n"
"Registers binary formats.\n\n"
- " -h --help Show this help\n",
- program_invocation_short_name);
-
- return 0;
+ " -h --help Show this help\n"
+ " --version Show package version\n"
+ , program_invocation_short_name);
}
static int parse_argv(int argc, char *argv[]) {
}
static int parse_argv(int argc, char *argv[]) {
+ enum {
+ ARG_VERSION = 0x100,
+ };
+
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
- { NULL, 0, NULL, 0 }
+ { "version", no_argument, NULL, ARG_VERSION },
+ {}
};
int c;
};
int c;
@@
-143,7
+147,7
@@
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
{
+ while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
switch (c) {
switch (c) {
@@
-151,14
+155,17
@@
static int parse_argv(int argc, char *argv[]) {
help();
return 0;
help();
return 0;
+ case ARG_VERSION:
+ puts(PACKAGE_STRING);
+ puts(SYSTEMD_FEATURES);
+ return 0;
+
case '?':
return -EINVAL;
default:
case '?':
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
}
- }
return 1;
}
return 1;
}