summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2011-02-25 08:16:23 +0000
committerPádraig Brady <P@draigBrady.com>2011-03-05 02:01:16 +0000
commit7525860fb9c158cba362037fba491d82a09613c6 (patch)
tree68c17d970fc4be804700ca4855bda18ac3f4afaa
parente1788d9ed9c22811ab73163270cfc11ed36c8abd (diff)
downloadcoreutils-7525860fb9c158cba362037fba491d82a09613c6.tar.xz
doc: group dd conv= options that are actually flags
* src/dd.c (usage): Move 'sync' up with other data transformation options. Having it alongside 'fsync' and 'fdatasync' is particularly confusing. Also the double line description of the 'sync' option, serves as a visual break from the "flag" type options that follow. * doc/coreutils.texi (dd invocation): Apply the same grouping as above, by splitting the "conv=" table in two.
-rw-r--r--doc/coreutils.texi32
-rw-r--r--src/dd.c12
2 files changed, 24 insertions, 20 deletions
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index ea35afe29..9f6c734ca 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -8062,22 +8062,29 @@ Swap every pair of input bytes. @sc{gnu} @command{dd}, unlike others, works
when an odd number of bytes are read---the last byte is simply copied
(since there is nothing to swap it with).
-@item noerror
-@opindex noerror
-@cindex read errors, ignoring
-Continue after read errors.
+@item sync
+@opindex sync @r{(padding with @acronym{ASCII} @sc{nul}s)}
+Pad every input block to size of @samp{ibs} with trailing zero bytes.
+When used with @samp{block} or @samp{unblock}, pad with spaces instead of
+zero bytes.
-@item nocreat
-@opindex nocreat
-@cindex creating output file, avoiding
-Do not create the output file; the output file must already exist.
+@end table
+
+The following ''conversions'' are really file flags
+and don't effect and internal processing:
+@table @samp
@item excl
@opindex excl
@cindex creating output file, requiring
Fail if the output file already exists; @command{dd} must create the
output file itself.
+@item nocreat
+@opindex nocreat
+@cindex creating output file, avoiding
+Do not create the output file; the output file must already exist.
+
The @samp{excl} and @samp{nocreat} conversions are mutually exclusive.
@item notrunc
@@ -8085,11 +8092,10 @@ The @samp{excl} and @samp{nocreat} conversions are mutually exclusive.
@cindex truncating output file, avoiding
Do not truncate the output file.
-@item sync
-@opindex sync @r{(padding with @acronym{ASCII} @sc{nul}s)}
-Pad every input block to size of @samp{ibs} with trailing zero bytes.
-When used with @samp{block} or @samp{unblock}, pad with spaces instead of
-zero bytes.
+@item noerror
+@opindex noerror
+@cindex read errors, ignoring
+Continue after read errors.
@item fdatasync
@opindex fdatasync
diff --git a/src/dd.c b/src/dd.c
index fd468a647..a2b4d209f 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -499,18 +499,16 @@ Each CONV symbol may be:\n\
block pad newline-terminated records with spaces to cbs-size\n\
unblock replace trailing spaces in cbs-size records with newline\n\
lcase change upper case to lower case\n\
-"), stdout);
- fputs (_("\
- nocreat do not create the output file\n\
- excl fail if the output file already exists\n\
- notrunc do not truncate the output file\n\
ucase change lower case to upper case\n\
swab swap every pair of input bytes\n\
+ sync pad every input block with NULs to ibs-size; when used\n\
+ with block or unblock, pad with spaces rather than NULs\n\
"), stdout);
fputs (_("\
+ excl fail if the output file already exists\n\
+ nocreat do not create the output file\n\
+ notrunc do not truncate the output file\n\
noerror continue after read errors\n\
- sync pad every input block with NULs to ibs-size; when used\n\
- with block or unblock, pad with spaces rather than NULs\n\
fdatasync physically write output file data before finishing\n\
fsync likewise, but also write metadata\n\
"), stdout);