Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
update monitoring into packaging
[src/app-framework-binder.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
a989a70
..
ac21c81
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-29,6
+29,10
@@
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/wait.h>
+#if !defined(NO_CALL_PERSONALITY)
+#include <sys/personality.h>
+#endif
+
#include <json-c/json.h>
#include <systemd/sd-daemon.h>
#include <json-c/json.h>
#include <systemd/sd-daemon.h>
@@
-50,6
+54,7
@@
#include "afb-hook.h"
#include "sd-fds.h"
#include "afb-debug.h"
#include "afb-hook.h"
#include "sd-fds.h"
#include "afb-debug.h"
+#include "process-name.h"
/*
if SELF_PGROUP == 0 the launched command is the group leader
/*
if SELF_PGROUP == 0 the launched command is the group leader
@@
-347,7
+352,7
@@
static char *instanciate_string(char *arg, const char *port, const char *token)
switch(*++it) {
case 'p': wr = stpcpy(wr, port); break;
case 't': wr = stpcpy(wr, token); break;
switch(*++it) {
case 'p': wr = stpcpy(wr, port); break;
case 't': wr = stpcpy(wr, token); break;
- default: *wr++ = SUBST_CHAR;
+ default: *wr++ = SUBST_CHAR;
/*@fallthrough@*/
case SUBST_CHAR: *wr++ = *it;
}
arg = ++it;
case SUBST_CHAR: *wr++ = *it;
}
arg = ++it;
@@
-588,7
+593,8
@@
static void start(int signum)
afb_debug("start-load");
apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
apiset_start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
afb_debug("start-load");
apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
apiset_start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
- apiset_start_list(config->ldpaths, afb_api_so_add_pathset, "the binding path set");
+ apiset_start_list(config->ldpaths, afb_api_so_add_pathset_fails, "the binding path set");
+ apiset_start_list(config->weak_ldpaths, afb_api_so_add_pathset_nofails, "the weak binding path set");
apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
apiset_start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
apiset_start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
@@
-598,6
+604,9
@@
static void start(int signum)
/* start the services */
afb_debug("start-start");
/* start the services */
afb_debug("start-start");
+#if !defined(NO_CALL_PERSONALITY)
+ personality((unsigned long)-1L);
+#endif
if (afb_apiset_start_all_services(main_apiset, 1) < 0)
goto error;
if (afb_apiset_start_all_services(main_apiset, 1) < 0)
goto error;
@@
-641,7
+650,11
@@
int main(int argc, char *argv[])
// ------------- Build session handler & init config -------
config = afb_config_parse_arguments(argc, argv);
// ------------- Build session handler & init config -------
config = afb_config_parse_arguments(argc, argv);
-
+ if (config->name) {
+ verbose_set_name(config->name, 0);
+ process_name_set_name(config->name);
+ process_name_replace_cmdline(argv, config->name);
+ }
afb_debug("main-args");
// --------- run -----------
afb_debug("main-args");
// --------- run -----------