15 files changed, 24 insertions, 24 deletions

diff --git a/archival/ar.c b/archival/ar.c
index 06a879b93..521e03799 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -83,7 +83,7 @@ int ar_main(int argc, char **argv)
 
         xread(archive_handle->src_fd, magic, 7);
         if (strncmp(magic, "!<arch>", 7) != 0) {
-                bb_error_msg_and_die("Invalid ar magic");
+                bb_error_msg_and_die("invalid ar magic");
         }
         archive_handle->offset += 7;
 
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 4d0f3fbf3..2f7372100 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -711,7 +711,7 @@ static unsigned int get_status(const unsigned int status_node, const int num)
                 /* skip past the separating spaces */
                 status_string += strspn(status_string, " ");
         }
-        len = strcspn(status_string, " \n\0");
+        len = strcspn(status_string, " \n");
         state_sub_string = xstrndup(status_string, len);
         state_sub_num = search_name_hashtable(state_sub_string);
         free(state_sub_string);
@@ -796,7 +796,7 @@ static void index_status_file(const char *filename)
                         if (status_line != NULL) {
                                 status_line += 7;
                                 status_line += strspn(status_line, " \n\t");
-                                status_line = xstrndup(status_line, strcspn(status_line, "\n\0"));
+                                status_line = xstrndup(status_line, strcspn(status_line, "\n"));
                                 status_node->status = search_name_hashtable(status_line);
                                 free(status_line);
                         }
@@ -849,7 +849,7 @@ static void write_status_file(deb_file_t **deb_file)
 
                 tmp_string += 8;
                 tmp_string += strspn(tmp_string, " \n\t");
-                package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n\0"));
+                package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n"));
                 write_flag = FALSE;
                 tmp_string = strstr(control_buffer, "Status:");
                 if (tmp_string != NULL) {
@@ -1374,8 +1374,8 @@ static void remove_package(const unsigned int package_num, int noisy)
         sprintf(conffile_name, "/var/lib/dpkg/info/%s.conffiles", package_name);
         exclude_files = create_list(conffile_name);
 
-        /* Some directories cant be removed straight away, so do multiple passes */
-        while (remove_file_array(remove_files, exclude_files));
+        /* Some directories can't be removed straight away, so do multiple passes */
+        while (remove_file_array(remove_files, exclude_files)) /*repeat */;
         free_array(exclude_files);
         free_array(remove_files);
 
@@ -1421,7 +1421,7 @@ static void purge_package(const unsigned int package_num)
         exclude_files = xzalloc(sizeof(char*));
 
         /* Some directories cant be removed straight away, so do multiple passes */
-        while (remove_file_array(remove_files, exclude_files));
+        while (remove_file_array(remove_files, exclude_files)) /* repeat */;
         free_array(remove_files);
 
         /* Create a list of all /var/lib/dpkg/info/<package> files */
diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c
index e03fb0caa..8513ffecb 100644
--- a/archival/libunarchive/archive_xread_all_eof.c
+++ b/archival/libunarchive/archive_xread_all_eof.c
@@ -15,7 +15,7 @@ ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *b
 
         size = full_read(archive_handle->src_fd, buf, count);
         if ((size != 0) && (size != count)) {
-                bb_perror_msg_and_die("Short read, read %ld of %ld", (long)size, (long)count);
+                bb_perror_msg_and_die("short read, read %ld of %ld", (long)size, (long)count);
         }
         return(size);
 }
diff --git a/archival/libunarchive/check_header_gzip.c b/archival/libunarchive/check_header_gzip.c
index 00d1919a7..3e42035b9 100644
--- a/archival/libunarchive/check_header_gzip.c
+++ b/archival/libunarchive/check_header_gzip.c
@@ -24,7 +24,7 @@ void check_header_gzip(int src_fd)
 
         /* Check the compression method */
         if (header.formatted.method != 8) {
-                bb_error_msg_and_die("Unknown compression method %d",
+                bb_error_msg_and_die("unknown compression method %d",
                                                   header.formatted.method);
         }
 
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 27b4ddbcf..9e3e98dd5 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -745,7 +745,7 @@ static int inflate_block(int *e)
 
                 if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) {
                         if (i == 1) {
-                                bb_error_msg_and_die("Incomplete literal tree");
+                                bb_error_msg_and_die("incomplete literal tree");
                                 huft_free(tl);
                         }
                         return i;       /* incomplete code set */
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c
index 56862f137..dd48cb09b 100644
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libunarchive/get_header_cpio.c
@@ -57,7 +57,7 @@ char get_header_cpio(archive_handle_t *archive_handle)
         archive_handle->offset += 110;
 
         if ((strncmp(&cpio_header[0], "07070", 5) != 0) || ((cpio_header[5] != '1') && (cpio_header[5] != '2'))) {
-                bb_error_msg_and_die("Unsupported cpio format, use newc or crc");
+                bb_error_msg_and_die("unsupported cpio format, use newc or crc");
         }
 
         {
diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libunarchive/get_header_tar_bz2.c
index e3cb328fc..e7a80fc41 100644
--- a/archival/libunarchive/get_header_tar_bz2.c
+++ b/archival/libunarchive/get_header_tar_bz2.c
@@ -15,7 +15,7 @@
 
 char get_header_tar_bz2(archive_handle_t *archive_handle)
 {
-        /* Cant lseek over pipe's */
+        /* Can't lseek over pipes */
         archive_handle->seek = seek_by_read;
 
         archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompressStream);
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c
index af059a187..41c02e16a 100644
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.c
@@ -12,7 +12,7 @@ char get_header_tar_gz(archive_handle_t *archive_handle)
 {
         unsigned char magic[2];
 
-        /* Cant lseek over pipe's */
+        /* Can't lseek over pipes */
         archive_handle->seek = seek_by_read;
 
         xread(archive_handle->src_fd, &magic, 2);
diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libunarchive/seek_by_jump.c
index e1917dd2a..d605f61dd 100644
--- a/archival/libunarchive/seek_by_jump.c
+++ b/archival/libunarchive/seek_by_jump.c
@@ -19,6 +19,6 @@ void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amo
                         seek_by_read(archive_handle, amount);
                 } else
 #endif
-                        bb_perror_msg_and_die("Seek failure");
+                        bb_perror_msg_and_die("seek failure");
         }
 }
