aboutsummaryrefslogtreecommitdiff
path: root/runit
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-01-11 17:20:00 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-01-11 17:20:00 +0000
commitf7996f3b700a22797565e9aa57e251e6e3ac1e4d (patch)
treeaf4e797eef0a65f4e3dba94b325da0ec08452d36 /runit
parent3821fb13ea404d243115ff8ec161273b62826513 (diff)
downloadbusybox-w32-f7996f3b700a22797565e9aa57e251e6e3ac1e4d.tar.gz
busybox-w32-f7996f3b700a22797565e9aa57e251e6e3ac1e4d.tar.bz2
busybox-w32-f7996f3b700a22797565e9aa57e251e6e3ac1e4d.zip
Trailing whitespace removal over entire tree
Diffstat (limited to 'runit')
-rw-r--r--runit/chpst.c2
-rw-r--r--runit/runit_lib.c12
-rw-r--r--runit/runsv.c6
-rw-r--r--runit/runsvdir.c8
-rw-r--r--runit/sv.c2
-rw-r--r--runit/svlogd.c8
6 files changed, 19 insertions, 19 deletions
diff --git a/runit/chpst.c b/runit/chpst.c
index 14b8b5a15..4662a4a83 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -290,7 +290,7 @@ int chpst_main(int argc, char **argv)
290 } 290 }
291 argv += optind; 291 argv += optind;
292 if (!argv || !*argv) bb_show_usage(); 292 if (!argv || !*argv) bb_show_usage();
293 293
294 if (OPT_pgrp) setsid(); 294 if (OPT_pgrp) setsid();
295 if (env_dir) edir(env_dir); 295 if (env_dir) edir(env_dir);
296 if (root) { 296 if (root) {
diff --git a/runit/runit_lib.c b/runit/runit_lib.c
index 8612a1b94..b885a3412 100644
--- a/runit/runit_lib.c
+++ b/runit/runit_lib.c
@@ -84,7 +84,7 @@ int buffer_feed(buffer *s)
84int buffer_bget(buffer *s,char *buf,unsigned len) 84int buffer_bget(buffer *s,char *buf,unsigned len)
85{ 85{
86 int r; 86 int r;
87 87
88 if (s->p > 0) return getthis(s,buf,len); 88 if (s->p > 0) return getthis(s,buf,len);
89 if (s->n <= len) return oneread(s->op,s->fd,buf,s->n); 89 if (s->n <= len) return oneread(s->op,s->fd,buf,s->n);
90 r = buffer_feed(s); if (r <= 0) return r; 90 r = buffer_feed(s); if (r <= 0) return r;
@@ -94,7 +94,7 @@ int buffer_bget(buffer *s,char *buf,unsigned len)
94int buffer_get(buffer *s,char *buf,unsigned len) 94int buffer_get(buffer *s,char *buf,unsigned len)
95{ 95{
96 int r; 96 int r;
97 97
98 if (s->p > 0) return getthis(s,buf,len); 98 if (s->p > 0) return getthis(s,buf,len);
99 if (s->n <= len) return oneread(s->op,s->fd,buf,len); 99 if (s->n <= len) return oneread(s->op,s->fd,buf,len);
100 r = buffer_feed(s); if (r <= 0) return r; 100 r = buffer_feed(s); if (r <= 0) return r;
@@ -135,7 +135,7 @@ static int allwrite(int (*op)(int fd,char *buf,unsigned len),int fd,const char *
135int buffer_flush(buffer *s) 135int buffer_flush(buffer *s)
136{ 136{
137 int p; 137 int p;
138 138
139 p = s->p; 139 p = s->p;
140 if (!p) return 0; 140 if (!p) return 0;
141 s->p = 0; 141 s->p = 0;
@@ -145,7 +145,7 @@ int buffer_flush(buffer *s)
145int buffer_putalign(buffer *s,const char *buf,unsigned len) 145int buffer_putalign(buffer *s,const char *buf,unsigned len)
146{ 146{
147 unsigned n; 147 unsigned n;
148 148
149 while (len > (n = s->n - s->p)) { 149 while (len > (n = s->n - s->p)) {
150 memcpy(s->x + s->p,buf,n); 150 memcpy(s->x + s->p,buf,n);
151 s->p += n; 151 s->p += n;
@@ -162,7 +162,7 @@ int buffer_putalign(buffer *s,const char *buf,unsigned len)
162int buffer_put(buffer *s,const char *buf,unsigned len) 162int buffer_put(buffer *s,const char *buf,unsigned len)
163{ 163{
164 unsigned n; 164 unsigned n;
165 165
166 n = s->n; 166 n = s->n;
167 if (len > n - s->p) { 167 if (len > n - s->p) {
168 if (buffer_flush(s) == -1) return -1; 168 if (buffer_flush(s) == -1) return -1;
@@ -487,7 +487,7 @@ void taia_sub(struct taia *t,const struct taia *u,const struct taia *v)
487{ 487{
488 unsigned long unano = u->nano; 488 unsigned long unano = u->nano;
489 unsigned long uatto = u->atto; 489 unsigned long uatto = u->atto;
490 490
491 t->sec.x = u->sec.x - v->sec.x; 491 t->sec.x = u->sec.x - v->sec.x;
492 t->nano = unano - v->nano; 492 t->nano = unano - v->nano;
493 t->atto = uatto - v->atto; 493 t->atto = uatto - v->atto;
diff --git a/runit/runsv.c b/runit/runsv.c
index 9e117fe0a..aace041a8 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -300,7 +300,7 @@ static void startservice(struct svdir *s)
300 fatal_cannot("setup filedescriptor for ./log/run"); 300 fatal_cannot("setup filedescriptor for ./log/run");
301 close(logpipe[1]); 301 close(logpipe[1]);
302 if (chdir("./log") == -1) 302 if (chdir("./log") == -1)
303 fatal_cannot("change directory to ./log"); 303 fatal_cannot("change directory to ./log");
304 } else { 304 } else {
305 if (fd_copy(1, logpipe[1]) == -1) 305 if (fd_copy(1, logpipe[1]) == -1)
306 fatal_cannot("setup filedescriptor for ./run"); 306 fatal_cannot("setup filedescriptor for ./run");
@@ -405,7 +405,7 @@ int runsv_main(int argc, char **argv)
405 coe(selfpipe[1]); 405 coe(selfpipe[1]);
406 ndelay_on(selfpipe[0]); 406 ndelay_on(selfpipe[0]);
407 ndelay_on(selfpipe[1]); 407 ndelay_on(selfpipe[1]);
408 408
409 sig_block(sig_child); 409 sig_block(sig_child);
410 sig_catch(sig_child, s_child); 410 sig_catch(sig_child, s_child);
411 sig_block(sig_term); 411 sig_block(sig_term);
@@ -544,7 +544,7 @@ int runsv_main(int argc, char **argv)
544 for (;;) { 544 for (;;) {
545 int child; 545 int child;
546 int wstat; 546 int wstat;
547 547
548 child = wait_nohang(&wstat); 548 child = wait_nohang(&wstat);
549 if (!child) break; 549 if (!child) break;
550 if ((child == -1) && (errno != EINTR)) break; 550 if ((child == -1) && (errno != EINTR)) break;
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 9238eec82..3290da5e6 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -36,7 +36,7 @@ static void fatal2_cannot(char *m1, char *m2)
36static void warn3x(char *m1, char *m2, char *m3) 36static void warn3x(char *m1, char *m2, char *m3)
37{ 37{
38 bb_error_msg("%s: warning: %s%s%s", svdir, m1, m2, m3); 38 bb_error_msg("%s: warning: %s%s%s", svdir, m1, m2, m3);
39} 39}
40static void warn2_cannot(char *m1, char *m2) 40static void warn2_cannot(char *m1, char *m2)
41{ 41{
42 warn3x("cannot ", m1, m2); 42 warn3x("cannot ", m1, m2);
@@ -44,7 +44,7 @@ static void warn2_cannot(char *m1, char *m2)
44static void warnx(char *m1) 44static void warnx(char *m1)
45{ 45{
46 warn3x(m1, "", ""); 46 warn3x(m1, "", "");
47} 47}
48 48
49static void s_term(int sig_no) 49static void s_term(int sig_no)
50{ 50{
@@ -208,7 +208,7 @@ int runsvdir_main(int argc, char **argv)
208 } 208 }
209 } 209 }
210 curdir = open_read("."); 210 curdir = open_read(".");
211 if (curdir == -1) 211 if (curdir == -1)
212 fatal2_cannot("open current directory", ""); 212 fatal2_cannot("open current directory", "");
213 coe(curdir); 213 coe(curdir);
214 214
@@ -241,7 +241,7 @@ int runsvdir_main(int argc, char **argv)
241 /* wait at least a second */ 241 /* wait at least a second */
242 taia_uint(&deadline, 1); 242 taia_uint(&deadline, 1);
243 taia_add(&stampcheck, &now, &deadline); 243 taia_add(&stampcheck, &now, &deadline);
244 244
245 if (stat(svdir, &s) != -1) { 245 if (stat(svdir, &s) != -1) {
246 if (check || s.st_mtime != mtime 246 if (check || s.st_mtime != mtime
247 || s.st_ino != ino || s.st_dev != dev 247 || s.st_ino != ino || s.st_dev != dev
diff --git a/runit/sv.c b/runit/sv.c
index 9471d09a8..054053619 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -88,7 +88,7 @@ static unsigned svstatus_print(char *m)
88 int pid; 88 int pid;
89 int normallyup = 0; 89 int normallyup = 0;
90 struct stat s; 90 struct stat s;
91 91
92 if (stat("down", &s) == -1) { 92 if (stat("down", &s) == -1) {
93 if (errno != ENOENT) { 93 if (errno != ENOENT) {
94 bb_perror_msg(WARN"cannot stat %s/down", *service); 94 bb_perror_msg(WARN"cannot stat %s/down", *service);
diff --git a/runit/svlogd.c b/runit/svlogd.c
index c91f85fe1..b089c5498 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -141,7 +141,7 @@ static unsigned processorstart(struct logdir *ld)
141 sig_unblock(sig_term); 141 sig_unblock(sig_term);
142 sig_unblock(sig_alarm); 142 sig_unblock(sig_alarm);
143 sig_unblock(sig_hangup); 143 sig_unblock(sig_hangup);
144 144
145 if (verbose) 145 if (verbose)
146 bb_error_msg(INFO"processing: %s/%s", ld->name, ld->fnsave); 146 bb_error_msg(INFO"processing: %s/%s", ld->name, ld->fnsave);
147 fd = xopen(ld->fnsave, O_RDONLY|O_NDELAY); 147 fd = xopen(ld->fnsave, O_RDONLY|O_NDELAY);
@@ -549,12 +549,12 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
549 coe(ld->fdcur); 549 coe(ld->fdcur);
550 while (fchmod(ld->fdcur, 0644) == -1) 550 while (fchmod(ld->fdcur, 0644) == -1)
551 pause2cannot("set mode of current", ld->name); 551 pause2cannot("set mode of current", ld->name);
552 552
553 if (verbose) { 553 if (verbose) {
554 if (i == 0) bb_error_msg(INFO"append: %s/current", ld->name); 554 if (i == 0) bb_error_msg(INFO"append: %s/current", ld->name);
555 else bb_error_msg(INFO"new: %s/current", ld->name); 555 else bb_error_msg(INFO"new: %s/current", ld->name);
556 } 556 }
557 557
558 while (fchdir(fdwdir) == -1) 558 while (fchdir(fdwdir) == -1)
559 pause1cannot("change to initial working directory"); 559 pause1cannot("change to initial working directory");
560 return 1; 560 return 1;
@@ -569,7 +569,7 @@ static void logdirs_reopen(void)
569 tmaxflag = 0; 569 tmaxflag = 0;
570 taia_now(&now); 570 taia_now(&now);
571 for (l = 0; l < dirn; ++l) { 571 for (l = 0; l < dirn; ++l) {
572 logdir_close(&dir[l]); 572 logdir_close(&dir[l]);
573 if (logdir_open(&dir[l], fndir[l])) ok = 1; 573 if (logdir_open(&dir[l], fndir[l])) ok = 1;
574 } 574 }
575 if (!ok) fatalx("no functional log directories"); 575 if (!ok) fatalx("no functional log directories");