Updated to version 2.5

This version fixes the instant crash in the fully optimized 68k/020+ builds, which was cased by a missing __saveds keyword.

documentation/history.doc

@@ -2719,3 +2719,9 @@ smbfs 2.4 (15.12.2018)
   rather than the one with full debugging support enabled. The AmigaOS4
   variant specifically avoids using cross-compilation options which
   would have to be enabled first, if needed.
+
+
+smbfs 2.5 (16.12.2018)
+
+- This version fixes the instant crash in the fully optimized 68k/020+
+  builds, which was cased by a missing __saveds keyword.

source_code/main.c

@@ -58,6 +58,18 @@ TEXT Version[] = VERSTAG;
 
 /****************************************************************************/
 
+/* The fully optimized build for SAS/C needs the following
+ * definition because it uses the so-called "small data model"
+ * for accessing local program data.
+ */
+#if defined(__SASC) && DEBUG == 0
+#define SAVE_DS __saveds
+#else
+#define SAVE_DS
+#endif /* __SASC && !DEBUG */
+
+/****************************************************************************/
+
 /* This macro lets us long-align structures on the stack */
 #define D_S(type, name) \
 	UBYTE a_##name[sizeof(type) + 3]; \
@@ -65,7 +77,10 @@ TEXT Version[] = VERSTAG;
 
 /****************************************************************************/
 
-/* Difference between January 1st 1970 and January 1st 1978 in seconds. */
+/* Difference between January 1st 1970 and January 1st 1978 in seconds,
+ * which is needed because the Amiga system time base uses 1978 and we
+ * have to deal with Unix time information.
+ */
 #define UNIX_TIME_OFFSET 252460800
 
 /* Maximum length of a file name, as supported by AmigaDOS. */
@@ -78,8 +93,9 @@ TEXT Version[] = VERSTAG;
  */
 #define SMB_ROOT_DIR_NAME	"\\"
 
-/* Individual directory/file names are separated by the
- * backslash for SMB path names. AmigaDOS uses the slash.
+/* Individual directory/file names are separated by the backslash for SMB
+ * path names (actually, SMB uses the MS-DOS path separator). AmigaDOS
+ * uses the slash.
  */
 #define SMB_PATH_SEPARATOR	'\\'
 
@@ -376,7 +392,7 @@ extern int STDARGS swap_stack_and_call(struct StackSwapStruct * stk,APTR functio
 
 /****************************************************************************/
 
-LONG
+LONG SAVE_DS
 _start(STRPTR args, LONG args_length, struct ExecBase * exec_base)
 {
 	struct StackSwapStruct * stk = NULL;

source_code/smakefile

@@ -71,6 +71,12 @@ VERSION = 2
 
 ###############################################################################
 
+# Note: if DEBUG_OPTIONS are enabled you will need to link smbfs against
+#       "lib:scnb.lib" rather than "lib:sc.lib".
+LIBS = lib:sc.lib lib:amiga.lib lib:debug.lib
+
+###############################################################################
+
 CFLAGS = \
 	idlen=64 comnest streq strmerge nostkchk \
 	$(OPTIMIZE) cpu=$(CPU) debug=$(DEBUG) $(DEBUG_OPTIONS) \
@@ -88,12 +94,6 @@ OBJS = \
 
 ###############################################################################
 
-# Note: if DEBUG_OPTIONS are enabled you will need against "lib:scnb.lib"
-#       rather than "lib:sc.lib".
-LIBS = lib:sc.lib lib:amiga.lib lib:debug.lib
-
-###############################################################################
-
 all: tagfiles system_headers.gst $(PROJECT)
 
 tagfiles:

source_code/smbfs_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		2
-#define REVISION	4
-#define DATE		"15.12.2018"
-#define VERS		"smbfs 2.4"
-#define VSTRING		"smbfs 2.4 (15.12.2018)\r\n"
-#define VERSTAG		"\0$VER: smbfs 2.4 (15.12.2018)"
+#define REVISION	5
+#define DATE		"16.12.2018"
+#define VERS		"smbfs 2.5"
+#define VSTRING		"smbfs 2.5 (16.12.2018)\r\n"
+#define VERSTAG		"\0$VER: smbfs 2.5 (16.12.2018)"

source_code/smbfs_rev.rev

@@ -1 +1 @@
-4
+5

source_code/system_headers.h

@@ -42,6 +42,10 @@
 
 /*****************************************************************************/
 
+/* The network header files (e.g. AmiTCP, Miami) define this type,
+ * which clashes with how AmigaOS uses it. This moves it out of the
+ * way.
+ */
 #define byte IGNORE_THIS
 
 /*****************************************************************************/