aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-02-08 15:41:01 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-02-08 15:41:01 +0000
commit97bd0e05ccef27563b4403c24952f0abec8eb6cf (patch)
treeae7970506abbd5f5fec7eafa77eba9d46e4204cb /coreutils
parent7dbf1b4d9eb0eca9c98cfdd0d37d6ce3b8f09e0c (diff)
downloadbusybox-97bd0e05ccef27563b4403c24952f0abec8eb6cf.tar.gz
busybox-97bd0e05ccef27563b4403c24952f0abec8eb6cf.tar.bz2
README: doccument the need of CONFIG_DESKTOP
od: fix help text to include -t od: handle /proc files (which have filesize 0) correctly od: fix comments to not lie about return value od: "%u" is 1 byte less than "%zu" cat: fix English
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cat.c2
-rw-r--r--coreutils/od_bloaty.c22
2 files changed, 10 insertions, 14 deletions
diff --git a/coreutils/cat.c b/coreutils/cat.c
index a1db4cd45..18a74b81d 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -30,7 +30,7 @@ int bb_cat(char **argv)
if (!LONE_DASH(*argv))
fd = open_or_warn(*argv, O_RDONLY);
if (fd >= 0) {
- /* This is not an xfunc - never exits */
+ /* This is not a xfunc - never exits */
off_t r = bb_copyfd_eof(fd, STDOUT_FILENO);
if (fd != STDIN_FILENO)
close(fd);
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 4fb825ee7..6948bf1e1 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -723,7 +723,7 @@ decode_one_format(const char *s_orig, const char *s, const char **next,
/* Decode the modern od format string S. Append the decoded
representation to the global array SPEC, reallocating SPEC if
- necessary. Return zero if S is valid, nonzero otherwise. */
+ necessary. */
static void
decode_format_string(const char *s)
@@ -776,18 +776,18 @@ skip(off_t n_skip)
as large as the size of the current file, we can
decrement n_skip and go on to the next file. */
if (fstat(fileno(in_stream), &file_stats) == 0
- && S_ISREG(file_stats.st_mode) && file_stats.st_size >= 0
+ && S_ISREG(file_stats.st_mode) && file_stats.st_size > 0
) {
if (file_stats.st_size < n_skip) {
n_skip -= file_stats.st_size;
- /* take check&close / open_next route */
+ /* take "check & close / open_next" route */
} else {
if (fseeko(in_stream, n_skip, SEEK_CUR) != 0)
ioerror = 1;
return;
}
} else {
- /* If it's not a regular file with nonnegative size,
+ /* If it's not a regular file with positive size,
position the file pointer by reading. */
char buf[1024];
size_t n_bytes_to_read = 1024;
@@ -1000,9 +1000,7 @@ parse_old_offset(const char *s, off_t *offset)
spec, extend the input block with zero bytes until its length is a
multiple of all format spec sizes. Write the final block. Finally,
write on a line by itself the offset of the byte after the last byte
- read. Accumulate return values from calls to read_block and
- check_and_close, and if any was nonzero, return nonzero.
- Otherwise, return zero. */
+ read. */
static void
dump(off_t current_offset, off_t end_offset)
@@ -1078,8 +1076,7 @@ dump(off_t current_offset, off_t end_offset)
and INPUT_FILENAME so they correspond to the next file in the list.
Then try to read a byte from the newly opened file. Repeat if
necessary until EOF is reached for the last file in FILE_LIST, then
- set *C to EOF and return. Subsequent calls do likewise. The return
- value is nonzero if any errors occured, zero otherwise. */
+ set *C to EOF and return. Subsequent calls do likewise. */
static void
read_char(int *c)
@@ -1112,8 +1109,7 @@ read_char(int *c)
A string constant is a run of at least 'string_min' ASCII
graphic (or formatting) characters terminated by a null.
Based on a function written by Richard Stallman for a
- traditional version of od. Return nonzero if an error
- occurs. Otherwise, return zero. */
+ traditional version of od. */
static void
dump_strings(off_t address, off_t end_offset)
@@ -1412,8 +1408,8 @@ int od_main(int argc, char **argv)
if (str_w)
bytes_per_block = xatou(str_w);
if (!bytes_per_block || bytes_per_block % l_c_m != 0) {
- bb_error_msg("warning: invalid width %zu; using %d instead",
- bytes_per_block, l_c_m);
+ bb_error_msg("warning: invalid width %u; using %d instead",
+ (unsigned)bytes_per_block, l_c_m);
bytes_per_block = l_c_m;
}
} else {