f2toxex: remove, rethought this and decided xexcat will do this job.

19 files changed, 18 insertions, 132 deletions

diff --git a/Makefile b/Makefile
index 0ad36d3..4d56cea 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,9 @@ CC=gcc
 CFLAGS=-Wall $(COPT) -ansi -D_GNU_SOURCE -DVERSION=\"$(VERSION)\"
 
 # BINS and SCRIPTS go in $BINDIR, DOCS go in $DOCDIR
-BINS=a8eol xfd2atr atr2xfd blob2c cart2xex fenders xexsplit xexcat atrsize rom2cart unmac65 axe blob2xex xexamine f2toxex
+BINS=a8eol xfd2atr atr2xfd blob2c cart2xex fenders xexsplit xexcat atrsize rom2cart unmac65 axe blob2xex xexamine
 SCRIPTS=dasm2atasm a8utf8
-MANS=a8eol.1 xfd2atr.1 atr2xfd.1 blob2c.1 cart2xex.1 fenders.1 xexsplit.1 xexcat.1 atrsize.1 rom2cart.1 unmac65.1 axe.1 dasm2atasm.1 a8utf8.1 blob2xex.1 xexamine.1 f2toxex.1
+MANS=a8eol.1 xfd2atr.1 atr2xfd.1 blob2c.1 cart2xex.1 fenders.1 xexsplit.1 xexcat.1 atrsize.1 rom2cart.1 unmac65.1 axe.1 dasm2atasm.1 a8utf8.1 blob2xex.1 xexamine.1
 DOCS=README equates.inc *.dasm
 
 # All the programs share this version number...
