Commit 52ed32eb authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Sync up the error messages

Due to an inability to count to 10 accurately, all the error tokens were wrong, leading to some inappropriate error messages.
Fixes problem "Message token E13 not found" when the SMB server gives a DOS error back.

Version 2.46. Tagged as 'LanManFS-2_46'
parent 478370c8
...@@ -56,56 +56,56 @@ E06:Receive not ready ...@@ -56,56 +56,56 @@ E06:Receive not ready
E07:Connection already exists E07:Connection already exists
E08:Timeout error E08:Timeout error
E09:This workstation name already exists E09:This workstation name already exists
E20:Cannot find given server E10:Cannot find given server
E21:Data length error E11:Data length error
E22:Error from server E12:Error from server
E23:Unable to perform operation E13:Unable to perform operation
E24:Hardware error on server E14:Hardware error on server
E25:Network protocol error E15:Network protocol error
E26:No more files E16:No more files
E27:File not found E17:File not found
E28:Directory not found E18:Directory not found
E29:Server out of file handles E19:Server out of file handles
E30:Access denied E20:Access denied
E31:File already exists E21:File already exists
E32:Incorrect password E22:Incorrect password
E33:Illegal name E23:Illegal name
E34:No such connection E24:No such connection
E35:RISCOS 2 directory functions not supported E25:RISCOS 2 directory functions not supported
E36:OS_GBPB not supported E26:OS_GBPB not supported
E37:Unbuffered file functions not supported E27:Unbuffered file functions not supported
E38:LanManFS has not been loaded E28:LanManFS has not been loaded
E39:Function not implemented E29:Function not implemented
E40:Wildcards not allowed E30:Wildcards not allowed
E41:File attributes could not be read E31:File attributes could not be read
E42:File attributes could not be written E32:File attributes could not be written
E43:File sharing violation E33:File sharing violation
E44:Connection limit has been reached E34:Connection limit has been reached
E45:Share name does not exist E35:Share name does not exist
E46:Bad LanManFS command line E36:Bad LanManFS command line
E47:LanManFS requires RISC OS 3.00 or later E37:LanManFS requires RISC OS 3.00 or later
E48:Initialisation failed E38:Initialisation failed
E49:Network driver not found E39:Network driver not found
E50:Network interface is of incorrect type E40:Network interface is of incorrect type
E51:Network driver is not DCI-4 compatible E41:Network driver is not DCI-4 compatible
E52:Already connected to this drive on this server E42:Already connected to this drive on this server
E53:IEEE802.3 frames are already being used by another protocol E43:IEEE802.3 frames are already being used by another protocol
E54:Buffer manager module is not installed E44:Buffer manager module is not installed
E55:RPC call returned error E45:RPC call returned error
E56:Disc full E46:Disc full
E57:Directory not empty E47:Directory not empty
E58:Can't rename across shares E48:Can't rename across shares
E59:Bad file handle E49:Bad file handle
E60:Cannot create TCP/IP socket E50:Cannot create TCP/IP socket
E61:Cannot make TCP/IP connection E51:Cannot make TCP/IP connection
E62:Connection rejected by server E52:Connection rejected by server
E63:Too many re-target requests E53:Too many re-target requests
E64:Unable to determine this machine's IP address E54:Unable to determine this machine's IP address
E65:Internet module is not present or not working E55:Internet module is not present or not working
E66:!ArmBoot files are nested too deep E56:!ArmBoot files are nested too deep
E67:Error while running !ArmBoot file E57:Error while running !ArmBoot file
E68:Home directory name not valid E58:Home directory name not valid
E69:Could not connect to home directory E59:Could not connect to home directory
E10:User name not recognised E60:User name not recognised
E11:User account has been disabled E61:User account has been disabled
E12:LanManFS in use E62:LanManFS in use
/* (2.45) /* (2.46)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 2.45 #define Module_MajorVersion_CMHG 2.46
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 31 May 2014 #define Module_Date_CMHG 14 Jul 2014
#define Module_MajorVersion "2.45" #define Module_MajorVersion "2.46"
#define Module_Version 245 #define Module_Version 246
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "31 May 2014" #define Module_Date "14 Jul 2014"
#define Module_ApplicationDate "31-May-14" #define Module_ApplicationDate "14-Jul-14"
#define Module_ComponentName "LanManFS" #define Module_ComponentName "LanManFS"
#define Module_ComponentPath "castle/RiscOS/Sources/Networking/Omni/Protocols/LanManFS" #define Module_ComponentPath "castle/RiscOS/Sources/Networking/Omni/Protocols/LanManFS"
#define Module_FullVersion "2.45" #define Module_FullVersion "2.46"
#define Module_HelpVersion "2.45 (31 May 2014)" #define Module_HelpVersion "2.46 (14 Jul 2014)"
#define Module_LibraryVersionInfo "2:45" #define Module_LibraryVersionInfo "2:46"
...@@ -48,8 +48,9 @@ ...@@ -48,8 +48,9 @@
* for example, when writing a new file * for example, when writing a new file
*/ */
static const int deaddead = (int)0xDEADDEAD; static const int deaddead = (int)0xDEADDEAD;
#endif
/* Macro returns non-zero if the specific load addressis indicative of /* Macro returns non-zero if the specific load address is indicative of
* a filetyped object. Rather than checking for the top 12 bits being * a filetyped object. Rather than checking for the top 12 bits being
* set, it's much quicker to arithmetic shift it right 20 bits and test * set, it's much quicker to arithmetic shift it right 20 bits and test
* for -1. (Norcroft generates: MVN rn, #0: TEQ rn, ra, ASR #20) * for -1. (Norcroft generates: MVN rn, #0: TEQ rn, ra, ASR #20)
...@@ -68,7 +69,6 @@ static const int deaddead = (int)0xDEADDEAD; ...@@ -68,7 +69,6 @@ static const int deaddead = (int)0xDEADDEAD;
* EOR load, type, load LSR #20: EOR load,rn,load LSL #8 * EOR load, type, load LSR #20: EOR load,rn,load LSL #8
*/ */
#define ENCODE_FILETYPE(load,type) (((load)|0xFFF00000)^((GET_FILETYPE(load)^(type))<<8)) #define ENCODE_FILETYPE(load,type) (((load)|0xFFF00000)^((GET_FILETYPE(load)^(type))<<8))
#endif
...@@ -269,7 +269,7 @@ void Xlt_CnvROtoDOS ( RISCOS_ATTRIBS *pRA, DOS_ATTRIBS *pDA, int flags ) ...@@ -269,7 +269,7 @@ void Xlt_CnvROtoDOS ( RISCOS_ATTRIBS *pRA, DOS_ATTRIBS *pDA, int flags )
if ( flags & CNV_DATETIME ) if ( flags & CNV_DATETIME )
{ {
if ( (pRA->loadaddr & 0xFFF00000) != 0xFFF00000 ) if ( !IS_FILETYPED(pRA->loadaddr) )
{ {
/* If this is not a time/date/type-stamped file... */ /* If this is not a time/date/type-stamped file... */
pDA->utime = 0; pDA->utime = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment