}
if (afb_hreq_init_download_path(uploaddir)) {
- ERROR("unable to set the upload directory %s", uploaddir);
- return NULL;
+ static const char fallback_uploaddir[] = "/tmp";
+ WARNING("unable to set the upload directory %s", uploaddir);
+ if (afb_hreq_init_download_path(fallback_uploaddir)) {
+ ERROR("unable to fallback to upload directory %s", fallback_uploaddir);
+ return NULL;
+ }
}
hsrv = afb_hsrv_create();
| execute_command
+--------------------------------------------------------- */
-static void wait_child_and_exit()
+static void exit_at_end()
{
+ exit(0);
+}
+
+static void wait_child(int signum, void* arg)
+{
+ pid_t pid = (pid_t)(intptr_t)arg;
pid_t pidchld = childpid;
- childpid = 0;
- if (!SELF_PGROUP)
- killpg(pidchld, SIGKILL);
- waitpid(pidchld, NULL, 0);
- exit(0);
+ if (pidchld == pid) {
+ childpid = 0;
+ if (!SELF_PGROUP)
+ killpg(pidchld, SIGKILL);
+ waitpid(pidchld, NULL, 0);
+ jobs_exit(exit_at_end);
+ } else {
+ waitpid(pid, NULL, 0);
+ }
}
static void on_sigchld(int signum, siginfo_t *info, void *uctx)
case CLD_EXITED:
case CLD_KILLED:
case CLD_DUMPED:
- jobs_exit(wait_child_and_exit);
+ jobs_queue_lazy(0, 0, wait_child, (void*)(intptr_t)info->si_pid);
default:
break;
}
/* load bindings and apis */
afb_debug("start-load");
+#if WITH_DYNAMIC_BINDING
apiset_start_list("binding", afb_api_so_add_binding, "the binding");
apiset_start_list("ldpaths", afb_api_so_add_pathset_fails, "the binding path set");
apiset_start_list("weak-ldpaths", afb_api_so_add_pathset_nofails, "the weak binding path set");
+#endif
apiset_start_list("auto-api", afb_autoset_add_any, "the automatic api path set");
#if WITH_DBUS_TRANSPARENCY
apiset_start_list("dbus-client", afb_api_dbus_add_client, "the afb-dbus client");
afb_debug("main-start");
/* enter job processing */
- jobs_start(3, 0, 50, start, NULL);
+ jobs_start(3, 0, 100, start, NULL);
WARNING("hoops returned from jobs_enter! [report bug]");
return 1;
}