aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archival/dpkg.c4
-rw-r--r--archival/tar.c4
-rw-r--r--coreutils/date.c2
-rw-r--r--coreutils/id.c2
-rw-r--r--coreutils/libcoreutils/cp_mv_stat.c4
-rw-r--r--coreutils/md5_sha1_sum.c2
-rw-r--r--coreutils/mv.c6
-rw-r--r--coreutils/od_bloaty.c2
-rw-r--r--coreutils/rm.c2
-rw-r--r--coreutils/stat.c4
-rw-r--r--debianutils/start_stop_daemon.c2
-rw-r--r--e2fsprogs/fsck.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/resolve.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/e2fsck.c6
-rw-r--r--e2fsprogs/old_e2fsprogs/fsck.c6
-rw-r--r--e2fsprogs/old_e2fsprogs/mke2fs.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/tune2fs.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/util.c8
-rw-r--r--editors/ed.c4
-rw-r--r--editors/sed.c2
-rw-r--r--editors/vi.c2
-rw-r--r--findutils/xargs.c2
-rw-r--r--init/init.c4
-rw-r--r--libbb/copy_file.c40
-rw-r--r--libbb/kernel_version.c2
-rw-r--r--libbb/make_directory.c2
-rw-r--r--libbb/remove_file.c10
-rw-r--r--libbb/run_shell.c2
-rw-r--r--libbb/selinux_common.c2
-rw-r--r--libbb/xconnect.c4
-rw-r--r--loginutils/login.c2
-rw-r--r--loginutils/passwd.c4
-rw-r--r--miscutils/crond.c2
-rw-r--r--miscutils/crontab.c4
-rw-r--r--miscutils/time.c2
-rw-r--r--networking/ether-wake.c2
-rw-r--r--networking/ipcalc.c2
-rw-r--r--networking/libiproute/ipaddress.c2
-rw-r--r--networking/libiproute/iproute.c4
-rw-r--r--networking/libiproute/iptunnel.c6
-rw-r--r--networking/libiproute/libnetlink.c2
-rw-r--r--networking/libiproute/ll_map.c2
-rw-r--r--networking/nameif.c4
-rw-r--r--networking/tc.c2
-rw-r--r--networking/tcpudp.c12
-rw-r--r--networking/udhcp/arpping.c2
-rw-r--r--networking/udhcp/dhcpd.c2
-rw-r--r--networking/udhcp/options.c2
-rw-r--r--networking/udhcp/signalpipe.c2
-rw-r--r--networking/wget.c2
-rw-r--r--procps/kill.c4
-rw-r--r--procps/ps.c2
-rw-r--r--runit/runsvdir.c8
-rw-r--r--runit/sv.c26
-rw-r--r--selinux/chcon.c8
-rw-r--r--selinux/getsebool.c2
-rw-r--r--selinux/runcon.c4
-rw-r--r--util-linux/fsck_minix.c16
-rw-r--r--util-linux/ipcrm.c2
-rw-r--r--util-linux/mkfs_minix.c12
-rw-r--r--util-linux/mount.c4
-rw-r--r--util-linux/rdate.c2
-rw-r--r--util-linux/volume_id/volume_id.c2
63 files changed, 148 insertions, 148 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index a9334df87..451c6fa32 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -912,7 +912,7 @@ static void write_status_file(deb_file_t **deb_file)
912 /* Create a separate backfile to dpkg */ 912 /* Create a separate backfile to dpkg */
913 if (rename("/var/lib/dpkg/status", "/var/lib/dpkg/status.udeb.bak") == -1) { 913 if (rename("/var/lib/dpkg/status", "/var/lib/dpkg/status.udeb.bak") == -1) {
914 if (errno != ENOENT) 914 if (errno != ENOENT)
915 bb_error_msg_and_die("cannot create backup status file"); 915 bb_error_msg_and_die("can't create backup status file");
916 /* Its ok if renaming the status file fails because status 916 /* Its ok if renaming the status file fails because status
917 * file doesnt exist, maybe we are starting from scratch */ 917 * file doesnt exist, maybe we are starting from scratch */
918 bb_error_msg("no status file found, creating new one"); 918 bb_error_msg("no status file found, creating new one");
@@ -1646,7 +1646,7 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv)
1646 init_archive_deb_control(archive_handle); 1646 init_archive_deb_control(archive_handle);
1647 deb_file[deb_count]->control_file = deb_extract_control_file_to_buffer(archive_handle, control_list); 1647 deb_file[deb_count]->control_file = deb_extract_control_file_to_buffer(archive_handle, control_list);
1648 if (deb_file[deb_count]->control_file == NULL) { 1648 if (deb_file[deb_count]->control_file == NULL) {
1649 bb_error_msg_and_die("cannot extract control file"); 1649 bb_error_msg_and_die("can't extract control file");
1650 } 1650 }
1651 deb_file[deb_count]->filename = xstrdup(argv[0]); 1651 deb_file[deb_count]->filename = xstrdup(argv[0]);
1652 package_num = fill_package_struct(deb_file[deb_count]->control_file); 1652 package_num = fill_package_struct(deb_file[deb_count]->control_file);
diff --git a/archival/tar.c b/archival/tar.c
index 450402d3c..95982372d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -331,7 +331,7 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
331 if (sizeof(statbuf->st_size) > 4 331 if (sizeof(statbuf->st_size) > 4
332 && statbuf->st_size > (off_t)0777777777777LL 332 && statbuf->st_size > (off_t)0777777777777LL
333 ) { 333 ) {
334 bb_error_msg_and_die("cannot store file '%s' " 334 bb_error_msg_and_die("can't store file '%s' "
335 "of size %"OFF_FMT"d, aborting", 335 "of size %"OFF_FMT"d, aborting",
336 fileName, statbuf->st_size); 336 fileName, statbuf->st_size);
337 } 337 }
@@ -598,7 +598,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
598 /* Store the stat info for the tarball's file, so 598 /* Store the stat info for the tarball's file, so
599 * can avoid including the tarball into itself.... */ 599 * can avoid including the tarball into itself.... */
600 if (fstat(tbInfo.tarFd, &tbInfo.statBuf) < 0) 600 if (fstat(tbInfo.tarFd, &tbInfo.statBuf) < 0)
601 bb_perror_msg_and_die("cannot stat tar file"); 601 bb_perror_msg_and_die("can't stat tar file");
602 602
603#if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2 603#if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2
604 if (gzip) 604 if (gzip)
diff --git a/coreutils/date.c b/coreutils/date.c
index a230fe2b7..51200e64c 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -164,7 +164,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
164 164
165 /* if setting time, set it */ 165 /* if setting time, set it */
166 if ((opt & OPT_SET) && stime(&tm) < 0) { 166 if ((opt & OPT_SET) && stime(&tm) < 0) {
167 bb_perror_msg("cannot set date"); 167 bb_perror_msg("can't set date");
168 } 168 }
169 } 169 }
170 170
diff --git a/coreutils/id.c b/coreutils/id.c
index 6022c9fa4..ec9227d06 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -175,7 +175,7 @@ int id_main(int argc UNUSED_PARAM, char **argv)
175 } 175 }
176 } else if (n < 0) { /* error in get_groups() */ 176 } else if (n < 0) { /* error in get_groups() */
177 if (!ENABLE_DESKTOP) 177 if (!ENABLE_DESKTOP)
178 bb_error_msg_and_die("cannot get groups"); 178 bb_error_msg_and_die("can't get groups");
179 else 179 else
180 return EXIT_FAILURE; 180 return EXIT_FAILURE;
181 } 181 }
diff --git a/coreutils/libcoreutils/cp_mv_stat.c b/coreutils/libcoreutils/cp_mv_stat.c
index 0fd467c30..5ba07ecc3 100644
--- a/coreutils/libcoreutils/cp_mv_stat.c
+++ b/coreutils/libcoreutils/cp_mv_stat.c
@@ -29,11 +29,11 @@ int FAST_FUNC cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf)
29 if (errno != ENOENT) { 29 if (errno != ENOENT) {
30#if ENABLE_FEATURE_VERBOSE_CP_MESSAGE 30#if ENABLE_FEATURE_VERBOSE_CP_MESSAGE
31 if (errno == ENOTDIR) { 31 if (errno == ENOTDIR) {
32 bb_error_msg("cannot stat '%s': Path has non-directory component", fn); 32 bb_error_msg("can't stat '%s': Path has non-directory component", fn);
33 return -1; 33 return -1;
34 } 34 }
35#endif 35#endif
36 bb_perror_msg("cannot stat '%s'", fn); 36 bb_perror_msg("can't stat '%s'", fn);
37 return -1; 37 return -1;
38 } 38 }
39 return 0; 39 return 0;
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index a988b9cbf..a64026d3d 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -174,7 +174,7 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
174 } 174 }
175 /* 175 /*
176 if (fclose_if_not_stdin(pre_computed_stream) == EOF) { 176 if (fclose_if_not_stdin(pre_computed_stream) == EOF) {
177 bb_perror_msg_and_die("cannot close file %s", file_ptr); 177 bb_perror_msg_and_die("can't close file %s", file_ptr);
178 } 178 }
179 */ 179 */
180 } else { 180 } else {
diff --git a/coreutils/mv.c b/coreutils/mv.c
index be10b030a..1c5a46792 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -87,10 +87,10 @@ int mv_main(int argc, char **argv)
87 if (errno != EXDEV 87 if (errno != EXDEV
88 || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1 88 || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1
89 ) { 89 ) {
90 bb_perror_msg("cannot rename '%s'", *argv); 90 bb_perror_msg("can't rename '%s'", *argv);
91 } else { 91 } else {
92 static const char fmt[] ALIGN1 = 92 static const char fmt[] ALIGN1 =
93 "cannot overwrite %sdirectory with %sdirectory"; 93 "can't overwrite %sdirectory with %sdirectory";
94 94
95 if (dest_exists) { 95 if (dest_exists) {
96 if (dest_exists == 3) { 96 if (dest_exists == 3) {
@@ -105,7 +105,7 @@ int mv_main(int argc, char **argv)
105 } 105 }
106 } 106 }
107 if (unlink(dest) < 0) { 107 if (unlink(dest) < 0) {
108 bb_perror_msg("cannot remove '%s'", dest); 108 bb_perror_msg("can't remove '%s'", dest);
109 goto RET_1; 109 goto RET_1;
110 } 110 }
111 } 111 }
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 1d5769bd8..0c4740b47 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -807,7 +807,7 @@ skip(off_t n_skip)
807 } 807 }
808 808
809 if (n_skip) 809 if (n_skip)
810 bb_error_msg_and_die("cannot skip past end of combined input"); 810 bb_error_msg_and_die("can't skip past end of combined input");
811} 811}
812 812
813 813
diff --git a/coreutils/rm.c b/coreutils/rm.c
index 6b3fbcf25..3090cc323 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -42,7 +42,7 @@ int rm_main(int argc UNUSED_PARAM, char **argv)
42 const char *base = bb_get_last_path_component_strip(*argv); 42 const char *base = bb_get_last_path_component_strip(*argv);
43 43
44 if (DOT_OR_DOTDOT(base)) { 44 if (DOT_OR_DOTDOT(base)) {
45 bb_error_msg("cannot remove '.' or '..'"); 45 bb_error_msg("can't remove '.' or '..'");
46 } else if (remove_file(*argv, flags) >= 0) { 46 } else if (remove_file(*argv, flags) >= 0) {
47 continue; 47 continue;
48 } 48 }
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 44a03e5e7..2bc9a086c 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -383,7 +383,7 @@ static bool do_statfs(const char *filename, const char *format)
383 } 383 }
384#endif 384#endif
385 if (statfs(filename, &statfsbuf) != 0) { 385 if (statfs(filename, &statfsbuf) != 0) {
386 bb_perror_msg("cannot read file system information for '%s'", filename); 386 bb_perror_msg("can't read file system information for '%s'", filename);
387 return 0; 387 return 0;
388 } 388 }
389 389
@@ -495,7 +495,7 @@ static bool do_stat(const char *filename, const char *format)
495 } 495 }
496#endif 496#endif
497 if ((option_mask32 & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) { 497 if ((option_mask32 & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) {
498 bb_perror_msg("cannot stat '%s'", filename); 498 bb_perror_msg("can't stat '%s'", filename);
499 return 0; 499 return 0;
500 } 500 }
501 501
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 6726fc7c9..10da8dce4 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -443,5 +443,5 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
443 } 443 }
444#endif 444#endif
445 execvp(startas, argv); 445 execvp(startas, argv);
446 bb_perror_msg_and_die("cannot start %s", startas); 446 bb_perror_msg_and_die("can't start %s", startas);
447} 447}
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index 21b2fdc0d..fd0401b47 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -298,7 +298,7 @@ static void load_fs_info(const char *filename)
298 298
299 fstab = setmntent(filename, "r"); 299 fstab = setmntent(filename, "r");
300 if (!fstab) { 300 if (!fstab) {
301 bb_perror_msg("cannot read %s", filename); 301 bb_perror_msg("can't read %s", filename);
302 return; 302 return;
303 } 303 }
304 304
diff --git a/e2fsprogs/old_e2fsprogs/blkid/resolve.c b/e2fsprogs/old_e2fsprogs/blkid/resolve.c
index 7942de2cd..0f92158e2 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/resolve.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/resolve.c
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
121 exit(1); 121 exit(1);
122 } 122 }
123 if (blkid_get_cache(&cache, bb_dev_null) < 0) { 123 if (blkid_get_cache(&cache, bb_dev_null) < 0) {
124 fprintf(stderr, "cannot get blkid cache\n"); 124 fprintf(stderr, "Can't get blkid cache\n");
125 exit(1); 125 exit(1);
126 } 126 }
127 127
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 6531f5d16..c715d3e9a 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -9400,7 +9400,7 @@ static const struct e2fsck_problem problem_table[] = {
9400 9400
9401 /* Cannot proceed without a root inode. */ 9401 /* Cannot proceed without a root inode. */
9402 { PR_3_NO_ROOT_INODE_ABORT, 9402 { PR_3_NO_ROOT_INODE_ABORT,
9403 N_("Cannot proceed without a @r.\n"), 9403 N_("can't proceed without a @r.\n"),
9404 PROMPT_NONE, PR_FATAL }, 9404 PROMPT_NONE, PR_FATAL },
9405 9405
9406 /* Internal error: couldn't find dir_info */ 9406 /* Internal error: couldn't find dir_info */
@@ -12653,7 +12653,7 @@ static void check_mount(e2fsck_t ctx)
12653 12653
12654 printf(_("%s is mounted. "), ctx->filesystem_name); 12654 printf(_("%s is mounted. "), ctx->filesystem_name);
12655 if (!ctx->interactive) 12655 if (!ctx->interactive)
12656 bb_error_msg_and_die(_("cannot continue, aborting")); 12656 bb_error_msg_and_die(_("can't continue, aborting"));
12657 printf(_("\n\n\007\007\007\007WARNING!!! " 12657 printf(_("\n\n\007\007\007\007WARNING!!! "
12658 "Running e2fsck on a mounted filesystem may cause\n" 12658 "Running e2fsck on a mounted filesystem may cause\n"
12659 "SEVERE filesystem damage.\007\007\007\n\n")); 12659 "SEVERE filesystem damage.\007\007\007\n\n"));
@@ -13373,7 +13373,7 @@ restart:
13373 * happen, unless the hardware or 13373 * happen, unless the hardware or
13374 * device driver is being bogus. 13374 * device driver is being bogus.
13375 */ 13375 */
13376 bb_error_msg(_("cannot set superblock flags on %s"), ctx->device_name); 13376 bb_error_msg(_("can't set superblock flags on %s"), ctx->device_name);
13377 bb_error_msg_and_die(0); 13377 bb_error_msg_and_die(0);
13378 } 13378 }
13379 retval = e2fsck_run_ext3_journal(ctx); 13379 retval = e2fsck_run_ext3_journal(ctx);
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c
index 98e4e38fe..687938c24 100644
--- a/e2fsprogs/old_e2fsprogs/fsck.c
+++ b/e2fsprogs/old_e2fsprogs/fsck.c
@@ -1001,7 +1001,7 @@ static int ignore(struct fs_info *fs)
1001 s = find_fsck(fs->type); 1001 s = find_fsck(fs->type);
1002 if (s == NULL) { 1002 if (s == NULL) {
1003 if (wanted) 1003 if (wanted)
1004 bb_error_msg("cannot check %s: fsck.%s not found", 1004 bb_error_msg("can't check %s: fsck.%s not found",
1005 fs->device, fs->type); 1005 fs->device, fs->type);
1006 return 1; 1006 return 1;
1007 } 1007 }
@@ -1203,7 +1203,7 @@ static void PRS(int argc, char **argv)
1203 * /proc/partitions isn't found. 1203 * /proc/partitions isn't found.
1204 */ 1204 */
1205 if (access("/proc/partitions", R_OK) < 0) { 1205 if (access("/proc/partitions", R_OK) < 0) {
1206 bb_perror_msg_and_die("cannot open /proc/partitions " 1206 bb_perror_msg_and_die("can't open /proc/partitions "
1207 "(is /proc mounted?)"); 1207 "(is /proc mounted?)");
1208 } 1208 }
1209 /* 1209 /*
@@ -1215,7 +1215,7 @@ static void PRS(int argc, char **argv)
1215 "must be root to scan for matching filesystems: %s\n", arg); 1215 "must be root to scan for matching filesystems: %s\n", arg);
1216 else 1216 else
1217 bb_error_msg_and_die( 1217 bb_error_msg_and_die(
1218 "cannot find matching filesystem: %s", arg); 1218 "can't find matching filesystem: %s", arg);
1219 } 1219 }
1220 devices[num_devices++] = dev ? dev : string_copy(arg); 1220 devices[num_devices++] = dev ? dev : string_copy(arg);
1221 continue; 1221 continue;
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
index a1327437d..32f0329c3 100644
--- a/e2fsprogs/old_e2fsprogs/mke2fs.c
+++ b/e2fsprogs/old_e2fsprogs/mke2fs.c
@@ -245,7 +245,7 @@ static void test_disk(ext2_filsys fs, badblocks_list *bb_list)
245 mke2fs_verbose("Running command: %s\n", buf); 245 mke2fs_verbose("Running command: %s\n", buf);
246 f = popen(buf, "r"); 246 f = popen(buf, "r");
247 if (!f) { 247 if (!f) {
248 bb_perror_msg_and_die("cannot run '%s'", buf); 248 bb_perror_msg_and_die("can't run '%s'", buf);
249 } 249 }
250 retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block); 250 retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block);
251 pclose(f); 251 pclose(f);
@@ -1305,7 +1305,7 @@ int mke2fs_main (int argc, char **argv)
1305 retval = zero_blocks(fs, start, blocks - start, 1305 retval = zero_blocks(fs, start, blocks - start,
1306 NULL, &ret_blk, NULL); 1306 NULL, &ret_blk, NULL);
1307 1307
1308 mke2fs_warning_msg(retval, "cannot zero block %u at end of filesystem", ret_blk); 1308 mke2fs_warning_msg(retval, "can't zero block %u at end of filesystem", ret_blk);
1309 write_inode_tables(fs); 1309 write_inode_tables(fs);
1310 create_root_dir(fs); 1310 create_root_dir(fs);
1311 create_lost_and_found(fs); 1311 create_lost_and_found(fs);
diff --git a/e2fsprogs/old_e2fsprogs/tune2fs.c b/e2fsprogs/old_e2fsprogs/tune2fs.c
index 1d39ed1b0..00f8682a5 100644
--- a/e2fsprogs/old_e2fsprogs/tune2fs.c
+++ b/e2fsprogs/old_e2fsprogs/tune2fs.c
@@ -392,7 +392,7 @@ static time_t parse_time(char *str)
392 ts.tm_mday = 0; 392 ts.tm_mday = 0;
393#endif 393#endif
394 if (ts.tm_mday == 0) { 394 if (ts.tm_mday == 0) {
395 bb_error_msg_and_die("Cannot parse date/time specifier: %s", str); 395 bb_error_msg_and_die("can't parse date/time specifier: %s", str);
396 } 396 }
397 return mktime(&ts); 397 return mktime(&ts);
398} 398}
@@ -590,7 +590,7 @@ int tune2fs_main(int argc, char **argv)
590 } 590 }
591 retval = ext2fs_check_if_mounted(device_name, &mount_flags); 591 retval = ext2fs_check_if_mounted(device_name, &mount_flags);
592 if (retval) 592 if (retval)
593 bb_error_msg_and_die("cannot determine if %s is mounted", device_name); 593 bb_error_msg_and_die("can't determine if %s is mounted", device_name);
594 /* Normally we only need to write out the superblock */ 594 /* Normally we only need to write out the superblock */
595 fs->flags |= EXT2_FLAG_SUPER_ONLY; 595 fs->flags |= EXT2_FLAG_SUPER_ONLY;
596 596
diff --git a/e2fsprogs/old_e2fsprogs/util.c b/e2fsprogs/old_e2fsprogs/util.c
index 7ab6591d5..326492d49 100644
--- a/e2fsprogs/old_e2fsprogs/util.c
+++ b/e2fsprogs/old_e2fsprogs/util.c
@@ -35,7 +35,7 @@ void check_plausibility(const char *device, int force)
35 if (force) 35 if (force)
36 return; 36 return;
37 if (val == -1) 37 if (val == -1)
38 bb_perror_msg_and_die("cannot stat %s", device); 38 bb_perror_msg_and_die("can't stat %s", device);
39 if (!S_ISBLK(s.st_mode)) { 39 if (!S_ISBLK(s.st_mode)) {
40 printf("%s is not a block special device.\n", device); 40 printf("%s is not a block special device.\n", device);
41 proceed_question(); 41 proceed_question();
@@ -79,7 +79,7 @@ void check_mount(const char *device, int force, const char *type)
79 79
80 retval = ext2fs_check_if_mounted(device, &mount_flags); 80 retval = ext2fs_check_if_mounted(device, &mount_flags);
81 if (retval) { 81 if (retval) {
82 bb_error_msg("cannot determine if %s is mounted", device); 82 bb_error_msg("can't determine if %s is mounted", device);
83 return; 83 return;
84 } 84 }
85 if (mount_flags & EXT2_MF_MOUNTED) { 85 if (mount_flags & EXT2_MF_MOUNTED) {
@@ -216,7 +216,7 @@ void make_journal_device(char *journal_device, ext2_filsys fs, int quiet, int fo
216 EXT2_FLAG_JOURNAL_DEV_OK, 0, 216 EXT2_FLAG_JOURNAL_DEV_OK, 0,
217 fs->blocksize, io_ptr, &jfs); 217 fs->blocksize, io_ptr, &jfs);
218 if (retval) 218 if (retval)
219 bb_error_msg_and_die("cannot journal device %s", journal_device); 219 bb_error_msg_and_die("can't journal device %s", journal_device);
220 if (!quiet) 220 if (!quiet)
221 printf("Adding journal to device %s: ", journal_device); 221 printf("Adding journal to device %s: ", journal_device);
222 fflush(stdout); 222 fflush(stdout);
@@ -245,7 +245,7 @@ void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, in
245 retval = ext2fs_add_journal_inode(fs, journal_blocks, 245 retval = ext2fs_add_journal_inode(fs, journal_blocks,
246 journal_flags); 246 journal_flags);
247 if (retval) 247 if (retval)
248 bb_error_msg_and_die("cannot create journal"); 248 bb_error_msg_and_die("can't create journal");
249 if (!quiet) 249 if (!quiet)
250 puts("done"); 250 puts("done");
251} 251}
diff --git a/editors/ed.c b/editors/ed.c
index 8ed4cd42b..9ce8bead1 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -456,7 +456,7 @@ static void subCommand(const char *cmd, int num1, int num2)
456 */ 456 */
457 nlp = malloc(sizeof(LINE) + lp->len + deltaLen); 457 nlp = malloc(sizeof(LINE) + lp->len + deltaLen);
458 if (nlp == NULL) { 458 if (nlp == NULL) {
459 bb_error_msg("cannot get memory for line"); 459 bb_error_msg("can't get memory for line");
460 return; 460 return;
461 } 461 }
462 462
@@ -983,7 +983,7 @@ static NOINLINE int searchLines(const char *str, int num1, int num2)
983 lp = lp->next; 983 lp = lp->next;
984 } 984 }
985 985
986 bb_error_msg("cannot find string \"%s\"", str); 986 bb_error_msg("can't find string \"%s\"", str);
987 return 0; 987 return 0;
988} 988}
989 989
diff --git a/editors/sed.c b/editors/sed.c
index 27c345921..cc609c3f6 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1337,7 +1337,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
1337 G.outname = xasprintf("%sXXXXXX", argv[i]); 1337 G.outname = xasprintf("%sXXXXXX", argv[i]);
1338 nonstdoutfd = mkstemp(G.outname); 1338 nonstdoutfd = mkstemp(G.outname);
1339 if (-1 == nonstdoutfd) 1339 if (-1 == nonstdoutfd)
1340 bb_perror_msg_and_die("cannot create temp file %s", G.outname); 1340 bb_perror_msg_and_die("can't create temp file %s", G.outname);
1341 G.nonstdout = fdopen(nonstdoutfd, "w"); 1341 G.nonstdout = fdopen(nonstdoutfd, "w");
1342 1342
1343 /* Set permissions of output file */ 1343 /* Set permissions of output file */
diff --git a/editors/vi.c b/editors/vi.c
index 1a3997a6b..6a6722875 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2335,7 +2335,7 @@ static int file_insert(const char *fn, char *p, int update_ro_status)
2335 } else if (cnt < size) { 2335 } else if (cnt < size) {
2336 // There was a partial read, shrink unused space text[] 2336 // There was a partial read, shrink unused space text[]
2337 p = text_hole_delete(p + cnt, p + (size - cnt) - 1); // un-do buffer insert 2337 p = text_hole_delete(p + cnt, p + (size - cnt) - 1); // un-do buffer insert
2338 status_line_bold("cannot read all of file \"%s\"", fn); 2338 status_line_bold("can't read all of file \"%s\"", fn);
2339 } 2339 }
2340 if (cnt >= size) 2340 if (cnt >= size)
2341 file_modified++; 2341 file_modified++;
diff --git a/findutils/xargs.c b/findutils/xargs.c
index ab1a6d0a5..c7117771c 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -426,7 +426,7 @@ int xargs_main(int argc, char **argv)
426 n_chars += strlen(*argv) + 1; 426 n_chars += strlen(*argv) + 1;
427 } 427 }
428 if (n_max_chars < n_chars) { 428 if (n_max_chars < n_chars) {
429 bb_error_msg_and_die("cannot fit single argument within argument list size limit"); 429 bb_error_msg_and_die("can't fit single argument within argument list size limit");
430 } 430 }
431 n_max_chars -= n_chars; 431 n_max_chars -= n_chars;
432 } else { 432 } else {
diff --git a/init/init.c b/init/init.c
index 6bee8f35c..5240e47a5 100644
--- a/init/init.c
+++ b/init/init.c
@@ -305,7 +305,7 @@ static void init_exec(const char *command)
305 ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/); 305 ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/);
306 } 306 }
307 BB_EXECVP(cmd[0] + dash, cmd); 307 BB_EXECVP(cmd[0] + dash, cmd);
308 message(L_LOG | L_CONSOLE, "cannot run '%s': %s", cmd[0], strerror(errno)); 308 message(L_LOG | L_CONSOLE, "can't run '%s': %s", cmd[0], strerror(errno));
309 /* returns if execvp fails */ 309 /* returns if execvp fails */
310} 310}
311 311
@@ -899,7 +899,7 @@ int init_main(int argc UNUSED_PARAM, char **argv)
899 BB_EXECVP(argv[0], argv); 899 BB_EXECVP(argv[0], argv);
900 } else if (enforce > 0) { 900 } else if (enforce > 0) {
901 /* SELinux in enforcing mode but load_policy failed */ 901 /* SELinux in enforcing mode but load_policy failed */
902 message(L_CONSOLE, "cannot load SELinux Policy. " 902 message(L_CONSOLE, "can't load SELinux Policy. "
903 "Machine is in enforcing mode. Halting now."); 903 "Machine is in enforcing mode. Halting now.");
904 exit(EXIT_FAILURE); 904 exit(EXIT_FAILURE);
905 } 905 }
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index ae70cbc0a..ff298855d 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -30,12 +30,12 @@ static int ask_and_unlink(const char *dest, int flags)
30#if !ENABLE_FEATURE_NON_POSIX_CP 30#if !ENABLE_FEATURE_NON_POSIX_CP
31 if (!(flags & (FILEUTILS_FORCE|FILEUTILS_INTERACTIVE))) { 31 if (!(flags & (FILEUTILS_FORCE|FILEUTILS_INTERACTIVE))) {
32 /* Either it exists, or the *path* doesnt exist */ 32 /* Either it exists, or the *path* doesnt exist */
33 bb_perror_msg("cannot create '%s'", dest); 33 bb_perror_msg("can't create '%s'", dest);
34 return -1; 34 return -1;
35 } 35 }
36#endif 36#endif
37 // else: act as if -f is always in effect. 37 // else: act as if -f is always in effect.
38 // We don't want "cannot create" msg, we want unlink to be done 38 // We don't want "can't create" msg, we want unlink to be done
39 // (silently unless -i). Why? POSIX cp usually succeeds with 39 // (silently unless -i). Why? POSIX cp usually succeeds with
40 // O_TRUNC open of existing file, and user is left ignorantly happy. 40 // O_TRUNC open of existing file, and user is left ignorantly happy.
41 // With above block unconditionally enabled, non-POSIX cp 41 // With above block unconditionally enabled, non-POSIX cp
@@ -56,12 +56,12 @@ static int ask_and_unlink(const char *dest, int flags)
56 if (e == errno && e == ENOENT) { 56 if (e == errno && e == ENOENT) {
57 /* e == ENOTDIR is similar: path has non-dir component, 57 /* e == ENOTDIR is similar: path has non-dir component,
58 * but in this case we don't even reach copy_file() */ 58 * but in this case we don't even reach copy_file() */
59 bb_error_msg("cannot create '%s': Path does not exist", dest); 59 bb_error_msg("can't create '%s': Path does not exist", dest);
60 return -1; /* error */ 60 return -1; /* error */
61 } 61 }
62#endif 62#endif
63 errno = e; /* do not use errno from unlink */ 63 errno = e; /* do not use errno from unlink */
64 bb_perror_msg("cannot create '%s'", dest); 64 bb_perror_msg("can't create '%s'", dest);
65 return -1; /* error */ 65 return -1; /* error */
66 } 66 }
67 return 1; /* ok (to try again) */ 67 return 1; /* ok (to try again) */
@@ -90,13 +90,13 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
90 * Making [sym]links to dangling symlinks works, so... */ 90 * Making [sym]links to dangling symlinks works, so... */
91 if (flags & (FILEUTILS_MAKE_SOFTLINK|FILEUTILS_MAKE_HARDLINK)) 91 if (flags & (FILEUTILS_MAKE_SOFTLINK|FILEUTILS_MAKE_HARDLINK))
92 goto make_links; 92 goto make_links;
93 bb_perror_msg("cannot stat '%s'", source); 93 bb_perror_msg("can't stat '%s'", source);
94 return -1; 94 return -1;
95 } 95 }
96 96
97 if (lstat(dest, &dest_stat) < 0) { 97 if (lstat(dest, &dest_stat) < 0) {
98 if (errno != ENOENT) { 98 if (errno != ENOENT) {
99 bb_perror_msg("cannot stat '%s'", dest); 99 bb_perror_msg("can't stat '%s'", dest);
100 return -1; 100 return -1;
101 } 101 }
102 } else { 102 } else {
@@ -114,14 +114,14 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
114 security_context_t con; 114 security_context_t con;
115 if (lgetfilecon(source, &con) >= 0) { 115 if (lgetfilecon(source, &con) >= 0) {
116 if (setfscreatecon(con) < 0) { 116 if (setfscreatecon(con) < 0) {
117 bb_perror_msg("cannot set setfscreatecon %s", con); 117 bb_perror_msg("can't set setfscreatecon %s", con);
118 freecon(con); 118 freecon(con);
119 return -1; 119 return -1;
120 } 120 }
121 } else if (errno == ENOTSUP || errno == ENODATA) { 121 } else if (errno == ENOTSUP || errno == ENODATA) {
122 setfscreatecon_or_die(NULL); 122 setfscreatecon_or_die(NULL);
123 } else { 123 } else {
124 bb_perror_msg("cannot lgetfilecon %s", source); 124 bb_perror_msg("can't lgetfilecon %s", source);
125 return -1; 125 return -1;
126 } 126 }
127 } 127 }
@@ -166,13 +166,13 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
166 mode |= S_IRWXU; 166 mode |= S_IRWXU;
167 if (mkdir(dest, mode) < 0) { 167 if (mkdir(dest, mode) < 0) {
168 umask(saved_umask); 168 umask(saved_umask);
169 bb_perror_msg("cannot create directory '%s'", dest); 169 bb_perror_msg("can't create directory '%s'", dest);
170 return -1; 170 return -1;
171 } 171 }
172 umask(saved_umask); 172 umask(saved_umask);
173 /* need stat info for add_to_ino_dev_hashtable */ 173 /* need stat info for add_to_ino_dev_hashtable */
174 if (lstat(dest, &dest_stat) < 0) { 174 if (lstat(dest, &dest_stat) < 0) {
175 bb_perror_msg("cannot stat '%s'", dest); 175 bb_perror_msg("can't stat '%s'", dest);
176 return -1; 176 return -1;
177 } 177 }
178 } 178 }
@@ -204,7 +204,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
204 if (!dest_exists 204 if (!dest_exists
205 && chmod(dest, source_stat.st_mode & ~saved_umask) < 0 205 && chmod(dest, source_stat.st_mode & ~saved_umask) < 0
206 ) { 206 ) {
207 bb_perror_msg("cannot preserve %s of '%s'", "permissions", dest); 207 bb_perror_msg("can't preserve %s of '%s'", "permissions", dest);
208 /* retval = -1; - WRONG! copy *WAS* made */ 208 /* retval = -1; - WRONG! copy *WAS* made */
209 } 209 }
210 goto preserve_mode_ugid_time; 210 goto preserve_mode_ugid_time;
@@ -222,7 +222,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
222 if (ovr <= 0) 222 if (ovr <= 0)
223 return ovr; 223 return ovr;
224 if (lf(source, dest) < 0) { 224 if (lf(source, dest) < 0) {
225 bb_perror_msg("cannot create link '%s'", dest); 225 bb_perror_msg("can't create link '%s'", dest);
226 return -1; 226 return -1;
227 } 227 }
228 } 228 }
@@ -257,7 +257,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
257 if (ovr <= 0) 257 if (ovr <= 0)
258 return ovr; 258 return ovr;
259 if (link(link_target, dest) < 0) { 259 if (link(link_target, dest) < 0) {
260 bb_perror_msg("cannot create link '%s'", dest); 260 bb_perror_msg("can't create link '%s'", dest);
261 return -1; 261 return -1;
262 } 262 }
263 } 263 }
@@ -318,7 +318,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
318 retval = -1; 318 retval = -1;
319 /* Ok, writing side I can understand... */ 319 /* Ok, writing side I can understand... */
320 if (close(dst_fd) < 0) { 320 if (close(dst_fd) < 0) {
321 bb_perror_msg("cannot close '%s'", dest); 321 bb_perror_msg("can't close '%s'", dest);
322 retval = -1; 322 retval = -1;
323 } 323 }
324 /* ...but read size is already checked by bb_copyfd_eof */ 324 /* ...but read size is already checked by bb_copyfd_eof */
@@ -345,12 +345,12 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
345 int r = symlink(lpath, dest); 345 int r = symlink(lpath, dest);
346 free(lpath); 346 free(lpath);
347 if (r < 0) { 347 if (r < 0) {
348 bb_perror_msg("cannot create symlink '%s'", dest); 348 bb_perror_msg("can't create symlink '%s'", dest);
349 return -1; 349 return -1;
350 } 350 }
351 if (flags & FILEUTILS_PRESERVE_STATUS) 351 if (flags & FILEUTILS_PRESERVE_STATUS)
352 if (lchown(dest, source_stat.st_uid, source_stat.st_gid) < 0) 352 if (lchown(dest, source_stat.st_uid, source_stat.st_gid) < 0)
353 bb_perror_msg("cannot preserve %s of '%s'", "ownership", dest); 353 bb_perror_msg("can't preserve %s of '%s'", "ownership", dest);
354 } 354 }
355 /* _Not_ jumping to preserve_mode_ugid_time: 355 /* _Not_ jumping to preserve_mode_ugid_time:
356 * symlinks don't have those */ 356 * symlinks don't have those */
@@ -360,7 +360,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
360 || S_ISSOCK(source_stat.st_mode) || S_ISFIFO(source_stat.st_mode) 360 || S_ISSOCK(source_stat.st_mode) || S_ISFIFO(source_stat.st_mode)
361 ) { 361 ) {
362 if (mknod(dest, source_stat.st_mode, source_stat.st_rdev) < 0) { 362 if (mknod(dest, source_stat.st_mode, source_stat.st_rdev) < 0) {
363 bb_perror_msg("cannot create '%s'", dest); 363 bb_perror_msg("can't create '%s'", dest);
364 return -1; 364 return -1;
365 } 365 }
366 } else { 366 } else {
@@ -380,13 +380,13 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
380 times.modtime = source_stat.st_mtime; 380 times.modtime = source_stat.st_mtime;
381 /* BTW, utimes sets usec-precision time - just FYI */ 381 /* BTW, utimes sets usec-precision time - just FYI */
382 if (utime(dest, &times) < 0) 382 if (utime(dest, &times) < 0)
383 bb_perror_msg("cannot preserve %s of '%s'", "times", dest); 383 bb_perror_msg("can't preserve %s of '%s'", "times", dest);
384 if (chown(dest, source_stat.st_uid, source_stat.st_gid) < 0) { 384 if (chown(dest, source_stat.st_uid, source_stat.st_gid) < 0) {
385 source_stat.st_mode &= ~(S_ISUID | S_ISGID); 385 source_stat.st_mode &= ~(S_ISUID | S_ISGID);
386 bb_perror_msg("cannot preserve %s of '%s'", "ownership", dest); 386 bb_perror_msg("can't preserve %s of '%s'", "ownership", dest);
387 } 387 }
388 if (chmod(dest, source_stat.st_mode) < 0) 388 if (chmod(dest, source_stat.st_mode) < 0)
389 bb_perror_msg("cannot preserve %s of '%s'", "permissions", dest); 389 bb_perror_msg("can't preserve %s of '%s'", "permissions", dest);
390 } 390 }
391 391
392 return retval; 392 return retval;
diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index 937d2dbfb..cc237120d 100644
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -24,7 +24,7 @@ int FAST_FUNC get_linux_version_code(void)
24 int i, r; 24 int i, r;
25 25
26 if (uname(&name) == -1) { 26 if (uname(&name) == -1) {
27 bb_perror_msg("cannot get system information"); 27 bb_perror_msg("can't get system information");
28 return 0; 28 return 0;
29 } 29 }
30 30
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 391493cda..a4ad59975 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -93,6 +93,6 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
93 *s = c; 93 *s = c;
94 } /* while (1) */ 94 } /* while (1) */
95 95
96 bb_perror_msg("cannot %s directory '%s'", fail_msg, path); 96 bb_perror_msg("can't %s directory '%s'", fail_msg, path);
97 return -1; 97 return -1;
98} 98}
diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index 8b14f07c9..da1488544 100644
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -17,11 +17,11 @@ int FAST_FUNC remove_file(const char *path, int flags)
17 17
18 if (lstat(path, &path_stat) < 0) { 18 if (lstat(path, &path_stat) < 0) {
19 if (errno != ENOENT) { 19 if (errno != ENOENT) {
20 bb_perror_msg("cannot stat '%s'", path); 20 bb_perror_msg("can't stat '%s'", path);
21 return -1; 21 return -1;
22 } 22 }
23 if (!(flags & FILEUTILS_FORCE)) { 23 if (!(flags & FILEUTILS_FORCE)) {
24 bb_perror_msg("cannot remove '%s'", path); 24 bb_perror_msg("can't remove '%s'", path);
25 return -1; 25 return -1;
26 } 26 }
27 return 0; 27 return 0;
@@ -63,7 +63,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
63 } 63 }
64 64
65 if (closedir(dp) < 0) { 65 if (closedir(dp) < 0) {
66 bb_perror_msg("cannot close '%s'", path); 66 bb_perror_msg("can't close '%s'", path);
67 return -1; 67 return -1;
68 } 68 }
69 69
@@ -74,7 +74,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
74 } 74 }
75 75
76 if (rmdir(path) < 0) { 76 if (rmdir(path) < 0) {
77 bb_perror_msg("cannot remove '%s'", path); 77 bb_perror_msg("can't remove '%s'", path);
78 return -1; 78 return -1;
79 } 79 }
80 80
@@ -94,7 +94,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
94 } 94 }
95 95
96 if (unlink(path) < 0) { 96 if (unlink(path) < 0) {
97 bb_perror_msg("cannot remove '%s'", path); 97 bb_perror_msg("can't remove '%s'", path);
98 return -1; 98 return -1;
99 } 99 }
100 100
diff --git a/libbb/run_shell.c b/libbb/run_shell.c
index 2ccb3a12c..de7b92ab2 100644
--- a/libbb/run_shell.c
+++ b/libbb/run_shell.c
@@ -86,5 +86,5 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command,
86 freecon(current_sid); 86 freecon(current_sid);
87#endif 87#endif
88 execv(shell, (char **) args); 88 execv(shell, (char **) args);
89 bb_perror_msg_and_die("cannot run %s", shell); 89 bb_perror_msg_and_die("can't run %s", shell);
90} 90}
diff --git a/libbb/selinux_common.c b/libbb/selinux_common.c
index 275a761d2..7b5696754 100644
--- a/libbb/selinux_common.c
+++ b/libbb/selinux_common.c
@@ -36,7 +36,7 @@ void FAST_FUNC setfscreatecon_or_die(security_context_t scontext)
36 if (setfscreatecon(scontext) < 0) { 36 if (setfscreatecon(scontext) < 0) {
37 /* Can be NULL. All known printf implementations 37 /* Can be NULL. All known printf implementations
38 * display "(null)", "<null>" etc */ 38 * display "(null)", "<null>" etc */
39 bb_perror_msg_and_die("cannot set default " 39 bb_perror_msg_and_die("can't set default "
40 "file creation context to %s", scontext); 40 "file creation context to %s", scontext);
41 } 41 }
42} 42}
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index a18466935..f018ca9d9 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -63,9 +63,9 @@ void FAST_FUNC xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
63 close(s); 63 close(s);
64 if (s_addr->sa_family == AF_INET) 64 if (s_addr->sa_family == AF_INET)
65 bb_perror_msg_and_die("%s (%s)", 65 bb_perror_msg_and_die("%s (%s)",
66 "cannot connect to remote host", 66 "can't connect to remote host",
67 inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr)); 67 inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr));
68 bb_perror_msg_and_die("cannot connect to remote host"); 68 bb_perror_msg_and_die("can't connect to remote host");
69 } 69 }
70} 70}
71 71
diff --git a/loginutils/login.c b/loginutils/login.c
index 1ffa965c2..7a6f246ad 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -175,7 +175,7 @@ static void initselinux(char *username, char *full_tty,
175 return; 175 return;
176 176
177 if (get_default_context(username, NULL, user_sid)) { 177 if (get_default_context(username, NULL, user_sid)) {
178 bb_error_msg_and_die("cannot get SID for %s", username); 178 bb_error_msg_and_die("can't get SID for %s", username);
179 } 179 }
180 if (getfilecon(full_tty, &old_tty_sid) < 0) { 180 if (getfilecon(full_tty, &old_tty_sid) < 0) {
181 bb_perror_msg_and_die("getfilecon(%s) failed", full_tty); 181 bb_perror_msg_and_die("getfilecon(%s) failed", full_tty);
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 1164ff4f9..c1481c65e 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -146,7 +146,7 @@ int passwd_main(int argc UNUSED_PARAM, char **argv)
146 if (!(opt & OPT_lud)) { 146 if (!(opt & OPT_lud)) {
147 if (myuid && !c) { /* passwd starts with '!' */ 147 if (myuid && !c) { /* passwd starts with '!' */
148 /* LOGMODE_BOTH */ 148 /* LOGMODE_BOTH */
149 bb_error_msg_and_die("cannot change " 149 bb_error_msg_and_die("can't change "
150 "locked password for %s", name); 150 "locked password for %s", name);
151 } 151 }
152 printf("Changing password for %s\n", name); 152 printf("Changing password for %s\n", name);
@@ -189,7 +189,7 @@ int passwd_main(int argc UNUSED_PARAM, char **argv)
189 } 189 }
190 /* LOGMODE_BOTH */ 190 /* LOGMODE_BOTH */
191 if (rc < 0) 191 if (rc < 0)
192 bb_error_msg_and_die("cannot update password file %s", 192 bb_error_msg_and_die("can't update password file %s",
193 filename); 193 filename);
194 bb_info_msg("Password for %s changed by %s", name, myname); 194 bb_info_msg("Password for %s changed by %s", name, myname);
195 195
diff --git a/miscutils/crond.c b/miscutils/crond.c
index 74bf9168b..8e4f0bfd6 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -834,7 +834,7 @@ static void RunJob(const char *user, CronLine *line)
834 line->cl_Shell); 834 line->cl_Shell);
835 line->cl_MailPos = lseek(mailFd, 0, SEEK_CUR); 835 line->cl_MailPos = lseek(mailFd, 0, SEEK_CUR);
836 } else { 836 } else {
837 crondlog(ERR20 "cannot create mail file %s for user %s, " 837 crondlog(ERR20 "can't create mail file %s for user %s, "
838 "discarding output", mailFile, user); 838 "discarding output", mailFile, user);
839 } 839 }
840 } 840 }
diff --git a/miscutils/crontab.c b/miscutils/crontab.c
index 34b80ea37..67b10f684 100644
--- a/miscutils/crontab.c
+++ b/miscutils/crontab.c
@@ -193,7 +193,7 @@ int crontab_main(int argc UNUSED_PARAM, char **argv)
193 close(fd); 193 close(fd);
194 xrename(new_fname, pas->pw_name); 194 xrename(new_fname, pas->pw_name);
195 } else { 195 } else {
196 bb_error_msg("cannot create %s/%s", 196 bb_error_msg("can't create %s/%s",
197 crontab_dir, new_fname); 197 crontab_dir, new_fname);
198 } 198 }
199 if (tmp_fname) 199 if (tmp_fname)
@@ -220,7 +220,7 @@ int crontab_main(int argc UNUSED_PARAM, char **argv)
220 /* loop */ 220 /* loop */
221 } 221 }
222 if (fd < 0) { 222 if (fd < 0) {
223 bb_error_msg("cannot append to %s/%s", 223 bb_error_msg("can't append to %s/%s",
224 crontab_dir, CRONUPDATE); 224 crontab_dir, CRONUPDATE);
225 } 225 }
226 return 0; 226 return 0;
diff --git a/miscutils/time.c b/miscutils/time.c
index 30298fe32..42c812a42 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -380,7 +380,7 @@ static void run_command(char *const *cmd, resource_t *resp)
380 versus merely warnings if the cast is left off. */ 380 versus merely warnings if the cast is left off. */
381 BB_EXECVP(cmd[0], cmd); 381 BB_EXECVP(cmd[0], cmd);
382 xfunc_error_retval = (errno == ENOENT ? 127 : 126); 382 xfunc_error_retval = (errno == ENOENT ? 127 : 126);
383 bb_error_msg_and_die("cannot run %s", cmd[0]); 383 bb_error_msg_and_die("can't run %s", cmd[0]);
384 } 384 }
385 385
386 /* Have signals kill the child but not self (if possible). */ 386 /* Have signals kill the child but not self (if possible). */
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 59f40535c..e05db7a80 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -167,7 +167,7 @@ static int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
167 byte_cnt = sscanf(ethoptarg, "%u.%u.%u.%u", 167 byte_cnt = sscanf(ethoptarg, "%u.%u.%u.%u",
168 &passwd[0], &passwd[1], &passwd[2], &passwd[3]); 168 &passwd[0], &passwd[1], &passwd[2], &passwd[3]);
169 if (byte_cnt < 4) { 169 if (byte_cnt < 4) {
170 bb_error_msg("cannot read Wake-On-LAN pass"); 170 bb_error_msg("can't read Wake-On-LAN pass");
171 return 0; 171 return 0;
172 } 172 }
173// TODO: check invalid numbers >255?? 173// TODO: check invalid numbers >255??
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index b5cc3dec4..18abc12eb 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -178,7 +178,7 @@ int ipcalc_main(int argc, char **argv)
178 178
179 hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET); 179 hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
180 if (!hostinfo) { 180 if (!hostinfo) {
181 bb_herror_msg_and_die("cannot find hostname for %s", argv[0]); 181 bb_herror_msg_and_die("can't find hostname for %s", argv[0]);
182 } 182 }
183 str_tolower(hostinfo->h_name); 183 str_tolower(hostinfo->h_name);
184 184
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index fcf9623e4..c450c6a9f 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -426,7 +426,7 @@ int ipaddr_list_or_flush(char **argv, int flush)
426 bb_error_msg_and_die(bb_msg_requires_arg, "flush"); 426 bb_error_msg_and_die(bb_msg_requires_arg, "flush");
427 } 427 }
428 if (filter.family == AF_PACKET) { 428 if (filter.family == AF_PACKET) {
429 bb_error_msg_and_die("cannot flush link addresses"); 429 bb_error_msg_and_die("can't flush link addresses");
430 } 430 }
431 } 431 }
432 432
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 7031bed34..67eb90b84 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -499,7 +499,7 @@ static void iproute_flush_cache(void)
499 } 499 }
500 500
501 if (write(flush_fd, "-1", 2) < 2) { 501 if (write(flush_fd, "-1", 2) < 2) {
502 bb_perror_msg("cannot flush routing cache"); 502 bb_perror_msg("can't flush routing cache");
503 return; 503 return;
504 } 504 }
505 close(flush_fd); 505 close(flush_fd);
@@ -681,7 +681,7 @@ static int iproute_list_or_flush(char **argv, int flush)
681 if (filter.tb != -1) { 681 if (filter.tb != -1) {
682 xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE); 682 xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE);
683 } else if (rtnl_rtcache_request(&rth, do_ipv6) < 0) { 683 } else if (rtnl_rtcache_request(&rth, do_ipv6) < 0) {
684 bb_perror_msg_and_die("cannot send dump request"); 684 bb_perror_msg_and_die("can't send dump request");
685 } 685 }
686 xrtnl_dump_filter(&rth, print_route, NULL); 686 xrtnl_dump_filter(&rth, print_route, NULL);
687 687
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 836709c7e..67afd1bfd 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -222,7 +222,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p)
222 } 222 }
223 p->iph.protocol = IPPROTO_IPV6; 223 p->iph.protocol = IPPROTO_IPV6;
224 } else { 224 } else {
225 bb_error_msg_and_die("%s tunnel mode", "cannot guess"); 225 bb_error_msg_and_die("%s tunnel mode", "can't guess");
226 } 226 }
227 } else if (key == ARG_key) { 227 } else if (key == ARG_key) {
228 unsigned uval; 228 unsigned uval;
@@ -377,7 +377,7 @@ static int do_add(int cmd, char **argv)
377 case IPPROTO_IPV6: 377 case IPPROTO_IPV6:
378 return do_add_ioctl(cmd, "sit0", &p); 378 return do_add_ioctl(cmd, "sit0", &p);
379 default: 379 default:
380 bb_error_msg_and_die("cannot determine tunnel mode (ipip, gre or sit)"); 380 bb_error_msg_and_die("can't determine tunnel mode (ipip, gre or sit)");
381 } 381 }
382} 382}
383 383
@@ -499,7 +499,7 @@ static void do_tunnels_list(struct ip_tunnel_parm *p)
499 continue; 499 continue;
500 type = do_ioctl_get_iftype(name); 500 type = do_ioctl_get_iftype(name);
501 if (type == -1) { 501 if (type == -1) {
502 bb_error_msg("cannot get type of [%s]", name); 502 bb_error_msg("can't get type of [%s]", name);
503 continue; 503 continue;
504 } 504 }
505 if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT) 505 if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT)
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index b4cc8dfa4..9e6467de5 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -242,7 +242,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
242 status = sendmsg(rtnl->fd, &msg, 0); 242 status = sendmsg(rtnl->fd, &msg, 0);
243 243
244 if (status < 0) { 244 if (status < 0) {
245 bb_perror_msg("cannot talk to rtnetlink"); 245 bb_perror_msg("can't talk to rtnetlink");
246 goto ret; 246 goto ret;
247 } 247 }
248 248
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index 3c4ef2c32..246b9e33a 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -193,7 +193,7 @@ int FAST_FUNC xll_name_to_index(const char *name)
193 } 193 }
194/* out:*/ 194/* out:*/
195 if (ret <= 0) 195 if (ret <= 0)
196 bb_error_msg_and_die("cannot find device \"%s\"", name); 196 bb_error_msg_and_die("can't find device '%s'", name);
197 return ret; 197 return ret;
198} 198}
199 199
diff --git a/networking/nameif.c b/networking/nameif.c
index fb31fbfff..36fbb954e 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -92,7 +92,7 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector)
92 lmac = xmalloc(ETH_ALEN); 92 lmac = xmalloc(ETH_ALEN);
93 ch->mac = ether_aton_r(selector + (strncmp(selector, "mac=", 4) ? 0 : 4), lmac); 93 ch->mac = ether_aton_r(selector + (strncmp(selector, "mac=", 4) ? 0 : 4), lmac);
94 if (ch->mac == NULL) 94 if (ch->mac == NULL)
95 bb_error_msg_and_die("cannot parse %s", selector); 95 bb_error_msg_and_die("can't parse %s", selector);
96#if ENABLE_FEATURE_NAMEIF_EXTENDED 96#if ENABLE_FEATURE_NAMEIF_EXTENDED
97 found_selector++; 97 found_selector++;
98 }; 98 };
@@ -211,7 +211,7 @@ int nameif_main(int argc, char **argv)
211 if (strcmp(ifr.ifr_name, ch->ifname) != 0) { 211 if (strcmp(ifr.ifr_name, ch->ifname) != 0) {
212 strcpy(ifr.ifr_newname, ch->ifname); 212 strcpy(ifr.ifr_newname, ch->ifname);
213 ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr, 213 ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr,
214 "cannot change ifname %s to %s", 214 "can't change ifname %s to %s",
215 ifr.ifr_name, ch->ifname); 215 ifr.ifr_name, ch->ifname);
216 } 216 }
217 /* Remove list entry of renamed interface */ 217 /* Remove list entry of renamed interface */
diff --git a/networking/tc.c b/networking/tc.c
index d9636949c..3115a5254 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -531,7 +531,7 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
531 if (rtnl_dump_request(&rth, obj == OBJ_qdisc ? RTM_GETQDISC : 531 if (rtnl_dump_request(&rth, obj == OBJ_qdisc ? RTM_GETQDISC :
532 obj == OBJ_class ? RTM_GETTCLASS : RTM_GETTFILTER, 532 obj == OBJ_class ? RTM_GETTCLASS : RTM_GETTFILTER,
533 &msg, sizeof(msg)) < 0) 533 &msg, sizeof(msg)) < 0)
534 bb_simple_perror_msg_and_die("cannot send dump request"); 534 bb_simple_perror_msg_and_die("can't send dump request");
535 535
536 xrtnl_dump_filter(&rth, obj == OBJ_qdisc ? print_qdisc : 536 xrtnl_dump_filter(&rth, obj == OBJ_qdisc ? print_qdisc :
537 obj == OBJ_class ? print_class : print_filter, 537 obj == OBJ_class ? print_class : print_filter,
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 98a2aa8c0..25b3319ec 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -251,14 +251,14 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
251 if (!cert) cert = "./cert.pem"; 251 if (!cert) cert = "./cert.pem";
252 if (!key) key = cert; 252 if (!key) key = cert;
253 if (matrixSslOpen() < 0) 253 if (matrixSslOpen() < 0)
254 fatal("cannot initialize ssl"); 254 fatal("can't initialize ssl");
255 if (matrixSslReadKeys(&keys, cert, key, 0, ca) < 0) { 255 if (matrixSslReadKeys(&keys, cert, key, 0, ca) < 0) {
256 if (client) 256 if (client)
257 fatal("cannot read cert, key, or ca file"); 257 fatal("can't read cert, key, or ca file");
258 fatal("cannot read cert or key file"); 258 fatal("can't read cert or key file");
259 } 259 }
260 if (matrixSslNewSession(&ssl, keys, 0, SSL_FLAGS_SERVER) < 0) 260 if (matrixSslNewSession(&ssl, keys, 0, SSL_FLAGS_SERVER) < 0)
261 fatal("cannot create ssl session"); 261 fatal("can't create ssl session");
262#endif 262#endif
263 263
264 sig_block(SIGCHLD); 264 sig_block(SIGCHLD);
@@ -425,7 +425,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
425 if (opts & OPT_h) { 425 if (opts & OPT_h) {
426 free_me1 = remote_hostname = xmalloc_sockaddr2host_noport(&remote.u.sa); 426 free_me1 = remote_hostname = xmalloc_sockaddr2host_noport(&remote.u.sa);
427 if (!remote_hostname) { 427 if (!remote_hostname) {
428 bb_error_msg("cannot look up hostname for %s", remote_addr); 428 bb_error_msg("can't look up hostname for %s", remote_addr);
429 remote_hostname = remote_addr; 429 remote_hostname = remote_addr;
430 } 430 }
431 } 431 }
@@ -441,7 +441,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
441 if (!local_hostname) { 441 if (!local_hostname) {
442 free_me2 = local_hostname = xmalloc_sockaddr2host_noport(&local.u.sa); 442 free_me2 = local_hostname = xmalloc_sockaddr2host_noport(&local.u.sa);
443 if (!local_hostname) 443 if (!local_hostname)
444 bb_error_msg_and_die("cannot look up hostname for %s", local_addr); 444 bb_error_msg_and_die("can't look up hostname for %s", local_addr);
445 } 445 }
446 /* else: local_hostname is not NULL, but is NOT malloced! */ 446 /* else: local_hostname is not NULL, but is NOT malloced! */
447 } 447 }
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index 48158fc43..3df0f39b7 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -57,7 +57,7 @@ int FAST_FUNC arpping(uint32_t test_nip,
57 } 57 }
58 58
59 if (setsockopt_broadcast(s) == -1) { 59 if (setsockopt_broadcast(s) == -1) {
60 bb_perror_msg("cannot enable bcast on raw socket"); 60 bb_perror_msg("can't enable bcast on raw socket");
61 goto ret; 61 goto ret;
62 } 62 }
63 63
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 23292a55d..dc5d9ffe9 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -77,7 +77,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
77 77
78 /* Create pidfile */ 78 /* Create pidfile */
79 write_pidfile(server_config.pidfile); 79 write_pidfile(server_config.pidfile);
80 /* if (!..) bb_perror_msg("cannot create pidfile %s", pidfile); */ 80 /* if (!..) bb_perror_msg("can't create pidfile %s", pidfile); */
81 81
82 bb_info_msg("%s (v"BB_VER") started", applet_name); 82 bb_info_msg("%s (v"BB_VER") started", applet_name);
83 83
diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c
index 38f99196e..10ec4597f 100644
--- a/networking/udhcp/options.c
+++ b/networking/udhcp/options.c
@@ -255,6 +255,6 @@ int FAST_FUNC add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data)
255 } 255 }
256 } 256 }
257 257
258 bb_error_msg("cannot add option 0x%02x", code); 258 bb_error_msg("can't add option 0x%02x", code);
259 return 0; 259 return 0;
260} 260}
diff --git a/networking/udhcp/signalpipe.c b/networking/udhcp/signalpipe.c
index a025bd8b5..c181e0e06 100644
--- a/networking/udhcp/signalpipe.c
+++ b/networking/udhcp/signalpipe.c
@@ -29,7 +29,7 @@ static void signal_handler(int sig)
29{ 29{
30 unsigned char ch = sig; /* use char, avoid dealing with partial writes */ 30 unsigned char ch = sig; /* use char, avoid dealing with partial writes */
31 if (write(signal_pipe.wr, &ch, 1) != 1) 31 if (write(signal_pipe.wr, &ch, 1) != 1)
32 bb_perror_msg("cannot send signal"); 32 bb_perror_msg("can't send signal");
33} 33}
34 34
35 35
diff --git a/networking/wget.c b/networking/wget.c
index 11d39cb66..8ca6def67 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -626,7 +626,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
626 626
627 /* Impossible? 627 /* Impossible?
628 if ((opt & WGET_OPT_CONTINUE) && !fname_out) 628 if ((opt & WGET_OPT_CONTINUE) && !fname_out)
629 bb_error_msg_and_die("cannot specify continue (-c) without a filename (-O)"); 629 bb_error_msg_and_die("can't specify continue (-c) without a filename (-O)");
630 */ 630 */
631 631
632 /* Determine where to start transfer */ 632 /* Determine where to start transfer */
diff --git a/procps/kill.c b/procps/kill.c
index 1f8206986..e418046e7 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -195,7 +195,7 @@ int kill_main(int argc, char **argv)
195 continue; 195 continue;
196 errors++; 196 errors++;
197 if (!quiet) 197 if (!quiet)
198 bb_perror_msg("cannot kill pid %u", (unsigned)*pl); 198 bb_perror_msg("can't kill pid %u", (unsigned)*pl);
199 } 199 }
200 } 200 }
201 free(pidList); 201 free(pidList);
@@ -214,7 +214,7 @@ int kill_main(int argc, char **argv)
214 bb_error_msg("bad pid '%s'", arg); 214 bb_error_msg("bad pid '%s'", arg);
215 errors++; 215 errors++;
216 } else if (kill(pid, signo) != 0) { 216 } else if (kill(pid, signo) != 0) {
217 bb_perror_msg("cannot kill pid %d", (int)pid); 217 bb_perror_msg("can't kill pid %d", (int)pid);
218 errors++; 218 errors++;
219 } 219 }
220 arg = *++argv; 220 arg = *++argv;
diff --git a/procps/ps.c b/procps/ps.c
index e94004541..be11a1b67 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -143,7 +143,7 @@ static unsigned get_kernel_HZ(void)
143 kernel_HZ = get_HZ_by_waiting(); 143 kernel_HZ = get_HZ_by_waiting();
144 144
145 //if (open_read_close("/proc/uptime", buf, sizeof(buf) <= 0) 145 //if (open_read_close("/proc/uptime", buf, sizeof(buf) <= 0)
146 // bb_perror_msg_and_die("cannot read %s", "/proc/uptime"); 146 // bb_perror_msg_and_die("can't read %s", "/proc/uptime");
147 //buf[sizeof(buf)-1] = '\0'; 147 //buf[sizeof(buf)-1] = '\0';
148 ///sscanf(buf, "%llu", &seconds_since_boot); 148 ///sscanf(buf, "%llu", &seconds_since_boot);
149 sysinfo(&info); 149 sysinfo(&info);
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
74static void fatal2_cannot(const char *m1, const char *m2) 74static 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}
79static void warn3x(const char *m1, const char *m2, const char *m3) 79static 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}
83static void warn2_cannot(const char *m1, const char *m2) 83static 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
88static void warnx(const char *m1) 88static 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;
diff --git a/runit/sv.c b/runit/sv.c
index 732c33cea..96ebb749d 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -228,13 +228,13 @@ static int svstatus_get(void)
228 : failx("runsv not running"); 228 : failx("runsv not running");
229 return 0; 229 return 0;
230 } 230 }
231 warn("cannot open supervise/ok"); 231 warn("can't open supervise/ok");
232 return -1; 232 return -1;
233 } 233 }
234 close(fd); 234 close(fd);
235 fd = open_read("supervise/status"); 235 fd = open_read("supervise/status");
236 if (fd == -1) { 236 if (fd == -1) {
237 warn("cannot open supervise/status"); 237 warn("can't open supervise/status");
238 return -1; 238 return -1;
239 } 239 }
240 r = read(fd, &svstatus, 20); 240 r = read(fd, &svstatus, 20);
@@ -243,11 +243,11 @@ static int svstatus_get(void)
243 case 20: 243 case 20:
244 break; 244 break;
245 case -1: 245 case -1:
246 warn("cannot read supervise/status"); 246 warn("can't read supervise/status");
247 return -1; 247 return -1;
248 default: 248 default:
249 errno = 0; 249 errno = 0;
250 warn("cannot read supervise/status: bad format"); 250 warn("can't read supervise/status: bad format");
251 return -1; 251 return -1;
252 } 252 }
253 return 1; 253 return 1;
@@ -263,7 +263,7 @@ static unsigned svstatus_print(const char *m)
263 263
264 if (stat("down", &s) == -1) { 264 if (stat("down", &s) == -1) {
265 if (errno != ENOENT) { 265 if (errno != ENOENT) {
266 bb_perror_msg(WARN"cannot stat %s/down", *service); 266 bb_perror_msg(WARN"can't stat %s/down", *service);
267 return 0; 267 return 0;
268 } 268 }
269 normallyup = 1; 269 normallyup = 1;
@@ -303,7 +303,7 @@ static int status(const char *unused UNUSED_PARAM)
303 r = svstatus_print(*service); 303 r = svstatus_print(*service);
304 if (chdir("log") == -1) { 304 if (chdir("log") == -1) {
305 if (errno != ENOENT) { 305 if (errno != ENOENT) {
306 printf("; log: "WARN"cannot change to log service directory: %s", 306 printf("; log: "WARN"can't change to log service directory: %s",
307 strerror(errno)); 307 strerror(errno));
308 } 308 }
309 } else if (svstatus_get()) { 309 } else if (svstatus_get()) {
@@ -322,7 +322,7 @@ static int checkscript(void)
322 322
323 if (stat("check", &s) == -1) { 323 if (stat("check", &s) == -1) {
324 if (errno == ENOENT) return 1; 324 if (errno == ENOENT) return 1;
325 bb_perror_msg(WARN"cannot stat %s/check", *service); 325 bb_perror_msg(WARN"can't stat %s/check", *service);
326 return 0; 326 return 0;
327 } 327 }
328 /* if (!(s.st_mode & S_IXUSR)) return 1; */ 328 /* if (!(s.st_mode & S_IXUSR)) return 1; */
@@ -330,11 +330,11 @@ static int checkscript(void)
330 prog[1] = NULL; 330 prog[1] = NULL;
331 pid = spawn(prog); 331 pid = spawn(prog);
332 if (pid <= 0) { 332 if (pid <= 0) {
333 bb_perror_msg(WARN"cannot %s child %s/check", "run", *service); 333 bb_perror_msg(WARN"can't %s child %s/check", "run", *service);
334 return 0; 334 return 0;
335 } 335 }
336 while (safe_waitpid(pid, &w, 0) == -1) { 336 while (safe_waitpid(pid, &w, 0) == -1) {
337 bb_perror_msg(WARN"cannot %s child %s/check", "wait for", *service); 337 bb_perror_msg(WARN"can't %s child %s/check", "wait for", *service);
338 return 0; 338 return 0;
339 } 339 }
340 return WEXITSTATUS(w) == 0; 340 return WEXITSTATUS(w) == 0;
@@ -400,7 +400,7 @@ static int control(const char *a)
400 fd = open_write("supervise/control"); 400 fd = open_write("supervise/control");
401 if (fd == -1) { 401 if (fd == -1) {
402 if (errno != ENODEV) 402 if (errno != ENODEV)
403 warn("cannot open supervise/control"); 403 warn("can't open supervise/control");
404 else 404 else
405 *a == 'x' ? ok("runsv not running") : failx("runsv not running"); 405 *a == 'x' ? ok("runsv not running") : failx("runsv not running");
406 return -1; 406 return -1;
@@ -409,7 +409,7 @@ static int control(const char *a)
409 r = write(fd, a, l); 409 r = write(fd, a, l);
410 close(fd); 410 close(fd);
411 if (r != l) { 411 if (r != l) {
412 warn("cannot write to supervise/control"); 412 warn("can't write to supervise/control");
413 return -1; 413 return -1;
414 } 414 }
415 return 1; 415 return 1;
@@ -541,7 +541,7 @@ int sv_main(int argc UNUSED_PARAM, char **argv)
541 } 541 }
542 if (chdir(x) == -1) { 542 if (chdir(x) == -1) {
543 chdir_failed_0: 543 chdir_failed_0:
544 fail("cannot change to service directory"); 544 fail("can't change to service directory");
545 goto nullify_service_0; 545 goto nullify_service_0;
546 } 546 }
547 if (act && (act(acts) == -1)) { 547 if (act && (act(acts) == -1)) {
@@ -569,7 +569,7 @@ int sv_main(int argc UNUSED_PARAM, char **argv)
569 } 569 }
570 if (chdir(x) == -1) { 570 if (chdir(x) == -1) {
571 chdir_failed: 571 chdir_failed:
572 fail("cannot change to service directory"); 572 fail("can't change to service directory");
573 goto nullify_service; 573 goto nullify_service;
574 } 574 }
575 if (cbk(acts) != 0) 575 if (cbk(acts) != 0)
diff --git a/selinux/chcon.c b/selinux/chcon.c
index 55c2522f6..4395a7ee4 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -49,12 +49,12 @@ static int FAST_FUNC change_filedir_context(
49 } 49 }
50 if (status < 0 && errno != ENODATA) { 50 if (status < 0 && errno != ENODATA) {
51 if ((option_mask32 & OPT_QUIET) == 0) 51 if ((option_mask32 & OPT_QUIET) == 0)
52 bb_error_msg("cannot obtain security context: %s", fname); 52 bb_error_msg("can't obtain security context: %s", fname);
53 goto skip; 53 goto skip;
54 } 54 }
55 55
56 if (file_context == NULL && specified_context == NULL) { 56 if (file_context == NULL && specified_context == NULL) {
57 bb_error_msg("cannot apply partial context to unlabeled file %s", fname); 57 bb_error_msg("can't apply partial context to unlabeled file %s", fname);
58 goto skip; 58 goto skip;
59 } 59 }
60 60
@@ -62,7 +62,7 @@ static int FAST_FUNC change_filedir_context(
62 context = set_security_context_component(file_context, 62 context = set_security_context_component(file_context,
63 user, role, type, range); 63 user, role, type, range);
64 if (!context) { 64 if (!context) {
65 bb_error_msg("cannot compute security context from %s", file_context); 65 bb_error_msg("can't compute security context from %s", file_context);
66 goto skip; 66 goto skip;
67 } 67 }
68 } else { 68 } else {
@@ -75,7 +75,7 @@ static int FAST_FUNC change_filedir_context(
75 75
76 context_string = context_str(context); 76 context_string = context_str(context);
77 if (!context_string) { 77 if (!context_string) {
78 bb_error_msg("cannot obtain security context in text expression"); 78 bb_error_msg("can't obtain security context in text expression");
79 goto skip; 79 goto skip;
80 } 80 }
81 81
diff --git a/selinux/getsebool.c b/selinux/getsebool.c
index b761b72eb..7478b79e1 100644
--- a/selinux/getsebool.c
+++ b/selinux/getsebool.c
@@ -25,7 +25,7 @@ int getsebool_main(int argc, char **argv)
25 25
26 rc = security_get_boolean_names(&names, &len); 26 rc = security_get_boolean_names(&names, &len);
27 if (rc) 27 if (rc)
28 bb_perror_msg_and_die("cannot get boolean names"); 28 bb_perror_msg_and_die("can't get boolean names");
29 29
30 if (!len) { 30 if (!len) {
31 puts("No booleans"); 31 puts("No booleans");
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 6ecd7899d..8472b7090 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -41,13 +41,13 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type,
41 security_context_t cur_context; 41 security_context_t cur_context;
42 42
43 if (getcon(&cur_context)) 43 if (getcon(&cur_context))
44 bb_error_msg_and_die("cannot get current context"); 44 bb_error_msg_and_die("can't get current context");
45 45
46 if (compute_trans) { 46 if (compute_trans) {
47 security_context_t file_context, new_context; 47 security_context_t file_context, new_context;
48 48
49 if (getfilecon(command, &file_context) < 0) 49 if (getfilecon(command, &file_context) < 0)
50 bb_error_msg_and_die("cannot retrieve attributes of '%s'", 50 bb_error_msg_and_die("can't retrieve attributes of '%s'",
51 command); 51 command);
52 if (security_compute_create(cur_context, file_context, 52 if (security_compute_create(cur_context, file_context,
53 SECCLASS_PROCESS, &new_context)) 53 SECCLASS_PROCESS, &new_context))
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index cc9eec22d..18ea05fec 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -565,7 +565,7 @@ static void write_superblock(void)
565 565
566 xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); 566 xlseek(dev_fd, BLOCK_SIZE, SEEK_SET);
567 if (BLOCK_SIZE != full_write(dev_fd, superblock_buffer, BLOCK_SIZE)) 567 if (BLOCK_SIZE != full_write(dev_fd, superblock_buffer, BLOCK_SIZE))
568 die("cannot write superblock"); 568 die("can't write superblock");
569} 569}
570 570
571static void write_tables(void) 571static void write_tables(void)
@@ -573,11 +573,11 @@ static void write_tables(void)
573 write_superblock(); 573 write_superblock();
574 574
575 if (IMAPS * BLOCK_SIZE != write(dev_fd, inode_map, IMAPS * BLOCK_SIZE)) 575 if (IMAPS * BLOCK_SIZE != write(dev_fd, inode_map, IMAPS * BLOCK_SIZE))
576 die("cannot write inode map"); 576 die("can't write inode map");
577 if (ZMAPS * BLOCK_SIZE != write(dev_fd, zone_map, ZMAPS * BLOCK_SIZE)) 577 if (ZMAPS * BLOCK_SIZE != write(dev_fd, zone_map, ZMAPS * BLOCK_SIZE))
578 die("cannot write zone map"); 578 die("can't write zone map");
579 if (INODE_BUFFER_SIZE != write(dev_fd, inode_buffer, INODE_BUFFER_SIZE)) 579 if (INODE_BUFFER_SIZE != write(dev_fd, inode_buffer, INODE_BUFFER_SIZE))
580 die("cannot write inodes"); 580 die("can't write inodes");
581} 581}
582 582
583static void get_dirsize(void) 583static void get_dirsize(void)
@@ -607,7 +607,7 @@ static void read_superblock(void)
607{ 607{
608 xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); 608 xlseek(dev_fd, BLOCK_SIZE, SEEK_SET);
609 if (BLOCK_SIZE != full_read(dev_fd, superblock_buffer, BLOCK_SIZE)) 609 if (BLOCK_SIZE != full_read(dev_fd, superblock_buffer, BLOCK_SIZE))
610 die("cannot read superblock"); 610 die("can't read superblock");
611 /* already initialized to: 611 /* already initialized to:
612 namelen = 14; 612 namelen = 14;
613 dirsize = 16; 613 dirsize = 16;
@@ -643,11 +643,11 @@ static void read_tables(void)
643 inode_count = xmalloc(INODES + 1); 643 inode_count = xmalloc(INODES + 1);
644 zone_count = xmalloc(ZONES); 644 zone_count = xmalloc(ZONES);
645 if (IMAPS * BLOCK_SIZE != read(dev_fd, inode_map, IMAPS * BLOCK_SIZE)) 645 if (IMAPS * BLOCK_SIZE != read(dev_fd, inode_map, IMAPS * BLOCK_SIZE))
646 die("cannot read inode map"); 646 die("can't read inode map");
647 if (ZMAPS * BLOCK_SIZE != read(dev_fd, zone_map, ZMAPS * BLOCK_SIZE)) 647 if (ZMAPS * BLOCK_SIZE != read(dev_fd, zone_map, ZMAPS * BLOCK_SIZE))
648 die("cannot read zone map"); 648 die("can't read zone map");
649 if (INODE_BUFFER_SIZE != read(dev_fd, inode_buffer, INODE_BUFFER_SIZE)) 649 if (INODE_BUFFER_SIZE != read(dev_fd, inode_buffer, INODE_BUFFER_SIZE))
650 die("cannot read inodes"); 650 die("can't read inodes");
651 if (NORM_FIRSTZONE != FIRSTZONE) { 651 if (NORM_FIRSTZONE != FIRSTZONE) {
652 printf("warning: firstzone!=norm_firstzone\n"); 652 printf("warning: firstzone!=norm_firstzone\n");
653 errors_uncorrected = 1; 653 errors_uncorrected = 1;
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 5e18c2846..8b0b226d3 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -63,7 +63,7 @@ static int remove_ids(type_id type, int argc, char **argv)
63 ret = shmctl(id, IPC_RMID, NULL); 63 ret = shmctl(id, IPC_RMID, NULL);
64 64
65 if (ret) { 65 if (ret) {
66 bb_perror_msg("cannot remove id %s", argv[0]); 66 bb_perror_msg("can't remove id %s", argv[0]);
67 nb_errors++; 67 nb_errors++;
68 } 68 }
69 } 69 }
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 8819cee4e..c6c2036ea 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -243,22 +243,22 @@ static void write_tables(void)
243 msg_eol = "seek to 0 failed"; 243 msg_eol = "seek to 0 failed";
244 xlseek(dev_fd, 0, SEEK_SET); 244 xlseek(dev_fd, 0, SEEK_SET);
245 245
246 msg_eol = "cannot clear boot sector"; 246 msg_eol = "can't clear boot sector";
247 xwrite(dev_fd, G.boot_block_buffer, 512); 247 xwrite(dev_fd, G.boot_block_buffer, 512);
248 248
249 msg_eol = "seek to BLOCK_SIZE failed"; 249 msg_eol = "seek to BLOCK_SIZE failed";
250 xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); 250 xlseek(dev_fd, BLOCK_SIZE, SEEK_SET);
251 251
252 msg_eol = "cannot write superblock"; 252 msg_eol = "can't write superblock";
253 xwrite(dev_fd, G.superblock_buffer, BLOCK_SIZE); 253 xwrite(dev_fd, G.superblock_buffer, BLOCK_SIZE);
254 254
255 msg_eol = "cannot write inode map"; 255 msg_eol = "can't write inode map";
256 xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE); 256 xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE);
257 257
258 msg_eol = "cannot write zone map"; 258 msg_eol = "can't write zone map";
259 xwrite(dev_fd, G.zone_map, SB_ZMAPS * BLOCK_SIZE); 259 xwrite(dev_fd, G.zone_map, SB_ZMAPS * BLOCK_SIZE);
260 260
261 msg_eol = "cannot write inodes"; 261 msg_eol = "can't write inodes";
262 xwrite(dev_fd, G.inode_buffer, INODE_BUFFER_SIZE); 262 xwrite(dev_fd, G.inode_buffer, INODE_BUFFER_SIZE);
263 263
264 msg_eol = "\n"; 264 msg_eol = "\n";
@@ -687,7 +687,7 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
687 687
688 xmove_fd(xopen(G.device_name, O_RDWR), dev_fd); 688 xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
689 if (fstat(dev_fd, &statbuf) < 0) 689 if (fstat(dev_fd, &statbuf) < 0)
690 bb_error_msg_and_die("cannot stat %s", G.device_name); 690 bb_error_msg_and_die("can't stat %s", G.device_name);
691 if (!S_ISBLK(statbuf.st_mode)) 691 if (!S_ISBLK(statbuf.st_mode))
692 opt &= ~1; // clear -c (check) 692 opt &= ~1; // clear -c (check)
693 693
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 1c5137376..30037f9ab 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -1710,7 +1710,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
1710 if (errno == EPERM || errno == EACCES) 1710 if (errno == EPERM || errno == EACCES)
1711 bb_error_msg(bb_msg_perm_denied_are_you_root); 1711 bb_error_msg(bb_msg_perm_denied_are_you_root);
1712 else 1712 else
1713 bb_perror_msg("cannot setup loop device"); 1713 bb_perror_msg("can't setup loop device");
1714 return errno; 1714 return errno;
1715 } 1715 }
1716 1716
@@ -1915,7 +1915,7 @@ int mount_main(int argc UNUSED_PARAM, char **argv)
1915 } 1915 }
1916 fstab = setmntent(fstabname, "r"); 1916 fstab = setmntent(fstabname, "r");
1917 if (!fstab) 1917 if (!fstab)
1918 bb_perror_msg_and_die("cannot read %s", fstabname); 1918 bb_perror_msg_and_die("can't read %s", fstabname);
1919 1919
1920 // Loop through entries until we find what we're looking for 1920 // Loop through entries until we find what we're looking for
1921 memset(mtpair, 0, sizeof(mtpair)); 1921 memset(mtpair, 0, sizeof(mtpair));
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 0880edff5..f257d5438 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -61,7 +61,7 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
61 bb_error_msg("current time matches remote time"); 61 bb_error_msg("current time matches remote time");
62 else 62 else
63 if (stime(&remote_time) < 0) 63 if (stime(&remote_time) < 0)
64 bb_perror_msg_and_die("cannot set time of day"); 64 bb_perror_msg_and_die("can't set time of day");
65 } 65 }
66 66
67 if ((flags & 1) == 0) 67 if ((flags & 1) == 0)
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c
index 4826c2e65..c8cf946df 100644
--- a/util-linux/volume_id/volume_id.c
+++ b/util-linux/volume_id/volume_id.c
@@ -223,7 +223,7 @@ struct volume_id* FAST_FUNC volume_id_open_dev_t(dev_t devt)
223 /* create temporary node to open block device */ 223 /* create temporary node to open block device */
224 unlink(tmp_node); 224 unlink(tmp_node);
225 if (mknod(tmp_node, (S_IFBLK | 0600), devt) != 0) 225 if (mknod(tmp_node, (S_IFBLK | 0600), devt) != 0)
226 bb_perror_msg_and_die("cannot mknod(%s)", tmp_node); 226 bb_perror_msg_and_die("can't mknod(%s)", tmp_node);
227 227
228 id = volume_id_open_node(tmp_node); 228 id = volume_id_open_node(tmp_node);
229 unlink(tmp_node); 229 unlink(tmp_node);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-18 01:40:00 +0000