diff --git a/a8eol.1 b/a8eol.1
index 20d3884..a2901c0 100644
--- a/a8eol.1
+++ b/a8eol.1
@@ -470,6 +470,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/a8utf8.1 b/a8utf8.1
index 5cdbc69..7628b8c 100644
--- a/a8utf8.1
+++ b/a8utf8.1
@@ -101,6 +101,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/atr2xfd.1 b/atr2xfd.1
index a3ea7f6..88a9f12 100644
--- a/atr2xfd.1
+++ b/atr2xfd.1
@@ -189,6 +189,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/atrsize.1 b/atrsize.1
index 514469b..4ecc331 100644
--- a/atrsize.1
+++ b/atrsize.1
@@ -204,6 +204,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/axe.1 b/axe.1
index 8c9cef1..710a43e 100644
--- a/axe.1
+++ b/axe.1
@@ -145,6 +145,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/blob2c.1 b/blob2c.1
index 63897d6..c94d7f2 100644
--- a/blob2c.1
+++ b/blob2c.1
@@ -125,6 +125,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/blob2xex.1 b/blob2xex.1
index 8d6731c..f5b9c3a 100644
--- a/blob2xex.1
+++ b/blob2xex.1
@@ -185,6 +185,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/cart2xex.1 b/cart2xex.1
index dcf68ad..2436f45 100644
--- a/cart2xex.1
+++ b/cart2xex.1
@@ -235,6 +235,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/dasm2atasm.1 b/dasm2atasm.1
index 98f0e9b..a2297e6 100644
--- a/dasm2atasm.1
+++ b/dasm2atasm.1
@@ -232,6 +232,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/f2toxex.c b/f2toxex.c
deleted file mode 100644
index c2a4934..0000000
--- a/f2toxex.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "xex.h"
-
-#define SELF "f2toxex"
-
-void version() {
-	printf(SELF " " VERSION "\n");
-}
-
-void usage() {
-	version();
-	printf("  Usage: " SELF " [-h | -v] | infile [outfile]\n");
-}
-
-char *make_outfile(char *infile) {
-}
-
-int main(int argc, char **argv) {
-	int c;
-	char *infile, *outfile;
-
-	while( (c = getopt(argc, argv, "hv")) > 0) {
-		switch(c) {
-			case 'h':
-				usage();
-				exit(0);
-				break;
-			case 'v':
-				version();
-				exit(0);
-				break;
-			default:
-				fprintf(stderr, SELF ": unknown option '-%c'.\n", c);
-				usage();
-				exit(1);
-				break;
-		}
-	}
-
-	if(argc > optind) {
-		infile = argv[optind];
-		optind++;
-	}
-
-	if(argc > optind) {
-		strcpy(outfile, argv[optind]);
-		optind++;
-
-		if(argc > optind)
-			fprintf(stderr, SELF ": "
-					"ignoring extra junk on command line: '%s'.\n", argv[optind]);
-	} else if(strcmp(infile, "-") != 0) {
-		outfile = make_outfile(infile);
-	}
-
-
-	return 0;
-}
diff --git a/f2toxex.rst b/f2toxex.rst
deleted file mode 100644
index 85d29a1..0000000
--- a/f2toxex.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-.. RST source for f2toxex(1) man page. Convert with:
-..   rst2man.py f2toxex.rst > f2toxex.1
-
-=======
-f2toxex
-=======
-
--------------------------------------------------------------
-Convert a DASM "-f2" object file to an Atari 8-bit executable
--------------------------------------------------------------
-
-.. include:: manhdr.rst
-
-SYNOPSIS
-========
-
-f2toxex [ [**-h** | **-v** ] | *infile* [*outfile*] ]
-
-DESCRIPTION
-===========
-
-**f2toxex** converts an object code file created by the **dasm**\(1)
-assembler, using its **-f2** option, to an Atari 8-bit executable
-(.xex file).
-
-*infile* may be **-** to read from standard input. *outfile* may be
-**-** to write to standard output.
-
-If *outfile* is omitted, the output will be written to:
-
-- If reading from standard input, write to standard output.
-
-- If reading from a file whose name ends with an extension, replace
-  the extension with *.xex*.
-
-- Otherwise, append *.xex* to the input filename.
-
-NOTES
-=====
-
-The DASM -f2 output format is described in section **3.3.4** of the
-DASM manual (**dasm.pdf**). It's reproduced here for reference:
-
-  RAS (Random Access Segment). The output file contains one
-  or more hunks. Each hunk consists of a 2 byte origin (little-
-  endian), 2 byte length (little-endian), and that number of data
-  bytes. The hunks occur in the same order as initialized segments
-  in the assembly. There are no restrictions to segment ordering
-  (i.e. reverse indexed ORG statements are allowed). The next hunk
-  begins after the previous hunk's data, until the end of the file.
-
-OPTIONS
-=======
-
--h
-  Print a short help message and exit.
-
--v
-  Verbose operation.
-
-EXIT STATUS
-===========
-
-Exit status is zero for success, non-zero for  failure.
-
-.. include:: manftr.rst
diff --git a/fenders.1 b/fenders.1
index e6473cc..d6c706a 100644
--- a/fenders.1
+++ b/fenders.1
@@ -270,6 +270,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/rom2cart.1 b/rom2cart.1
index fa3374e..36a0c11 100644
--- a/rom2cart.1
+++ b/rom2cart.1
@@ -248,6 +248,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/unmac65.1 b/unmac65.1
index 6f6cd10..9f1f9fc 100644
--- a/unmac65.1
+++ b/unmac65.1
@@ -380,6 +380,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/xexamine.1 b/xexamine.1
index ada4ef3..88e3555 100644
--- a/xexamine.1
+++ b/xexamine.1
@@ -139,6 +139,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/xexcat.1 b/xexcat.1
index aceb7c4..70bded7 100644
--- a/xexcat.1
+++ b/xexcat.1
@@ -169,6 +169,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/xexsplit.1 b/xexsplit.1
index fec2f9a..1ad9efd 100644
--- a/xexsplit.1
+++ b/xexsplit.1
@@ -192,6 +192,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),
diff --git a/xfd2atr.1 b/xfd2atr.1
index 3ff8377..2070289 100644
--- a/xfd2atr.1
+++ b/xfd2atr.1
@@ -120,6 +120,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
 \fBdasm2atasm\fP(1),
+\fBf2toxex\fP(1),
 \fBfenders\fP(1),
 \fBrom2cart\fP(1),
 \fBunmac65\fP(1),