diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-07-21 13:46:54 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-07-21 13:46:54 +0000 |
commit | a53de7f7c2cd3ac46b26642aafb1a573a096a80d (patch) | |
tree | 76b95b7a441628b3495f744bec5d862b5250f562 | |
parent | e1e5174942d4624e3abb8b98fe404afdbb4edad1 (diff) | |
download | busybox-w32-a53de7f7c2cd3ac46b26642aafb1a573a096a80d.tar.gz busybox-w32-a53de7f7c2cd3ac46b26642aafb1a573a096a80d.tar.bz2 busybox-w32-a53de7f7c2cd3ac46b26642aafb1a573a096a80d.zip |
- fix spelling
-rw-r--r-- | init/init.c | 12 | ||||
-rw-r--r-- | networking/httpd.c | 2 | ||||
-rw-r--r-- | runit/sv.c | 2 | ||||
-rw-r--r-- | runit/svlogd.c | 30 | ||||
-rw-r--r-- | shell/ash.c | 6 | ||||
-rw-r--r-- | shell/hush.c | 4 | ||||
-rw-r--r-- | shell/msh.c | 14 | ||||
-rw-r--r-- | util-linux/fdisk.c | 6 | ||||
-rw-r--r-- | util-linux/umount.c | 6 |
9 files changed, 41 insertions, 41 deletions
diff --git a/init/init.c b/init/init.c index e88b88262..9923558f4 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -276,7 +276,7 @@ static void open_stdio_to_tty(const char* tty_name, int exit_on_failure) | |||
276 | /* fd can be only < 0 or 0: */ | 276 | /* fd can be only < 0 or 0: */ |
277 | fd = device_open(tty_name, O_RDWR); | 277 | fd = device_open(tty_name, O_RDWR); |
278 | if (fd) { | 278 | if (fd) { |
279 | message(L_LOG | L_CONSOLE, "Can't open %s: %s", | 279 | message(L_LOG | L_CONSOLE, "can't open %s: %s", |
280 | tty_name, strerror(errno)); | 280 | tty_name, strerror(errno)); |
281 | if (exit_on_failure) | 281 | if (exit_on_failure) |
282 | _exit(EXIT_FAILURE); | 282 | _exit(EXIT_FAILURE); |
@@ -336,7 +336,7 @@ static void init_exec(const char *command) | |||
336 | ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/); | 336 | ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/); |
337 | } | 337 | } |
338 | BB_EXECVP(cmd[0] + dash, cmd); | 338 | BB_EXECVP(cmd[0] + dash, cmd); |
339 | message(L_LOG | L_CONSOLE, "Cannot run '%s': %s", cmd[0], strerror(errno)); | 339 | message(L_LOG | L_CONSOLE, "cannot run '%s': %s", cmd[0], strerror(errno)); |
340 | /* returns if execvp fails */ | 340 | /* returns if execvp fails */ |
341 | } | 341 | } |
342 | 342 | ||
@@ -357,7 +357,7 @@ static pid_t run(const struct init_action *a) | |||
357 | sigprocmask(SIG_SETMASK, &omask, NULL); | 357 | sigprocmask(SIG_SETMASK, &omask, NULL); |
358 | 358 | ||
359 | if (pid < 0) | 359 | if (pid < 0) |
360 | message(L_LOG | L_CONSOLE, "Can't fork"); | 360 | message(L_LOG | L_CONSOLE, "can't fork"); |
361 | if (pid) | 361 | if (pid) |
362 | return pid; | 362 | return pid; |
363 | 363 | ||
@@ -391,7 +391,7 @@ static pid_t run(const struct init_action *a) | |||
391 | /* Now fork off another process to just hang around */ | 391 | /* Now fork off another process to just hang around */ |
392 | pid = fork(); | 392 | pid = fork(); |
393 | if (pid < 0) { | 393 | if (pid < 0) { |
394 | message(L_LOG | L_CONSOLE, "Can't fork"); | 394 | message(L_LOG | L_CONSOLE, "can't fork"); |
395 | _exit(EXIT_FAILURE); | 395 | _exit(EXIT_FAILURE); |
396 | } | 396 | } |
397 | 397 | ||
@@ -412,7 +412,7 @@ static pid_t run(const struct init_action *a) | |||
412 | /* Use a temporary process to steal the controlling tty. */ | 412 | /* Use a temporary process to steal the controlling tty. */ |
413 | pid = fork(); | 413 | pid = fork(); |
414 | if (pid < 0) { | 414 | if (pid < 0) { |
415 | message(L_LOG | L_CONSOLE, "Can't fork"); | 415 | message(L_LOG | L_CONSOLE, "can't fork"); |
416 | _exit(EXIT_FAILURE); | 416 | _exit(EXIT_FAILURE); |
417 | } | 417 | } |
418 | if (pid == 0) { | 418 | if (pid == 0) { |
@@ -879,7 +879,7 @@ int init_main(int argc UNUSED_PARAM, char **argv) | |||
879 | BB_EXECVP(argv[0], argv); | 879 | BB_EXECVP(argv[0], argv); |
880 | } else if (enforce > 0) { | 880 | } else if (enforce > 0) { |
881 | /* SELinux in enforcing mode but load_policy failed */ | 881 | /* SELinux in enforcing mode but load_policy failed */ |
882 | message(L_CONSOLE, "Cannot load SELinux Policy. " | 882 | message(L_CONSOLE, "cannot load SELinux Policy. " |
883 | "Machine is in enforcing mode. Halting now."); | 883 | "Machine is in enforcing mode. Halting now."); |
884 | exit(EXIT_FAILURE); | 884 | exit(EXIT_FAILURE); |
885 | } | 885 | } |
diff --git a/networking/httpd.c b/networking/httpd.c index 66c6982bc..f7e044d27 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -1568,7 +1568,7 @@ static void send_file_and_exit(const char *url, int what) | |||
1568 | f = open(url, O_RDONLY); | 1568 | f = open(url, O_RDONLY); |
1569 | if (f < 0) { | 1569 | if (f < 0) { |
1570 | if (DEBUG) | 1570 | if (DEBUG) |
1571 | bb_perror_msg("cannot open '%s'", url); | 1571 | bb_perror_msg("can't open '%s'", url); |
1572 | /* Error pages are sent by using send_file_and_exit(SEND_BODY). | 1572 | /* Error pages are sent by using send_file_and_exit(SEND_BODY). |
1573 | * IOW: it is unsafe to call send_headers_and_exit | 1573 | * IOW: it is unsafe to call send_headers_and_exit |
1574 | * if what is SEND_BODY! Can recurse! */ | 1574 | * if what is SEND_BODY! Can recurse! */ |
diff --git a/runit/sv.c b/runit/sv.c index 1b92b9a23..532bdb87d 100644 --- a/runit/sv.c +++ b/runit/sv.c | |||
@@ -179,7 +179,7 @@ struct globals { | |||
179 | static void fatal_cannot(const char *m1) NORETURN; | 179 | static void fatal_cannot(const char *m1) NORETURN; |
180 | static void fatal_cannot(const char *m1) | 180 | static void fatal_cannot(const char *m1) |
181 | { | 181 | { |
182 | bb_perror_msg("fatal: cannot %s", m1); | 182 | bb_perror_msg("fatal: can't %s", m1); |
183 | _exit(151); | 183 | _exit(151); |
184 | } | 184 | } |
185 | 185 | ||
diff --git a/runit/svlogd.c b/runit/svlogd.c index 66b96b8de..960879513 100644 --- a/runit/svlogd.c +++ b/runit/svlogd.c | |||
@@ -145,12 +145,12 @@ static void pause_nomem(void) | |||
145 | } | 145 | } |
146 | static void pause1cannot(const char *m0) | 146 | static void pause1cannot(const char *m0) |
147 | { | 147 | { |
148 | bb_perror_msg(PAUSE"cannot %s", m0); | 148 | bb_perror_msg(PAUSE"can't %s", m0); |
149 | sleep(3); | 149 | sleep(3); |
150 | } | 150 | } |
151 | static void pause2cannot(const char *m0, const char *m1) | 151 | static void pause2cannot(const char *m0, const char *m1) |
152 | { | 152 | { |
153 | bb_perror_msg(PAUSE"cannot %s %s", m0, m1); | 153 | bb_perror_msg(PAUSE"can't %s %s", m0, m1); |
154 | sleep(3); | 154 | sleep(3); |
155 | } | 155 | } |
156 | 156 | ||
@@ -246,7 +246,7 @@ static void processorstart(struct logdir *ld) | |||
246 | fd = open_read("state"); | 246 | fd = open_read("state"); |
247 | if (fd == -1) { | 247 | if (fd == -1) { |
248 | if (errno != ENOENT) | 248 | if (errno != ENOENT) |
249 | bb_perror_msg_and_die(FATAL"cannot %s processor %s", "open state for", ld->name); | 249 | bb_perror_msg_and_die(FATAL"can't %s processor %s", "open state for", ld->name); |
250 | close(xopen("state", O_WRONLY|O_NDELAY|O_TRUNC|O_CREAT)); | 250 | close(xopen("state", O_WRONLY|O_NDELAY|O_TRUNC|O_CREAT)); |
251 | fd = xopen("state", O_RDONLY|O_NDELAY); | 251 | fd = xopen("state", O_RDONLY|O_NDELAY); |
252 | } | 252 | } |
@@ -260,7 +260,7 @@ static void processorstart(struct logdir *ld) | |||
260 | prog[2] = ld->processor; | 260 | prog[2] = ld->processor; |
261 | prog[3] = NULL; | 261 | prog[3] = NULL; |
262 | execv("/bin/sh", prog); | 262 | execv("/bin/sh", prog); |
263 | bb_perror_msg_and_die(FATAL"cannot %s processor %s", "run", ld->name); | 263 | bb_perror_msg_and_die(FATAL"can't %s processor %s", "run", ld->name); |
264 | } | 264 | } |
265 | ld->fnsave[26] = sv_ch; /* ...restore */ | 265 | ld->fnsave[26] = sv_ch; /* ...restore */ |
266 | ld->ppid = pid; | 266 | ld->ppid = pid; |
@@ -300,7 +300,7 @@ static unsigned processorstop(struct logdir *ld) | |||
300 | pause2cannot("set mode of processed", ld->name); | 300 | pause2cannot("set mode of processed", ld->name); |
301 | ld->fnsave[26] = 'u'; | 301 | ld->fnsave[26] = 'u'; |
302 | if (unlink(ld->fnsave) == -1) | 302 | if (unlink(ld->fnsave) == -1) |
303 | bb_error_msg(WARNING"cannot unlink: %s/%s", ld->name, ld->fnsave); | 303 | bb_error_msg(WARNING"can't unlink: %s/%s", ld->name, ld->fnsave); |
304 | while (rename("newstate", "state") == -1) | 304 | while (rename("newstate", "state") == -1) |
305 | pause2cannot("rename state", ld->name); | 305 | pause2cannot("rename state", ld->name); |
306 | if (verbose) | 306 | if (verbose) |
@@ -325,7 +325,7 @@ static void rmoldest(struct logdir *ld) | |||
325 | if ((f->d_name[0] == '@') && (strlen(f->d_name) == 27)) { | 325 | if ((f->d_name[0] == '@') && (strlen(f->d_name) == 27)) { |
326 | if (f->d_name[26] == 't') { | 326 | if (f->d_name[26] == 't') { |
327 | if (unlink(f->d_name) == -1) | 327 | if (unlink(f->d_name) == -1) |
328 | warn2("cannot unlink processor leftover", f->d_name); | 328 | warn2("can't unlink processor leftover", f->d_name); |
329 | } else { | 329 | } else { |
330 | ++n; | 330 | ++n; |
331 | if (strcmp(f->d_name, oldest) < 0) | 331 | if (strcmp(f->d_name, oldest) < 0) |
@@ -335,14 +335,14 @@ static void rmoldest(struct logdir *ld) | |||
335 | } | 335 | } |
336 | } | 336 | } |
337 | if (errno) | 337 | if (errno) |
338 | warn2("cannot read directory", ld->name); | 338 | warn2("can't read directory", ld->name); |
339 | closedir(d); | 339 | closedir(d); |
340 | 340 | ||
341 | if (ld->nmax && (n > ld->nmax)) { | 341 | if (ld->nmax && (n > ld->nmax)) { |
342 | if (verbose) | 342 | if (verbose) |
343 | bb_error_msg(INFO"delete: %s/%s", ld->name, oldest); | 343 | bb_error_msg(INFO"delete: %s/%s", ld->name, oldest); |
344 | if ((*oldest == '@') && (unlink(oldest) == -1)) | 344 | if ((*oldest == '@') && (unlink(oldest) == -1)) |
345 | warn2("cannot unlink oldest logfile", ld->name); | 345 | warn2("can't unlink oldest logfile", ld->name); |
346 | } | 346 | } |
347 | } | 347 | } |
348 | 348 | ||
@@ -451,7 +451,7 @@ static int buffer_pwrite(int n, char *s, unsigned len) | |||
451 | if (strcmp(f->d_name, oldest) < 0) | 451 | if (strcmp(f->d_name, oldest) < 0) |
452 | memcpy(oldest, f->d_name, 27); | 452 | memcpy(oldest, f->d_name, 27); |
453 | } | 453 | } |
454 | if (errno) warn2("cannot read directory, want remove old logfile", | 454 | if (errno) warn2("can't read directory, want remove old logfile", |
455 | ld->name); | 455 | ld->name); |
456 | closedir(d); | 456 | closedir(d); |
457 | errno = ENOSPC; | 457 | errno = ENOSPC; |
@@ -461,7 +461,7 @@ static int buffer_pwrite(int n, char *s, unsigned len) | |||
461 | ld->name, oldest); | 461 | ld->name, oldest); |
462 | errno = 0; | 462 | errno = 0; |
463 | if (unlink(oldest) == -1) { | 463 | if (unlink(oldest) == -1) { |
464 | warn2("cannot unlink oldest logfile", ld->name); | 464 | warn2("can't unlink oldest logfile", ld->name); |
465 | errno = ENOSPC; | 465 | errno = ENOSPC; |
466 | } | 466 | } |
467 | while (fchdir(fdwdir) == -1) | 467 | while (fchdir(fdwdir) == -1) |
@@ -518,13 +518,13 @@ static unsigned logdir_open(struct logdir *ld, const char *fn) | |||
518 | 518 | ||
519 | ld->fddir = open(fn, O_RDONLY|O_NDELAY); | 519 | ld->fddir = open(fn, O_RDONLY|O_NDELAY); |
520 | if (ld->fddir == -1) { | 520 | if (ld->fddir == -1) { |
521 | warn2("cannot open log directory", (char*)fn); | 521 | warn2("can't open log directory", (char*)fn); |
522 | return 0; | 522 | return 0; |
523 | } | 523 | } |
524 | close_on_exec_on(ld->fddir); | 524 | close_on_exec_on(ld->fddir); |
525 | if (fchdir(ld->fddir) == -1) { | 525 | if (fchdir(ld->fddir) == -1) { |
526 | logdir_close(ld); | 526 | logdir_close(ld); |
527 | warn2("cannot change directory", (char*)fn); | 527 | warn2("can't change directory", (char*)fn); |
528 | return 0; | 528 | return 0; |
529 | } | 529 | } |
530 | ld->fdlock = open("lock", O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600); | 530 | ld->fdlock = open("lock", O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600); |
@@ -532,7 +532,7 @@ static unsigned logdir_open(struct logdir *ld, const char *fn) | |||
532 | || (lock_exnb(ld->fdlock) == -1) | 532 | || (lock_exnb(ld->fdlock) == -1) |
533 | ) { | 533 | ) { |
534 | logdir_close(ld); | 534 | logdir_close(ld); |
535 | warn2("cannot lock directory", (char*)fn); | 535 | warn2("can't lock directory", (char*)fn); |
536 | while (fchdir(fdwdir) == -1) | 536 | while (fchdir(fdwdir) == -1) |
537 | pause1cannot("change to initial working directory"); | 537 | pause1cannot("change to initial working directory"); |
538 | return 0; | 538 | return 0; |
@@ -651,7 +651,7 @@ static unsigned logdir_open(struct logdir *ld, const char *fn) | |||
651 | } else { | 651 | } else { |
652 | if (errno != ENOENT) { | 652 | if (errno != ENOENT) { |
653 | logdir_close(ld); | 653 | logdir_close(ld); |
654 | warn2("cannot stat current", ld->name); | 654 | warn2("can't stat current", ld->name); |
655 | while (fchdir(fdwdir) == -1) | 655 | while (fchdir(fdwdir) == -1) |
656 | pause1cannot("change to initial working directory"); | 656 | pause1cannot("change to initial working directory"); |
657 | return 0; | 657 | return 0; |
@@ -754,7 +754,7 @@ static int buffer_pread(/*int fd, */char *s, unsigned len) | |||
754 | if (errno == EINTR) | 754 | if (errno == EINTR) |
755 | continue; | 755 | continue; |
756 | if (errno != EAGAIN) { | 756 | if (errno != EAGAIN) { |
757 | warn("cannot read standard input"); | 757 | warn("can't read standard input"); |
758 | break; | 758 | break; |
759 | } | 759 | } |
760 | /* else: EAGAIN - normal, repeat silently */ | 760 | /* else: EAGAIN - normal, repeat silently */ |
diff --git a/shell/ash.c b/shell/ash.c index 7a63fcec7..637ba0128 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -3534,7 +3534,7 @@ static void | |||
3534 | xtcsetpgrp(int fd, pid_t pgrp) | 3534 | xtcsetpgrp(int fd, pid_t pgrp) |
3535 | { | 3535 | { |
3536 | if (tcsetpgrp(fd, pgrp)) | 3536 | if (tcsetpgrp(fd, pgrp)) |
3537 | ash_msg_and_raise_error("cannot set tty process group (%m)"); | 3537 | ash_msg_and_raise_error("can't set tty process group (%m)"); |
3538 | } | 3538 | } |
3539 | 3539 | ||
3540 | /* | 3540 | /* |
@@ -4844,9 +4844,9 @@ openredirect(union node *redir) | |||
4844 | 4844 | ||
4845 | return f; | 4845 | return f; |
4846 | ecreate: | 4846 | ecreate: |
4847 | ash_msg_and_raise_error("cannot create %s: %s", fname, errmsg(errno, "nonexistent directory")); | 4847 | ash_msg_and_raise_error("can't create %s: %s", fname, errmsg(errno, "nonexistent directory")); |
4848 | eopen: | 4848 | eopen: |
4849 | ash_msg_and_raise_error("cannot open %s: %s", fname, errmsg(errno, "no such file")); | 4849 | ash_msg_and_raise_error("can't open %s: %s", fname, errmsg(errno, "no such file")); |
4850 | } | 4850 | } |
4851 | 4851 | ||
4852 | /* | 4852 | /* |
diff --git a/shell/hush.c b/shell/hush.c index 47cdf6f02..3dc27d9c2 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -1466,7 +1466,7 @@ static void pseudo_exec_argv(char **ptrs2free, char **argv) | |||
1466 | 1466 | ||
1467 | debug_printf_exec("execing '%s'\n", argv[0]); | 1467 | debug_printf_exec("execing '%s'\n", argv[0]); |
1468 | execvp(argv[0], argv); | 1468 | execvp(argv[0], argv); |
1469 | bb_perror_msg("cannot exec '%s'", argv[0]); | 1469 | bb_perror_msg("can't exec '%s'", argv[0]); |
1470 | _exit(EXIT_FAILURE); | 1470 | _exit(EXIT_FAILURE); |
1471 | } | 1471 | } |
1472 | 1472 | ||
@@ -4425,7 +4425,7 @@ static int builtin_source(char **argv) | |||
4425 | /* XXX search through $PATH is missing */ | 4425 | /* XXX search through $PATH is missing */ |
4426 | input = fopen(argv[1], "r"); | 4426 | input = fopen(argv[1], "r"); |
4427 | if (!input) { | 4427 | if (!input) { |
4428 | bb_error_msg("cannot open '%s'", argv[1]); | 4428 | bb_error_msg("can't open '%s'", argv[1]); |
4429 | return EXIT_FAILURE; | 4429 | return EXIT_FAILURE; |
4430 | } | 4430 | } |
4431 | close_on_exec_on(fileno(input)); | 4431 | close_on_exec_on(fileno(input)); |
diff --git a/shell/msh.c b/shell/msh.c index eb17eb668..0cb81fee7 100644 --- a/shell/msh.c +++ b/shell/msh.c | |||
@@ -1268,7 +1268,7 @@ static int newfile(char *s) | |||
1268 | f = open(s, O_RDONLY); | 1268 | f = open(s, O_RDONLY); |
1269 | if (f < 0) { | 1269 | if (f < 0) { |
1270 | prs(s); | 1270 | prs(s); |
1271 | err(": cannot open"); | 1271 | err(": can't open"); |
1272 | return 1; | 1272 | return 1; |
1273 | } | 1273 | } |
1274 | } | 1274 | } |
@@ -2770,7 +2770,7 @@ static int forkexec(struct op *t, int *pin, int *pout, int no_fork, char **wp) | |||
2770 | DBGPRINTF3(("FORKEXEC: calling vfork()...\n")); | 2770 | DBGPRINTF3(("FORKEXEC: calling vfork()...\n")); |
2771 | newpid = vfork(); | 2771 | newpid = vfork(); |
2772 | if (newpid == -1) { | 2772 | if (newpid == -1) { |
2773 | DBGPRINTF(("FORKEXEC: ERROR, cannot vfork()!\n")); | 2773 | DBGPRINTF(("FORKEXEC: ERROR, can't vfork()!\n")); |
2774 | return -1; | 2774 | return -1; |
2775 | } | 2775 | } |
2776 | 2776 | ||
@@ -2820,7 +2820,7 @@ static int forkexec(struct op *t, int *pin, int *pout, int no_fork, char **wp) | |||
2820 | if (iopp) { | 2820 | if (iopp) { |
2821 | if (bltin && bltin != doexec) { | 2821 | if (bltin && bltin != doexec) { |
2822 | prs(bltin_name); | 2822 | prs(bltin_name); |
2823 | err(": cannot redirect shell command"); | 2823 | err(": can't redirect shell command"); |
2824 | if (forked) | 2824 | if (forked) |
2825 | _exit(-1); | 2825 | _exit(-1); |
2826 | return -1; | 2826 | return -1; |
@@ -2840,7 +2840,7 @@ static int forkexec(struct op *t, int *pin, int *pout, int no_fork, char **wp) | |||
2840 | /* Builtin in pipe: disallowed */ | 2840 | /* Builtin in pipe: disallowed */ |
2841 | /* TODO: allow "exec"? */ | 2841 | /* TODO: allow "exec"? */ |
2842 | prs(bltin_name); | 2842 | prs(bltin_name); |
2843 | err(": cannot run builtin as part of pipe"); | 2843 | err(": can't run builtin as part of pipe"); |
2844 | if (forked) | 2844 | if (forked) |
2845 | _exit(-1); | 2845 | _exit(-1); |
2846 | return -1; | 2846 | return -1; |
@@ -2955,7 +2955,7 @@ static int iosetup(struct ioword *iop, int pipein, int pipeout) | |||
2955 | 2955 | ||
2956 | if (u < 0) { | 2956 | if (u < 0) { |
2957 | prs(cp); | 2957 | prs(cp); |
2958 | prs(": cannot "); | 2958 | prs(": can't "); |
2959 | warn(msg); | 2959 | warn(msg); |
2960 | return 1; | 2960 | return 1; |
2961 | } | 2961 | } |
@@ -3110,7 +3110,7 @@ static const char *rexecve(char *c, char **v, char **envp) | |||
3110 | return "not found"; | 3110 | return "not found"; |
3111 | } | 3111 | } |
3112 | exstat = 126; /* mimic bash */ | 3112 | exstat = 126; /* mimic bash */ |
3113 | return "cannot execute"; | 3113 | return "can't execute"; |
3114 | } | 3114 | } |
3115 | 3115 | ||
3116 | /* | 3116 | /* |
@@ -3996,7 +3996,7 @@ static int dollar(int quoted) | |||
3996 | switch (c) { | 3996 | switch (c) { |
3997 | case '=': | 3997 | case '=': |
3998 | if (isdigit(*s)) { | 3998 | if (isdigit(*s)) { |
3999 | err("cannot use ${...=...} with $n"); | 3999 | err("can't use ${...=...} with $n"); |
4000 | gflg = 1; | 4000 | gflg = 1; |
4001 | break; | 4001 | break; |
4002 | } | 4002 | } |
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index eeef18e2f..702567a71 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
@@ -83,9 +83,9 @@ struct partition { | |||
83 | unsigned char size4[4]; /* nr of sectors in partition */ | 83 | unsigned char size4[4]; /* nr of sectors in partition */ |
84 | } PACKED; | 84 | } PACKED; |
85 | 85 | ||
86 | static const char unable_to_open[] ALIGN1 = "cannot open %s"; | 86 | static const char unable_to_open[] ALIGN1 = "can't open %s"; |
87 | static const char unable_to_read[] ALIGN1 = "cannot read from %s"; | 87 | static const char unable_to_read[] ALIGN1 = "can't read from %s"; |
88 | static const char unable_to_seek[] ALIGN1 = "cannot seek on %s"; | 88 | static const char unable_to_seek[] ALIGN1 = "can't seek on %s"; |
89 | 89 | ||
90 | enum label_type { | 90 | enum label_type { |
91 | LABEL_DOS, LABEL_SUN, LABEL_SGI, LABEL_AIX, LABEL_OSF | 91 | LABEL_DOS, LABEL_SUN, LABEL_SGI, LABEL_AIX, LABEL_OSF |
diff --git a/util-linux/umount.c b/util-linux/umount.c index 00f125334..0662cea1b 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c | |||
@@ -69,7 +69,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv) | |||
69 | fp = setmntent(bb_path_mtab_file, "r"); | 69 | fp = setmntent(bb_path_mtab_file, "r"); |
70 | if (!fp) { | 70 | if (!fp) { |
71 | if (opt & OPT_ALL) | 71 | if (opt & OPT_ALL) |
72 | bb_error_msg_and_die("cannot open %s", bb_path_mtab_file); | 72 | bb_error_msg_and_die("can't open %s", bb_path_mtab_file); |
73 | } else { | 73 | } else { |
74 | while (getmntent_r(fp, &me, path, PATH_MAX)) { | 74 | while (getmntent_r(fp, &me, path, PATH_MAX)) { |
75 | /* Match fstype if passed */ | 75 | /* Match fstype if passed */ |
@@ -132,13 +132,13 @@ int umount_main(int argc UNUSED_PARAM, char **argv) | |||
132 | const char *msg = "%s busy - remounted read-only"; | 132 | const char *msg = "%s busy - remounted read-only"; |
133 | curstat = mount(m->device, zapit, NULL, MS_REMOUNT|MS_RDONLY, NULL); | 133 | curstat = mount(m->device, zapit, NULL, MS_REMOUNT|MS_RDONLY, NULL); |
134 | if (curstat) { | 134 | if (curstat) { |
135 | msg = "cannot remount %s read-only"; | 135 | msg = "can't remount %s read-only"; |
136 | status = EXIT_FAILURE; | 136 | status = EXIT_FAILURE; |
137 | } | 137 | } |
138 | bb_error_msg(msg, m->device); | 138 | bb_error_msg(msg, m->device); |
139 | } else { | 139 | } else { |
140 | status = EXIT_FAILURE; | 140 | status = EXIT_FAILURE; |
141 | bb_perror_msg("cannot %sumount %s", (doForce ? "forcibly " : ""), zapit); | 141 | bb_perror_msg("can't %sumount %s", (doForce ? "forcibly " : ""), zapit); |
142 | } | 142 | } |
143 | } else { | 143 | } else { |
144 | // De-allocate the loop device. This ioctl should be ignored on | 144 | // De-allocate the loop device. This ioctl should be ignored on |