next version's filespecs will be relative to current file for output files as well.

git-svn-id: https://svn.code.sf.net/p/acme-crossass/code-0/trunk@360 4df02467-bbd4-4a76-a152-e7ce94205b78

src/input.c

@@ -643,7 +643,7 @@ int input_read_and_lower_keyword(void)
 // Returns nonzero on error. Filename in GlobalDynaBuf, including terminator.
 // Errors are handled and reported, but caller should call
 // input_skip_remainder() then.
-static int read_filename_shared_end(void)
+static int read_filename_shared_end(boolean *absolute)
 {
 	// check length
 	if (GlobalDynaBuf->size == 0) {
@@ -651,6 +651,9 @@ static int read_filename_shared_end(void)
 		return 1;	// error
 	}
 
+	// check if absolute and remember
+	*absolute = GlobalDynaBuf->buffer[0] == '/';
+
 	// resolve backslash escapes
 	if (input_unescape_dynabuf())
 		return 1;	// escaping error
@@ -704,49 +707,10 @@ int input_read_input_filename(struct filespecflags *flags)
 // see lines 416 and 1317 in pseudoopcodes.c for two more possible callers!
 	}
 
-	// check if absolute
+	// check length, remember abs/rel, unescape, terminate, do platform conversion
-	if ((GlobalDynaBuf->size)
+	return read_filename_shared_end(&flags->absolute);
-	&& (GlobalDynaBuf->buffer[0] == '/'))
-		flags->absolute = TRUE;
-	else
-		flags->absolute = FALSE;
-
-	// check length, unescape, terminate, do platform conversion
-	return read_filename_shared_end();
 }
 
-// try to read a file name for an output file.
-// library access by using <...> quoting is forbidden.
-// The file name given in the assembler source code is converted from
-// UNIX style to platform style.
-// Returns nonzero on error. Filename in GlobalDynaBuf.
-// Errors are handled and reported, but caller should call
-// input_skip_remainder() then.
-//
-// this is only used for "!to" and "!sl", i.e. output file names. these
-// must be given as a literal string, and it should be kept this way.
-int input_read_output_filename(void)
-{
-	SKIPSPACE();
-	if (GotByte == '<') {
-		Throw_error("Writing to library not supported.");
-		return 1;	// error
-	}
-	if (GotByte != '"') {
-		Throw_error("File name quotes not found (\"\").");
-		return 1;	// error
-	}
-	dynabuf_clear(GlobalDynaBuf);
-	// read file name string (must be a single string literal! do not change this!)
-	if (input_quoted_to_dynabuf('"'))
-		return 1;	// unterminated or escaping error
-
-	GetByte();	// eat terminator
-	// check length, unescape, terminate, do platform conversion:
-	return read_filename_shared_end();
-}
-
-
 // Try to read a comma, skipping spaces before and after. Return TRUE if comma
 // found, otherwise FALSE.
 int input_accept_comma(void)
@@ -784,10 +748,22 @@ bits input_get_force_bit(void)
 }
 
 
-// "include path" stuff:
-
 static	STRUCT_DYNABUF_REF(pathbuf, 256);	// to combine search path and file spec
 
+// copy platform-specific library search path into pathbuf:
+static void library_path_to_pathbuf(void)
+{
+	char	*lib_prefix;	// depends on platform
+
+	dynabuf_clear(pathbuf);
+	lib_prefix = PLATFORM_LIBPREFIX;
+	if ((PLATFORM_NEEDS_ENV_VAR) && (lib_prefix == NULL)) {
+		Throw_error("\"ACME\" environment variable not found.");
+	} else {
+		dynabuf_add_string(pathbuf, lib_prefix);
+	}
+}
+
 // copy "default search path" from current file's file name into pathbuf:
 static void default_path_to_pathbuf(void)
 {
@@ -818,20 +794,60 @@ static void default_path_to_pathbuf(void)
 	}
 }
 
-// copy platform-specific library search path into pathbuf:
+// try to read a file name for an output file.
-static void library_path_to_pathbuf(void)
+// library access by using <...> quoting is forbidden.
+// The file name given in the assembler source code is converted from
+// UNIX style to platform style.
+// Returns nonzero on error. Filename in GlobalDynaBuf.
+// Errors are handled and reported, but caller should call
+// input_skip_remainder() then.
+//
+// this is only used for "!to" and "!sl", i.e. output file names. these
+// must be given as a literal string, and it should be kept this way.
+int input_read_output_filename(void)
 {
-	char	*lib_prefix;	// depends on platform
+	boolean	absolute;
 
-	dynabuf_clear(pathbuf);
+	SKIPSPACE();
-	lib_prefix = PLATFORM_LIBPREFIX;
+	if (GotByte == '<') {
-	if ((PLATFORM_NEEDS_ENV_VAR) && (lib_prefix == NULL)) {
+		Throw_error("Writing to library not supported.");
-		Throw_error("\"ACME\" environment variable not found.");
+		return 1;	// error
-	} else {
-		dynabuf_add_string(pathbuf, lib_prefix);
 	}
+	if (GotByte != '"') {
+		Throw_error("File name quotes not found (\"\").");
+		return 1;	// error
+	}
+	dynabuf_clear(GlobalDynaBuf);
+	// read file name string (must be a single string literal! do not change this!)
+	if (input_quoted_to_dynabuf('"'))
+		return 1;	// unterminated or escaping error
+
+	GetByte();	// eat terminator
+	// check length, remember abs/rel, unescape, terminate, do platform conversion:
+	if (read_filename_shared_end(&absolute))
+		return 1;	// empty string or escaping error
+
+	if (absolute) {
+		// keep file name as it is
+	} else {
+		// get current file's path
+		default_path_to_pathbuf();
+		// add output file name
+		dynabuf_add_string(pathbuf, GLOBALDYNABUF_CURRENT);
+		// terminate
+		dynabuf_append(pathbuf, '\0');
+		// copy full file name back to GlobalDynaBuf
+		dynabuf_clear(GlobalDynaBuf);
+		dynabuf_add_string(GlobalDynaBuf, pathbuf->buffer);
+		dynabuf_append(GlobalDynaBuf, '\0');
+	}
+
+	return 0;	// ok
 }
 
+
+// "include path" stuff:
+
 // ring list struct for "include path items"
 struct ipi {
 	struct ipi	*next,

src/version.h

@@ -9,7 +9,7 @@
 
 #define RELEASE		"0.97"		// update before release	FIXME
 #define CODENAME	"Zem"		// update before release
-#define CHANGE_DATE	"3 Mar"	// update before release	FIXME
+#define CHANGE_DATE	"4 Mar"	// update before release	FIXME
 #define CHANGE_YEAR	"2024"		// update before release
 //#define HOME_PAGE	"http://home.pages.de/~mac_bacon/smorbrod/acme/"
 #define HOME_PAGE	"http://sourceforge.net/p/acme-crossass/"	// FIXME