X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=rcS.c;h=1e38d39e511fd280904bc7b6f3b315eb7ff60b4f;hp=45456215af023d67edb10ed715ec296f3f9a250b;hb=f355e233714e6ff38a38ccfe74f2f42d65a519c8;hpb=81c9904b57d3aed01ca6d4ad027d6fc29f7fbc93 diff --git a/rcS.c b/rcS.c index 4545621..1e38d39 100644 --- a/rcS.c +++ b/rcS.c @@ -54,7 +54,10 @@ static void pipe_cb(struct ustream *s, int bytes) break; *newline = 0; len = newline + 1 - str; - syslog(0, "%s", str); + syslog(LOG_NOTICE, "%s", str); +#ifdef SHOW_BOOT_ON_CONSOLE + fprintf(stderr, "%s\n", str); +#endif ustream_consume(s, len); } while (1); } @@ -112,6 +115,10 @@ static void add_initd(struct runqueue *q, char *file, char *param) char *p, *f; 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; if (!strcmp(param, "stop") || !strcmp(param, "shutdown")) @@ -129,6 +136,11 @@ static int _rc(struct runqueue *q, char *path, const char *file, char *pattern, 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); sprintf(dir, "%s/%s%s", path, file, pattern); if (glob(dir, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl)) {