diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-13 09:08:27 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-13 09:08:27 +0100 |
commit | 6331cf059ccfdf35f4e5a505cbae885094cc41b0 (patch) | |
tree | ccb4b4f0d96d9636861a75f7fc6c97b8b15bd306 /archival | |
parent | f4fee418ae9f5308b4d32bc8d4e618f779f3203f (diff) | |
download | busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.tar.gz busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.tar.bz2 busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.zip |
*: use "can't" instead of "cannot"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r-- | archival/dpkg.c | 4 | ||||
-rw-r--r-- | archival/tar.c | 4 |
2 files changed, 4 insertions, 4 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) |