chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit_merge() needs a proper review
[elogind.git]
/
main.c
diff --git
a/main.c
b/main.c
index 99f7d6832fc7996e9176767ef9cf4092bc68f7c6..624a73e1783c9e2fbebef353db35dc107c5cc6a6 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-10,18
+10,18
@@
int main(int argc, char *argv[]) {
Manager *m = NULL;
int main(int argc, char *argv[]) {
Manager *m = NULL;
-
Name
*target = NULL;
+
Unit
*target = NULL;
Job *job = NULL;
int r, retval = 1;
Job *job = NULL;
int r, retval = 1;
- assert_se(
chdir("test1") =
= 0);
+ assert_se(
set_unit_path("test1") >
= 0);
if (!(m = manager_new()) < 0) {
log_error("Failed to allocate manager object: %s", strerror(ENOMEM));
goto finish;
}
if (!(m = manager_new()) < 0) {
log_error("Failed to allocate manager object: %s", strerror(ENOMEM));
goto finish;
}
- if ((r = manager_load_
name
(m, "default.target", &target)) < 0) {
+ if ((r = manager_load_
unit
(m, "default.target", &target)) < 0) {
log_error("Failed to load default target: %s", strerror(-r));
goto finish;
}
log_error("Failed to load default target: %s", strerror(-r));
goto finish;
}
@@
-31,13
+31,16
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
- printf("→ By
name
s:\n");
- manager_dump_
name
s(m, stdout, "\t");
+ printf("→ By
unit
s:\n");
+ manager_dump_
unit
s(m, stdout, "\t");
printf("→ By jobs:\n");
manager_dump_jobs(m, stdout, "\t");
printf("→ By jobs:\n");
manager_dump_jobs(m, stdout, "\t");
- /* manager_loop(m); */
+ if ((r = manager_loop(m)) < 0) {
+ log_error("Failed to run mainloop: %s", strerror(-r));
+ goto finish;
+ }
retval = 0;
retval = 0;
@@
-45,5
+48,7
@@
finish:
if (m)
manager_free(m);
if (m)
manager_free(m);
+ log_debug("Exit.");
+
return retval;
}
return retval;
}