projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
procd: Add %m to several functions that return errno.
[project/procd.git]
/
rcS.c
diff --git
a/rcS.c
b/rcS.c
index
ae8f08e
..
dd3b76d
100644
(file)
--- a/
rcS.c
+++ b/
rcS.c
@@
-24,6
+24,7
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <fcntl.h>
#include <glob.h>
#include <libubox/ustream.h>
#include <glob.h>
#include <libubox/ustream.h>
@@
-42,7
+43,7
@@
struct initd {
static void pipe_cb(struct ustream *s, int bytes)
{
static void pipe_cb(struct ustream *s, int bytes)
{
- struct
ustream_buf *buf = s->r.head
;
+ struct
initd *initd = container_of(s, struct initd, fd.stream)
;
char *newline, *str;
int len;
char *newline, *str;
int len;
@@
-50,12
+51,15
@@
static void pipe_cb(struct ustream *s, int bytes)
str = ustream_get_read_buf(s, NULL);
if (!str)
break;
str = ustream_get_read_buf(s, NULL);
if (!str)
break;
- newline = strchr(
buf->data
, '\n');
+ newline = strchr(
str
, '\n');
if (!newline)
break;
*newline = 0;
len = newline + 1 - str;
if (!newline)
break;
*newline = 0;
len = newline + 1 - str;
- syslog(0, buf->data);
+ ULOG_NOTE("%s: %s", initd->file, str);
+#ifdef SHOW_BOOT_ON_CONSOLE
+ fprintf(stderr, "%s: %s\n", initd->file, str);
+#endif
ustream_consume(s, len);
} while (1);
}
ustream_consume(s, len);
} while (1);
}
@@
-68,7
+72,7
@@
static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
DEBUG(2, "start %s %s \n", s->file, s->param);
if (pipe(pipefd) == -1) {
DEBUG(2, "start %s %s \n", s->file, s->param);
if (pipe(pipefd) == -1) {
- ERROR("Failed to create pipe\n");
+ ERROR("Failed to create pipe
: %m
\n");
return;
}
return;
}
@@
-78,6
+82,7
@@
static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
if (pid) {
close(pipefd[1]);
if (pid) {
close(pipefd[1]);
+ fcntl(pipefd[0], F_SETFD, FD_CLOEXEC);
s->fd.stream.string_data = true,
s->fd.stream.notify_read = pipe_cb,
runqueue_process_add(q, &s->proc, pid);
s->fd.stream.string_data = true,
s->fd.stream.notify_read = pipe_cb,
runqueue_process_add(q, &s->proc, pid);
@@
-85,9
+90,15
@@
static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
return;
}
close(pipefd[0]);
return;
}
close(pipefd[0]);
+
+ int devnull = open("/dev/null", O_RDONLY);
+ dup2(devnull, STDIN_FILENO);
dup2(pipefd[1], STDOUT_FILENO);
dup2(pipefd[1], STDERR_FILENO);
dup2(pipefd[1], STDOUT_FILENO);
dup2(pipefd[1], STDERR_FILENO);
+ if (devnull > STDERR_FILENO)
+ close(devnull);
+
execlp(s->file, s->file, s->param, NULL);
exit(1);
}
execlp(s->file, s->file, s->param, NULL);
exit(1);
}
@@
-110,24
+121,39
@@
static void add_initd(struct runqueue *q, char *file, char *param)
.kill = runqueue_process_kill_cb,
};
struct initd *s;
.kill = runqueue_process_kill_cb,
};
struct initd *s;
+ char *p, *f;
- s = calloc(1, sizeof(*s));
+ s = calloc_a(sizeof(*s), &f, strlen(file) + 1, &p, strlen(param) + 1);
+ if (!s) {
+ ERROR("Out of memory in %s.\n", file);
+ return;
+ }
s->proc.task.type = &initd_type;
s->proc.task.complete = q_initd_complete;
s->proc.task.type = &initd_type;
s->proc.task.complete = q_initd_complete;
- s->param = param;
- s->file = file;
+ if (!strcmp(param, "stop") || !strcmp(param, "shutdown")) {
+ s->proc.task.run_timeout = 15000;
+ s->proc.task.cancel_timeout = 10000;
+ }
+ s->param = p;
+ s->file = f;
+ strcpy(s->param, param);
+ strcpy(s->file, file);
runqueue_task_add(q, &s->proc.task, false);
}
static int _rc(struct runqueue *q, char *path, const char *file, char *pattern, char *param)
{
runqueue_task_add(q, &s->proc.task, false);
}
static int _rc(struct runqueue *q, char *path, const char *file, char *pattern, char *param)
{
- char
dir[64]
;
+ char
*dir = alloca(2 + strlen(path) + strlen(file) + strlen(pattern))
;
glob_t gl;
int j;
glob_t gl;
int j;
+ if (!dir) {
+ ERROR("Out of memory in %s.\n", file);
+ return -1;
+ }
DEBUG(2, "running %s/%s%s %s\n", path, file, pattern, param);
DEBUG(2, "running %s/%s%s %s\n", path, file, pattern, param);
- s
nprintf(dir, sizeof(dir)
, "%s/%s%s", path, file, pattern);
+ s
printf(dir
, "%s/%s%s", path, file, pattern);
if (glob(dir, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl)) {
DEBUG(2, "glob failed on %s\n", dir);
return -1;
if (glob(dir, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl)) {
DEBUG(2, "glob failed on %s\n", dir);
return -1;
@@
-136,6
+162,8
@@
static int _rc(struct runqueue *q, char *path, const char *file, char *pattern,
for (j = 0; j < gl.gl_pathc; j++)
add_initd(q, gl.gl_pathv[j], param);
for (j = 0; j < gl.gl_pathc; j++)
add_initd(q, gl.gl_pathv[j], param);
+ globfree(&gl);
+
return 0;
}
return 0;
}
@@
-158,8
+186,8
@@
static void r_empty(struct runqueue *q)
}
}
-static void __attribute__((constructor))
measure
_init() {
+static void __attribute__((constructor))
rc
_init() {
runqueue_init(&r);
r.empty_cb = r_empty;
runqueue_init(&r);
r.empty_cb = r_empty;
- r.max_running_tasks =
1
;
+ r.max_running_tasks =
8
;
}
}