Commit 873c2106 authored by ROOL's avatar ROOL 🤖
Browse files

Fix for double name translation, header ordering

Detail:
  Xlate.c: Directory names containing characters requiring translation (eg. "AcornC/C++", "A B/C") would be translated twice, leading to a 'Directory not found' error when trying to open a file within. Submission from Colin Granville.
  TCPIP.h: Order the headers so that 'netdb.h' comes after its dependents. Submission for TCP/IP bounty.
Admin:
  Test case test/Contentious run, passed OK.

Version 2.62. Tagged as 'LanManFS-2_62'
parent 517c6bdb
/* (2.61) /* (2.62)
* *
* 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.61 #define Module_MajorVersion_CMHG 2.62
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 Jan 2018 #define Module_Date_CMHG 04 Aug 2018
#define Module_MajorVersion "2.61" #define Module_MajorVersion "2.62"
#define Module_Version 261 #define Module_Version 262
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "03 Jan 2018" #define Module_Date "04 Aug 2018"
#define Module_ApplicationDate "03-Jan-18" #define Module_ApplicationDate "04-Aug-18"
#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.61" #define Module_FullVersion "2.62"
#define Module_HelpVersion "2.61 (03 Jan 2018)" #define Module_HelpVersion "2.62 (04 Aug 2018)"
#define Module_LibraryVersionInfo "2:61" #define Module_LibraryVersionInfo "2:62"
...@@ -694,8 +694,8 @@ static void Xlt_CopyViaInverseTable( char *dst, const char *src, int level ) ...@@ -694,8 +694,8 @@ static void Xlt_CopyViaInverseTable( char *dst, const char *src, int level )
{ {
int c = src[i] & 0xFF; int c = src[i] & 0xFF;
if (c == 0) break; if (c == 0) break;
if (i < level) { if (level != 0) { /* Whole path has already been through */
dst[i] = c; dst[i] = c; /* inverse lookup table when level != 0 */
} }
else { else {
dst[i] = lanmanfs_inverse_lookup_table[c]; dst[i] = lanmanfs_inverse_lookup_table[c];
......
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include "netdb.h" #include "sys/socket.h"
#include "inetlib.h"
#include "socklib.h"
/*#include "arpa/inet.h"*/
#include "sys/sockio.h"
#include "sys/errno.h" #include "sys/errno.h"
#include "sys/sockio.h"
#include "sys/filio.h" #include "sys/filio.h"
#include "net/if.h" #include "net/if.h"
#include "inetlib.h"
#include "socklib.h"
#include "netdb.h"
/* RISCOS definitions ========================================== */ /* RISCOS definitions ========================================== */
/* The Internet event: ---------- */ /* The Internet event: ---------- */
......
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