aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2025-12-10 16:43:18 -0500
committerB. Watson <urchlay@slackware.uk>2025-12-10 16:43:18 -0500
commit5e1d23cb0b269b08076edc3203f7ba5dbcee45d2 (patch)
treee0374663c41bb0726b1e0d020a1c4414b646f3f7
parentaa01b328ed283ba6247e7c222e67874ca1e5e325 (diff)
downloadalftools-5e1d23cb0b269b08076edc3203f7ba5dbcee45d2.tar.gz
Tweak alf and unalf man pages.
-rw-r--r--src/alf.112
-rw-r--r--src/alf.rst10
-rw-r--r--src/alfusage.c1
-rw-r--r--src/unalf.114
-rw-r--r--src/unalf.rst10
-rw-r--r--src/usage.c1
6 files changed, 47 insertions, 1 deletions
diff --git a/src/alf.1 b/src/alf.1
index 485aea9..b32e25f 100644
--- a/src/alf.1
+++ b/src/alf.1
@@ -61,6 +61,10 @@ Filenames in the archive can be explicitly set. Each \fIfile\fP can be
given as \fIfile=NAME\fP, where \fINAME\fP will be the file\(aqs name in the
\fIALF\fP archive. The \fINAME\fP is still uppercased and truncated to 8.3.
.SH OPTIONS
+.sp
+Options can be combined (e.g. \fB\-ov\fP means \fB\-o\fP \fB\-v\fP), though the
+\fB\-td\fP, \fB\-tu\fP, \fB\-tz\fP options must appear last (\fB\-tdv\fP would be
+an error; \fB\-vtd\fP is OK).
.INDENT 0.0
.TP
.B \-a
@@ -133,6 +137,14 @@ Show \fBalf\fP version number and exit.
.UNINDENT
.\" show version number.
.
+.INDENT 0.0
+.TP
+.B \-\-
+End of options. The next argument is treated as the \fIalf\-file\fP and
+any further options are files to add to the archive.
+.UNINDENT
+.\" end of options (next arg is alf-file)
+.
.\" ENDOPTS
.
.SH EXIT STATUS
diff --git a/src/alf.rst b/src/alf.rst
index 32a2cd3..0556225 100644
--- a/src/alf.rst
+++ b/src/alf.rst
@@ -51,6 +51,10 @@ given as *file=NAME*, where *NAME* will be the file's name in the
OPTIONS
=======
+Options can be combined (e.g. **-ov** means **-o** **-v**), though the
+**-td**, **-tu**, **-tz** options must appear last (**-tdv** would be
+an error; **-vtd** is OK).
+
-a
Append to *alf-file*. The files are added to the end of the archive. Be
careful not to add a file with the same name as as existing member of
@@ -105,6 +109,12 @@ OPTIONS
.. show version number.
+--
+ End of options. The next argument is treated as the *alf-file* and
+ any further options are files to add to the archive.
+
+.. end of options (next arg is alf-file)
+
.. ENDOPTS
EXIT STATUS
diff --git a/src/alfusage.c b/src/alfusage.c
index c5e32aa..1b9edf6 100644
--- a/src/alfusage.c
+++ b/src/alfusage.c
@@ -8,5 +8,6 @@ const char *usage_msg[] = {
" -tz: use zero timestamps.",
" -v: verbose (-vv: debug).",
" -V: show version number.",
+ " --: end of options (next arg is alf-file)",
(const char*)0
};
diff --git a/src/unalf.1 b/src/unalf.1
index 52aecef..93fe459 100644
--- a/src/unalf.1
+++ b/src/unalf.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
-.TH "UNALF" 1 "2025-12-08" "0.4.0" "Urchlay's Atari 8-bit Tools"
+.TH "UNALF" 1 "2025-12-10" "0.4.0" "Urchlay's Atari 8-bit Tools"
.SH NAME
unalf \- extract Atari 8-bit ALF archives
.\" RST source for unalf(1) man page. Convert with:
@@ -62,6 +62,10 @@ use e.g. a \fBfor\fP loop in a shell script.
\fBunalf\fP can\(aqt read an ALF file on standard input; \fIalf\-file\fP must be
a real file.
.SH OPTIONS
+.sp
+Options can be combined (e.g. \fB\-ov\fP means \fB\-o\fP \fB\-v\fP), though
+the options that take an argument (\fB\-d\fP, \fB\-n\fP, \fB\-x\fP) must appear
+last in the combination.
.INDENT 0.0
.TP
.B \-a
@@ -250,6 +254,14 @@ to exclude multiple patterns.
.UNINDENT
.\" exclude <wildcard>. may be given multiple times.
.
+.INDENT 0.0
+.TP
+.B \-\-
+End of options. The next argument is treated as the \fIalf\-file\fP and
+any further options are \fIwildcard\fPs.
+.UNINDENT
+.\" end of options (next arg is alf-file)
+.
.\" ENDOPTS
.
.SH WILDCARDS
diff --git a/src/unalf.rst b/src/unalf.rst
index 69e0f43..0676001 100644
--- a/src/unalf.rst
+++ b/src/unalf.rst
@@ -52,6 +52,10 @@ a real file.
OPTIONS
=======
+Options can be combined (e.g. **-ov** means **-o** **-v**), though
+the options that take an argument (**-d**, **-n**, **-x**) must appear
+last in the combination.
+
-a
Convert text file line endings and tabs from ATASCII to ASCII. Text
files are detected by looking at the first 2 bytes of the extracted
@@ -202,6 +206,12 @@ OPTIONS
.. exclude <wildcard>. may be given multiple times.
+--
+ End of options. The next argument is treated as the *alf-file* and
+ any further options are *wildcard*\s.
+
+.. end of options (next arg is alf-file)
+
.. ENDOPTS
WILDCARDS
diff --git a/src/usage.c b/src/usage.c
index f03a373..d15a764 100644
--- a/src/usage.c
+++ b/src/usage.c
@@ -18,5 +18,6 @@ const char *usage_msg[] = {
" -v: verbose listing of archive contents.",
" -V: show version number.",
" -x: exclude <wildcard>. may be given multiple times.",
+ " --: end of options (next arg is alf-file)",
(const char*)0
};