diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-05-26 16:44:20 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-05-26 16:44:20 +0000 |
| commit | 5a6aeddfa7262e41802c77f70c9ef88e9c2c2476 (patch) | |
| tree | 36bf70fe7e6c67e4ab37c446a191272eb90097ed /runit | |
| parent | 6239b1f50a04121d96daba2cdc2f7c3765c9007b (diff) | |
| download | busybox-w32-5a6aeddfa7262e41802c77f70c9ef88e9c2c2476.tar.gz busybox-w32-5a6aeddfa7262e41802c77f70c9ef88e9c2c2476.tar.bz2 busybox-w32-5a6aeddfa7262e41802c77f70c9ef88e9c2c2476.zip | |
xpipe: introduce (saves ~170 bytes)
udhcp/signalpipe.c: use pipe instead of socketpair.
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/runsv.c | 5 | ||||
| -rw-r--r-- | runit/runsvdir.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/runit/runsv.c b/runit/runsv.c index bd4a81eee..d5bfd4e89 100644 --- a/runit/runsv.c +++ b/runit/runsv.c | |||
| @@ -420,7 +420,7 @@ int runsv_main(int argc, char **argv) | |||
| 420 | if (!argv[1] || argv[2]) usage(); | 420 | if (!argv[1] || argv[2]) usage(); |
| 421 | dir = argv[1]; | 421 | dir = argv[1]; |
| 422 | 422 | ||
| 423 | if (pipe(selfpipe) == -1) fatal_cannot("create selfpipe"); | 423 | xpipe(selfpipe); |
| 424 | coe(selfpipe[0]); | 424 | coe(selfpipe[0]); |
| 425 | coe(selfpipe[1]); | 425 | coe(selfpipe[1]); |
| 426 | ndelay_on(selfpipe[0]); | 426 | ndelay_on(selfpipe[0]); |
| @@ -456,8 +456,7 @@ int runsv_main(int argc, char **argv) | |||
| 456 | taia_now(&svd[1].start); | 456 | taia_now(&svd[1].start); |
| 457 | if (stat("log/down", &s) != -1) | 457 | if (stat("log/down", &s) != -1) |
| 458 | svd[1].want = W_DOWN; | 458 | svd[1].want = W_DOWN; |
| 459 | if (pipe(logpipe) == -1) | 459 | xpipe(logpipe); |
| 460 | fatal_cannot("create log pipe"); | ||
| 461 | coe(logpipe[0]); | 460 | coe(logpipe[0]); |
| 462 | coe(logpipe[1]); | 461 | coe(logpipe[1]); |
| 463 | } | 462 | } |
diff --git a/runit/runsvdir.c b/runit/runsvdir.c index 39929fc49..4b94aa211 100644 --- a/runit/runsvdir.c +++ b/runit/runsvdir.c | |||
| @@ -184,7 +184,7 @@ static int setup_log(void) | |||
| 184 | warnx("log must have at least seven characters"); | 184 | warnx("log must have at least seven characters"); |
| 185 | return 0; | 185 | return 0; |
| 186 | } | 186 | } |
| 187 | if (pipe(logpipe) == -1) { | 187 | if (pipe(logpipe)) { |
| 188 | warnx("cannot create pipe for log"); | 188 | warnx("cannot create pipe for log"); |
| 189 | return -1; | 189 | return -1; |
| 190 | } | 190 | } |