X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=listing.c;h=f2f361336315a9d843bb069f7cd9b95ce09256dc;hp=e1fd73a7f42420de4ca0747750edf3d890a80c87;hb=HEAD;hpb=f3c7d186a15b89c39e360b9cc89545a0d24bd6a4

diff --git a/listing.c b/listing.c
index e1fd73a..e13856e 100644
--- a/listing.c
+++ b/listing.c
@@ -1,14 +1,14 @@
 //
-// RMAC - Reboot's Macro Assembler for all Atari computers
+// RMAC - Renamed Macro Assembler for all Atari computers
 // LISTING.C - Listing Output
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
 // --------------------------------------------------------------------------
 // 0    0    1    1    2    2    3    3    4    4    5    5    6    6    7    7
 // 012345678901234567890123456789012345678901234567890123456789012345678901234567
-// filename....                         Reboot's Macro Assembler N.N.NN (Unknown)
+// filename....                         Renamed Macro Assembler N.N.NN (Unknown)
 // nnnnn  aaaaaaaa  dddddddddddddddddddd T source code
 // nnnnn  aaaaaaaa  dddddddddddddddd
 // nnnnn           =vvvvvvvv
@@ -53,7 +53,7 @@ static char * month[16] = {
 //
 int eject(void)
 {
-	if (listing > 0)
+	if (listing > 0 && list_pag)
 	{
 		println("\f");
 		nlines = 0;
@@ -132,7 +132,7 @@ void date_string(char * buf, uint32_t date)
 
 //
 // Transform letters a-f in the address and data columns of the listing to
-// uppercase. (People seem  to like uppercase hex better in assembly-language
+// uppercase. (People seem to like uppercase hex better in assembly-language
 // listings....)
 //
 void uc_ln(char * ln)
@@ -178,7 +178,7 @@ void list_setup(void)
 	list_fname = NULL;
 
 	if ((list_fd = open(fnbuf, _OPEN_FLAGS, _PERM_MODE)) < 0)
-		cantcreat(fnbuf);
+		CantCreateFile(fnbuf);
 }
 
 
@@ -432,19 +432,19 @@ int d_subttl(void)
 	int ejectok;
 	ejectok = 1;
 
-	if (*tok.u32 == '-')
+	if (*tok == '-')
 	{
 		ejectok = 0;
-		++tok.u32;
+		++tok;
 	}
 
-	if (*tok.u32 != STRING)
+	if (*tok != STRING)
 		return error("missing string");
 
-//	strcpy(subttl, (char *)tok.u32[1]);
-	strcpy(subttl, string[tok.u32[1]]);
+//	strcpy(subttl, (char *)tok[1]);
+	strcpy(subttl, string[tok[1]]);
 
-	tok.u32 += 2;
+	tok += 2;
 
 	// Always eject on pages 2+
 	if (ejectok && (subflag || pageno > 1))
@@ -462,12 +462,12 @@ int d_subttl(void)
 //
 int d_title(void)
 {
-	if (*tok.u32 != STRING)
+	if (*tok != STRING)
 		return error("missing string");
 
-//	strcpy(title, (char*)tok.u32[1]);
-	strcpy(title, string[tok.u32[1]]);
-	tok.u32 += 2;
+//	strcpy(title, (char*)tok[1]);
+	strcpy(title, string[tok[1]]);
+	tok += 2;
 
 	if (pageno > 1)
 	{