[Scummvm-git-logs] scummvm master -> a83ce7d6091417a482eea820fea9db8ca0bc8884

[bluegr]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0a7f7f6b84 AMIGAOS: Update configure script
49c7f4c6a1 AMIGAOS: Add directory creation to FS
a83ce7d609 AMIGAOS: Revise directory creation


Commit: 0a7f7f6b84f0ec5368f283539d017a154d9a273b
    https://github.com/scummvm/scummvm/commit/0a7f7f6b84f0ec5368f283539d017a154d9a273b
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-05-14T09:55:55+03:00

Commit Message:
AMIGAOS: Update configure script

- Remove hardcoded newlib toolchain (there´s an open-source clib2 toolchain
  available). Let the user decide which toolchain using LDFLAGS env var.
- Minor comment fixes.

Changed paths:
    configure


diff --git a/configure b/configure
index a012126de5a..b596343f6f0 100755
--- a/configure
+++ b/configure
@@ -2574,18 +2574,16 @@ case $_host_os in
 			_detection_features_static=no
 			_plugins_default=dynamic
 		fi
-		# We have to use 'long' for our 4 byte typedef, because AmigaOS
-		# already typedefs (u)int32 as (unsigned) long  and consequently we'd
-		# get a compiler error otherwise.
+		# We have to use 'long' for our 4 byte typedef, because
+		# AmigaOS already typedefs (u)int32 as (unsigned) long.
 		type_4_byte='long'
-		# Supress format warnings as the long 4 byte causes noisy warnings.
+		# Supress format warnings, as the 'long' 4 byte causes noisy ones.
 		append_var CXXFLAGS "-Wno-format"
-		# Enable optimizations for non-debug builds
+		# Enable optimizations for non-debug builds.
 		if test "$_debug_build" = no; then
 			_optimization_level=-O2
 		fi
 		append_var LDFLAGS "-Wl,--export-dynamic"
-		append_var LDFLAGS "-L/sdk/local/newlib/lib"
 		add_line_to_config_mk 'AMIGAOS = 1'
 		_port_mk="backends/platform/sdl/amigaos/amigaos.mk"
 		# Leave out resources by default, save binary size.


Commit: 49c7f4c6a13ca32be9049151a84ffd74bea86485
    https://github.com/scummvm/scummvm/commit/49c7f4c6a13ca32be9049151a84ffd74bea86485
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-05-14T09:55:55+03:00

Commit Message:
AMIGAOS: Add directory creation to FS

Changed paths:
    backends/fs/amigaos/amigaos-fs.cpp


diff --git a/backends/fs/amigaos/amigaos-fs.cpp b/backends/fs/amigaos/amigaos-fs.cpp
index 8ce9e80c6cd..77d2c128a51 100644
--- a/backends/fs/amigaos/amigaos-fs.cpp
+++ b/backends/fs/amigaos/amigaos-fs.cpp
@@ -384,7 +384,23 @@ Common::SeekableWriteStream *AmigaOSFilesystemNode::createWriteStream() {
 }
 
 bool AmigaOSFilesystemNode::createDirectory() {
-	warning("AmigaOSFilesystemNode::createDirectory() -> Not supported");
+	BPTR lock = IDOS->Lock(_sPath.c_str(), SHARED_LOCK);
+	if (lock) {
+		IDOS->UnLock(lock);
+		debug("AmigaOSFilesystemNode::createDirectory() -> Directory '%s' already exists!", _sPath.c_str());
+		return _bIsValid && _bIsDirectory; // TODO: Should we make sure it's really a directory?
+	}
+
+	lock = IDOS->CreateDir(_sPath.c_str());
+	if (lock) {
+		IDOS->UnLock(lock);
+		debug("AmigaOSFilesystemNode::createDirectory() -> Directory '%s' created!", _sPath.c_str());
+		_bIsValid = true;
+		_bIsDirectory = true;
+	} else {
+		warning("AmigaOSFilesystemNode::createDirectory() -> Failed to create '%s'!", _sPath.c_str());
+	}
+
 	return _bIsValid && _bIsDirectory;
 }
 


Commit: a83ce7d6091417a482eea820fea9db8ca0bc8884
    https://github.com/scummvm/scummvm/commit/a83ce7d6091417a482eea820fea9db8ca0bc8884
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-05-14T09:55:55+03:00

Commit Message:
AMIGAOS: Revise directory creation

- Change warnings to debug
- Fix trailing slash

Changed paths:
    backends/fs/amigaos/amigaos-fs.cpp


diff --git a/backends/fs/amigaos/amigaos-fs.cpp b/backends/fs/amigaos/amigaos-fs.cpp
index 77d2c128a51..d6e7383996f 100644
--- a/backends/fs/amigaos/amigaos-fs.cpp
+++ b/backends/fs/amigaos/amigaos-fs.cpp
@@ -384,21 +384,19 @@ Common::SeekableWriteStream *AmigaOSFilesystemNode::createWriteStream() {
 }
 
 bool AmigaOSFilesystemNode::createDirectory() {
-	BPTR lock = IDOS->Lock(_sPath.c_str(), SHARED_LOCK);
-	if (lock) {
-		IDOS->UnLock(lock);
-		debug("AmigaOSFilesystemNode::createDirectory() -> Directory '%s' already exists!", _sPath.c_str());
-		return _bIsValid && _bIsDirectory; // TODO: Should we make sure it's really a directory?
+	Common::String temp = _sPath;
+	if (temp.lastChar() == '/') {
+		temp = temp.substr(0, temp.size() - 1);
 	}
 
-	lock = IDOS->CreateDir(_sPath.c_str());
+	BPTR lock = IDOS->CreateDir(temp.c_str());
 	if (lock) {
 		IDOS->UnLock(lock);
-		debug("AmigaOSFilesystemNode::createDirectory() -> Directory '%s' created!", _sPath.c_str());
+		debug(6, "AmigaOSFilesystemNode::createDirectory() -> Directory '%s' created", temp.c_str());
 		_bIsValid = true;
 		_bIsDirectory = true;
 	} else {
-		warning("AmigaOSFilesystemNode::createDirectory() -> Failed to create '%s'!", _sPath.c_str());
+		debug(6, "AmigaOSFilesystemNode::createDirectory() failed -> Directory '%s' not created", temp.c_str());
 	}
 
 	return _bIsValid && _bIsDirectory;