1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
.\" Man page generated from reStructuredText.
.
.
.nr rst2man-indent-level 0
.
.de1 rstReportMargin
\\$1 \\n[an-margin]
level \\n[rst2man-indent-level]
level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
-
\\n[rst2man-indent0]
\\n[rst2man-indent1]
\\n[rst2man-indent2]
..
.de1 INDENT
.\" .rstReportMargin pre:
. RS \\$1
. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
. nr rst2man-indent-level +1
.\" .rstReportMargin post:
..
.de UNINDENT
. RE
.\" indent \\n[an-margin]
.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
.nr rst2man-indent-level -1
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
.TH "DIFFBAS" 1 "2024-07-21" "0.2.1" "Urchlay's Atari 8-bit Tools"
.SH NAME
diffbas \- Show differences between two tokenized Atari 8-bit BASIC files
.SH SYNOPSIS
.sp
diffbas [\fIdiff\-options\fP] [\fB\-\-\fP \fIlistbas\-options\fP] \fIfile1\fP \fIfile2\fP
.SH DESCRIPTION
.sp
\fBdiffbas\fP shows the differences between two tokenized (SAVEd)
Atari BASIC programs, using \fBlistbas\fP(1) and \fBdiff\fP(1).
.SH OPTIONS
.sp
\fBdiffbas\fP takes no options of its own. It will pass options as\-is
to both \fBlistbas\fP and \fBdiff\fP\&. Use \fB\-\-\fP to separate them: everything
before \fB\-\-\fP is passed to \fBdiff\fP, and everything between \fB\-\-\fP and
the first filename is passed to \fBlistbas\fP\&.
.SH COLOR
.sp
By default, the output is colorized by \fBlistbas\fP\&. If you want to use
\fBdiff\fP\(aqs \fB\-\-color\fP option, you should use \fB\-n\fP as a \fBlistbas\fP
option. Color diffs are most useful with \fB\-u\fP (unified diff format),
so the command would look like:
.INDENT 0.0
.INDENT 3.5
.sp
.nf
.ft C
$ diffbas \-u \-\-color \-\- \-n A.BAS B.BAS
.ft P
.fi
.UNINDENT
.UNINDENT
.SH EXAMPLE
.INDENT 0.0
.INDENT 3.5
.sp
.nf
.ft C
$ diffbas \-u A.BAS B.BAS
\-\-\- A.BAS.lst 2024\-07\-12 23:56:46.937965855 \-0400
+++ B.BAS.lst 2024\-07\-12 23:56:46.938965854 \-0400
@@ \-1,3 +1,4 @@
10 ? "THIS LINE IS IN BOTH PROGRAMS."
20 ? "THIS LINE IS ALSO IN BOTH."
+25 ? "THIS LINE ONLY IN B.BAS!"
30 END
.ft P
.fi
.UNINDENT
.UNINDENT
.SH EXIT STATUS
.sp
0 for success. On failure, the exit status is that of whichever command
failed (\fBlistbas\fP or \fBdiff\fP).
.SH COPYRIGHT
.sp
WTFPL. See \fI\%http://www.wtfpl.net/txt/copying/\fP for details.
.SH AUTHOR
.INDENT 0.0
.IP B. 3
Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\&.
.UNINDENT
.SH SEE ALSO
.sp
\fBa8cat\fP(1),
\fBa8eol\fP(1),
\fBa8xd\fP(1),
\fBatr2xfd\fP(1),
\fBatrsize\fP(1),
\fBaxe\fP(1),
\fBbas2aplus\fP(1),
\fBblob2c\fP(1),
\fBblob2xex\fP(1),
\fBcart2xex\fP(1),
\fBcxrefbas\fP(1),
\fBdasm2atasm\fP(1),
\fBdiffbas\fP(1),
\fBdumpbas\fP(1),
\fBf2toxex\fP(1),
\fBfenders\fP(1),
\fBlistbas\fP(1),
\fBprotbas\fP(1),
\fBrenumbas\fP(1),
\fBrom2cart\fP(1),
\fBunmac65\fP(1),
\fBunprotbas\fP(1),
\fBvxrefbas\fP(1),
\fBwhichbas\fP(1),
\fBxex1to2\fP(1),
\fBxexamine\fP(1),
\fBxexcat\fP(1),
\fBxexsplit\fP(1),
\fBxfd2atr\fP(1),
\fBxex\fP(5),
\fBatascii\fP(7).
.sp
Any good Atari 8\-bit book: \fIDe Re Atari\fP, \fIThe Atari BASIC Reference
Manual\fP, the \fIOS Users\(aq Guide\fP, \fIMapping the Atari\fP, etc.
.\" Generated by docutils manpage writer.
.
|