diff --git a/archival/libunarchive/seek_by_read.c b/archival/libunarchive/seek_by_read.c
index 03cbb9ecc..d56f94b21 100644
--- a/archival/libunarchive/seek_by_read.c
+++ b/archival/libunarchive/seek_by_read.c
@@ -8,7 +8,7 @@
 #include "unarchive.h"
 #include "libbb.h"
 
-/*  If we are reading through a pipe(), or from stdin then we cant lseek,
+/*  If we are reading through a pipe(), or from stdin then we can't lseek,
  *  we must read and discard the data to skip over it.
  */
 void seek_by_read(const archive_handle_t *archive_handle, const unsigned int jump_size)
diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c
index eed528391..6a84ae811 100644
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libunarchive/unpack_ar_archive.c
@@ -14,7 +14,7 @@ void unpack_ar_archive(archive_handle_t *ar_archive)
 
         xread(ar_archive->src_fd, magic, 7);
         if (strncmp(magic, "!<arch>", 7) != 0) {
-                bb_error_msg_and_die("Invalid ar magic");
+                bb_error_msg_and_die("invalid ar magic");
         }
         ar_archive->offset += 7;
 
diff --git a/archival/rpm.c b/archival/rpm.c
index 448a479a0..2ef7232f4 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -183,7 +183,7 @@ static void extract_cpio_gz(int fd) {
 
         xread(archive_handle->src_fd, &magic, 2);
         if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
-                bb_error_msg_and_die("Invalid gzip magic");
+                bb_error_msg_and_die("invalid gzip magic");
         }
         check_header_gzip(archive_handle->src_fd);
         xchdir("/"); // Install RPM's to root
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index c00c6be65..3442046c4 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -37,10 +37,10 @@ static void skip_header(int rpm_fd)
 
         xread(rpm_fd, &header, sizeof(struct rpm_header));
         if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0) {
-                bb_error_msg_and_die("Invalid RPM header magic"); /* Invalid magic */
+                bb_error_msg_and_die("invalid RPM header magic"); /* Invalid magic */
         }
         if (header.version != 1) {
-                bb_error_msg_and_die("Unsupported RPM header version"); /* This program only supports v1 headers */
+                bb_error_msg_and_die("unsupported RPM header version"); /* This program only supports v1 headers */
         }
         header.entries = ntohl(header.entries);
         header.size = ntohl(header.size);
diff --git a/archival/tar.c b/archival/tar.c
index 2c4280cc4..d96d20227 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -496,7 +496,7 @@ static int writeTarFile(const int tar_fd, const int verboseFlag,
                 freeHardLinkInfo(&tbInfo.hlInfoHead);
 
         if (errorFlag)
-                bb_error_msg("Error exit delayed from previous errors");
+                bb_error_msg("error exit delayed from previous errors");
 
         if (gzipPid && waitpid(gzipPid, NULL, 0)==-1)
                 bb_error_msg("cannot wait");
@@ -540,7 +540,7 @@ static llist_t *append_file_list_to_list(llist_t *list)
 #ifdef CONFIG_FEATURE_TAR_COMPRESS
 static char get_header_tar_Z(archive_handle_t *archive_handle)
 {
-        /* Cant lseek over pipe's */
+        /* Can't lseek over pipes */
         archive_handle->seek = seek_by_read;
 
         /* do the decompression, and cleanup */
@@ -556,7 +556,7 @@ static char get_header_tar_Z(archive_handle_t *archive_handle)
                 /* nothing */;
 
         /* Can only do one file at a time */
-        return(EXIT_FAILURE);
+        return EXIT_FAILURE;
 }
 #else
 #define get_header_tar_Z        0
diff --git a/archival/uncompress.c b/archival/uncompress.c
index d1b0d2cb3..3c78961d5 100644
--- a/archival/uncompress.c
+++ b/archival/uncompress.c
@@ -49,7 +49,7 @@ int uncompress_main(int argc, char **argv)
 
                         extension = strrchr(uncompressed_file, '.');
                         if (!extension || (strcmp(extension, ".Z") != 0)) {
-                                bb_error_msg_and_die("Invalid extension");
+                                bb_error_msg_and_die("invalid extension");
                         }
                         *extension = '\0';
 
@@ -65,7 +65,7 @@ int uncompress_main(int argc, char **argv)
 
                 /* do the decompression, and cleanup */
                 if ((xread_char(src_fd) != 0x1f) || (xread_char(src_fd) != 0x9d)) {
-                        bb_error_msg_and_die("Invalid magic");
+                        bb_error_msg_and_die("invalid magic");
                 }
 
                 status = uncompress(src_fd, dst_fd);