Updated to version 1.130

Please keep in mind that this is still a development version and might surprise you (not necessarily in a good way).

Do not let me discourage you to build and test this version, although there will be some risks involved such as data corruption or loss of data.

source_code/main.c

@@ -2256,6 +2256,7 @@ MapErrnoToIoErr(int error)
 		{ -1,				-1 }
 	};
 
+	int original_error = error;
 	LONG result = ERROR_ACTION_NOT_KNOWN;
 	int i;
 
@@ -2272,9 +2273,6 @@ MapErrnoToIoErr(int error)
 		error = smb_errno(error_class, error_code);
 	}
 
-	if(error < 0)
-		error = (-error);
-
 	for(i = 0 ; map_posix_to_amigados[i][0] != -1 ; i++)
 	{
 		if(map_posix_to_amigados[i][0] == error)
@@ -2290,7 +2288,7 @@ MapErrnoToIoErr(int error)
 
 		Fault(result,NULL,amigados_error_text,sizeof(amigados_error_text));
 
-		if(error == error_check_smb_error)
+		if(original_error == error_check_smb_error)
 		{
 			int error_class	= ((struct smb_server *)ServerData)->rcls;
 			int error_code	= ((struct smb_server *)ServerData)->err;
@@ -2299,11 +2297,11 @@ MapErrnoToIoErr(int error)
 
 			smb_translate_error_class_and_code(error_class,error_code,&smb_class_name,&smb_code_text);
 
-			LOG(("Translated SMB error %ld/%ld (%s/%s) -> POSIX error code %ld (%s) -> AmigaDOS error code %ld (%s)\n", error_class, error_code, smb_class_name, smb_code_text, error, posix_strerror(error), result, amigados_error_text));
+			LOG(("Translated SMB %ld/%ld (%s/%s) -> POSIX %ld (%s) -> AmigaDOS error %ld (%s)\n", error_class, error_code, smb_class_name, smb_code_text, error, posix_strerror(error), result, amigados_error_text));
 		}
 		else
 		{
-			LOG(("Translated POSIX error code %ld (%s) -> AmigaDOS error code %ld (%s)\n", error, posix_strerror(error), result, amigados_error_text));
+			LOG(("Translated POSIX %ld (%s) -> AmigaDOS error %ld (%s)\n", error, posix_strerror(error), result, amigados_error_text));
 		}
 	}
 	#endif /* DEBUG */

source_code/proc.c

@@ -621,12 +621,12 @@ smb_errno (int errcls, int error)
 		if(err_class != NULL && err_code != NULL)
 		{
 			LOG(("translated error code %ld/%ld (%s/%s) to %ld (%s)\n",
-				errcls,error,err_class->class,err_code->message,(-result),strerror(-result)));
+				errcls,error,err_class->class,err_code->message,result,strerror(result)));
 		}
 		else
 		{
 			LOG(("no proper translation for error code %ld/%ld to %ld (%s)\n",
-				errcls,error,(-result),strerror(-result)));
+				errcls,error,result,strerror(result)));
 		}
 	}
 	#endif /* DEBUG */

source_code/smb_abstraction.c

@@ -11,6 +11,7 @@
  */
 
 #include "smbfs.h"
+#include "errors.h"
 
 /*****************************************************************************/
 
@@ -239,10 +240,7 @@ smba_connect (
 	NewList((struct List *)&res->open_files);
 
 	if (smb_proc_connect (&res->server, error_ptr) < 0)
-	{
-		ReportError("Cannot connect to server (%ld, %s).", (*error_ptr),posix_strerror(*error_ptr));
 		goto error_occured;
-	}
 
 	if (!use_E)
 		res->supports_E_known = 1;
@@ -1609,7 +1607,20 @@ smba_start(
 		smb_error_ptr,
 		&the_server) < 0)
 	{
-		ReportError("Could not connect to server (%ld, %s).",(*error_ptr),posix_strerror(*error_ptr));
+		if((*error_ptr) == error_check_smb_error)
+		{
+			char * smb_class_name;
+			char * smb_code_text;
+
+			smb_translate_error_class_and_code((*smb_error_class_ptr),(*smb_error_ptr),&smb_class_name,&smb_code_text);
+
+			ReportError("Could not connect to server (%ld/%ld, %s/%s).",(*smb_error_class_ptr),(*smb_error_ptr),smb_class_name,smb_code_text);
+		}
+		else
+		{
+			ReportError("Could not connect to server (%ld, %s).",(*error_ptr),posix_strerror(*error_ptr));
+		}
+
 		goto out;
 	}
 

source_code/smbfs_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	129
+#define REVISION	130
 #define DATE		"13.5.2018"
-#define VERS		"smbfs 1.129"
-#define VSTRING		"smbfs 1.129 (13.5.2018)\r\n"
-#define VERSTAG		"\0$VER: smbfs 1.129 (13.5.2018)"
+#define VERS		"smbfs 1.130"
+#define VSTRING		"smbfs 1.130 (13.5.2018)\r\n"
+#define VERSTAG		"\0$VER: smbfs 1.130 (13.5.2018)"

source_code/smbfs_rev.rev

@@ -1 +1 @@
-129
+130