emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always write record counts to stderr.

Browse Source
This commit is contained in:
Matt Kraai
2001-07-31 21:02:19 +00:00
parent 221b2ea6c4
commit 73f6a1b058
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@@ -41,6 +41,7 @@
-- Don't save/restore vi readonly flag if vi is compiled read-only.
-- Reworked rdate option handling (is now smaller).
-- Size reduction in ping
-- Always write dd counts to stderr
* Aaron Lehmann
-- slimmed down md5sum
-- contributed a nice new (hand written, not lex/yacc) Posix math

8
coreutils/dd.c
View File

@@ -50,7 +50,6 @@ int dd_main(int argc, char **argv)
size_t bs = 512, count = -1;
ssize_t n;
off_t seek = 0, skip = 0;
FILE *statusfp;
char *infile = NULL, *outfile = NULL, *buf;
for (i = 1; i < argc; i++) {
@@ -110,12 +109,9 @@ int dd_main(int argc, char **argv)
if (ftruncate(ofd, seek * bs) < 0)
perror_msg_and_die("%s", outfile);
}
statusfp = stdout;
} else {
ofd = STDOUT_FILENO;
outfile = "standard output";
statusfp = stderr;
}
if (skip) {
@@ -151,8 +147,8 @@ int dd_main(int argc, char **argv)
out_part++;
}
fprintf(statusfp, "%ld+%ld records in\n", (long)in_full, (long)in_part);
fprintf(statusfp, "%ld+%ld records out\n", (long)out_full, (long)out_part);
fprintf(stderr, "%ld+%ld records in\n", (long)in_full, (long)in_part);
fprintf(stderr, "%ld+%ld records out\n", (long)out_full, (long)out_part);
return EXIT_SUCCESS;
}

8
dd.c
View File

@@ -50,7 +50,6 @@ int dd_main(int argc, char **argv)
size_t bs = 512, count = -1;
ssize_t n;
off_t seek = 0, skip = 0;
FILE *statusfp;
char *infile = NULL, *outfile = NULL, *buf;
for (i = 1; i < argc; i++) {
@@ -110,12 +109,9 @@ int dd_main(int argc, char **argv)
if (ftruncate(ofd, seek * bs) < 0)
perror_msg_and_die("%s", outfile);
}
statusfp = stdout;
} else {
ofd = STDOUT_FILENO;
outfile = "standard output";
statusfp = stderr;
}
if (skip) {
@@ -151,8 +147,8 @@ int dd_main(int argc, char **argv)
out_part++;
}
fprintf(statusfp, "%ld+%ld records in\n", (long)in_full, (long)in_part);
fprintf(statusfp, "%ld+%ld records out\n", (long)out_full, (long)out_part);
fprintf(stderr, "%ld+%ld records in\n", (long)in_full, (long)in_part);
fprintf(stderr, "%ld+%ld records out\n", (long)out_full, (long)out_part);
return EXIT_SUCCESS;
}