projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
My latest ramblings.
[oweals/busybox.git]
/
coreutils
/
dd.c
diff --git
a/coreutils/dd.c
b/coreutils/dd.c
index 0d5b3e8ab9867bc7918208da17b763275e4b72de..d50cf746b9eb630c7794645d8b14604d72d3d5e6 100644
(file)
--- a/
coreutils/dd.c
+++ b/
coreutils/dd.c
@@
-114,11
+114,7
@@
extern int dd_main(int argc, char **argv)
argv++;
}
argv++;
}
- buf = malloc(blockSize);
- if (buf == NULL) {
- fprintf(stderr, "Cannot allocate buffer\n");
- exit(FALSE);
- }
+ buf = xmalloc(blockSize);
intotal = 0;
outTotal = 0;
intotal = 0;
outTotal = 0;
@@
-129,9
+125,12
@@
extern int dd_main(int argc, char **argv)
inFd = open(inFile, 0);
if (inFd < 0) {
inFd = open(inFile, 0);
if (inFd < 0) {
- perror(inFile);
- free(buf);
- exit(FALSE);
+ /* Note that we are not freeing buf or closing
+ * files here to save a few bytes. This exits
+ * here anyways... */
+
+ /* free(buf); */
+ fatalError( inFile);
}
if (outFile == NULL)
}
if (outFile == NULL)
@@
-140,10
+139,13
@@
extern int dd_main(int argc, char **argv)
outFd = open(outFile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (outFd < 0) {
outFd = open(outFile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (outFd < 0) {
- perror(outFile);
- close(inFd);
- free(buf);
- exit(FALSE);
+ /* Note that we are not freeing buf or closing
+ * files here to save a few bytes. This exits
+ * here anyways... */
+
+ /* close(inFd);
+ free(buf); */
+ fatalError( outFile);
}
lseek(inFd, skipBlocks * blockSize, SEEK_SET);
}
lseek(inFd, skipBlocks * blockSize, SEEK_SET);
@@
-184,9
+186,13
@@
extern int dd_main(int argc, char **argv)
perror(inFile);
cleanup:
perror(inFile);
cleanup:
+ /* Note that we are not freeing memory or closing
+ * files here, to save a few bytes. */
+#if 0
close(inFd);
close(outFd);
free(buf);
close(inFd);
close(outFd);
free(buf);
+#endif
printf("%ld+%d records in\n", (long) (intotal / blockSize),
(intotal % blockSize) != 0);
printf("%ld+%d records in\n", (long) (intotal / blockSize),
(intotal % blockSize) != 0);