diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-13 09:08:27 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-13 09:08:27 +0100 |
commit | 6331cf059ccfdf35f4e5a505cbae885094cc41b0 (patch) | |
tree | ccb4b4f0d96d9636861a75f7fc6c97b8b15bd306 /runit/runsvdir.c | |
parent | f4fee418ae9f5308b4d32bc8d4e618f779f3203f (diff) | |
download | busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.tar.gz busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.tar.bz2 busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.zip |
*: use "can't" instead of "cannot"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'runit/runsvdir.c')
-rw-r--r-- | runit/runsvdir.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runit/runsvdir.c b/runit/runsvdir.c index 492c2a57b..f6aaeb7d4 100644 --- a/runit/runsvdir.c +++ b/runit/runsvdir.c | |||
@@ -73,7 +73,7 @@ struct globals { | |||
73 | 73 | ||
74 | static void fatal2_cannot(const char *m1, const char *m2) | 74 | static void fatal2_cannot(const char *m1, const char *m2) |
75 | { | 75 | { |
76 | bb_perror_msg_and_die("%s: fatal: cannot %s%s", svdir, m1, m2); | 76 | bb_perror_msg_and_die("%s: fatal: can't %s%s", svdir, m1, m2); |
77 | /* was exiting 100 */ | 77 | /* was exiting 100 */ |
78 | } | 78 | } |
79 | static void warn3x(const char *m1, const char *m2, const char *m3) | 79 | static void warn3x(const char *m1, const char *m2, const char *m3) |
@@ -82,7 +82,7 @@ static void warn3x(const char *m1, const char *m2, const char *m3) | |||
82 | } | 82 | } |
83 | static void warn2_cannot(const char *m1, const char *m2) | 83 | static void warn2_cannot(const char *m1, const char *m2) |
84 | { | 84 | { |
85 | warn3x("cannot ", m1, m2); | 85 | warn3x("can't ", m1, m2); |
86 | } | 86 | } |
87 | #if ENABLE_FEATURE_RUNSVDIR_LOG | 87 | #if ENABLE_FEATURE_RUNSVDIR_LOG |
88 | static void warnx(const char *m1) | 88 | static void warnx(const char *m1) |
@@ -256,14 +256,14 @@ int runsvdir_main(int argc UNUSED_PARAM, char **argv) | |||
256 | if (rploglen < 7) { | 256 | if (rploglen < 7) { |
257 | warnx("log must have at least seven characters"); | 257 | warnx("log must have at least seven characters"); |
258 | } else if (piped_pair(logpipe)) { | 258 | } else if (piped_pair(logpipe)) { |
259 | warnx("cannot create pipe for log"); | 259 | warnx("can't create pipe for log"); |
260 | } else { | 260 | } else { |
261 | close_on_exec_on(logpipe.rd); | 261 | close_on_exec_on(logpipe.rd); |
262 | close_on_exec_on(logpipe.wr); | 262 | close_on_exec_on(logpipe.wr); |
263 | ndelay_on(logpipe.rd); | 263 | ndelay_on(logpipe.rd); |
264 | ndelay_on(logpipe.wr); | 264 | ndelay_on(logpipe.wr); |
265 | if (dup2(logpipe.wr, 2) == -1) { | 265 | if (dup2(logpipe.wr, 2) == -1) { |
266 | warnx("cannot set filedescriptor for log"); | 266 | warnx("can't set filedescriptor for log"); |
267 | } else { | 267 | } else { |
268 | pfd[0].fd = logpipe.rd; | 268 | pfd[0].fd = logpipe.rd; |
269 | pfd[0].events = POLLIN; | 269 | pfd[0].events = POLLIN; |