summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhali <khali>2005-08-02 21:16:07 +0000
committerkhali <khali>2005-08-02 21:16:07 +0000
commit7434602b75b0357d0f90dd237db76dc99670d7c0 (patch)
tree6944f075984dada528af9e5146407927223515b0
parent9a37aeff16eda017e9a6a4ec5a1774ca400f5ea2 (diff)
downloaddmidecode-7434602b75b0357d0f90dd237db76dc99670d7c0.tar.gz
Options --dump and --quiet are mutually exclusive.
-rw-r--r--dmiopt.c6
-rw-r--r--man/dmidecode.85
2 files changed, 9 insertions, 2 deletions
diff --git a/dmiopt.c b/dmiopt.c
index 8761ec5..bf2e493 100644
--- a/dmiopt.c
+++ b/dmiopt.c
@@ -286,6 +286,12 @@ int parse_command_line(int argc, char * const argv[])
return -1;
}
+ if((opt.flags & FLAG_DUMP) && (opt.flags & FLAG_QUIET))
+ {
+ fprintf(stderr, "Options --quiet and --dump are mutually exclusive\n");
+ return -1;
+ }
+
return 0;
}
diff --git a/man/dmidecode.8 b/man/dmidecode.8
index df49a35..877ff16 100644
--- a/man/dmidecode.8
+++ b/man/dmidecode.8
@@ -63,7 +63,8 @@ Read memory from device \fBFILE\fR (default: \fB/dev/mem\fR)
.TP
.BR "-q" ", " "--quiet"
Be less verbose. Unknown, inactive and \s-1OEM\s0-specific entries are not
-displayed. Meta-data and handle references are hidden.
+displayed. Meta-data and handle references are hidden. Mutually exclusive
+with \fB--dump\fR.
.TP
.BR "-s" ", " "--string KEYWORD"
Only display the value of the \s-1DMI\s0 string identified by \fBKEYWORD\fR.
@@ -109,7 +110,7 @@ Do not decode the entries, dump their contents as hexadecimal instead.
Note that this is still a text output, no binary data will be thrown upon
you. The strings attached to each entry are displayed as both
hexadecimal and \s-1ASCII\s0. This option is mainly useful for debugging.
-Mutually exclusive with \fB--string\fR.
+Mutually exclusive with \fB--quiet\fR and \fB--string\fR.
.TP
.BR "-h" ", " "--help"
Display usage information and exit