Commit 9367a4d8 authored by Ben Avison's avatar Ben Avison
Browse files

Bugfix to *Copy

Detail:
  With *Copy A, and the related SWI OS_FSControl 26 with R3 bit 9 clear, if
  a directory was copied over an image file, the contents of the directory
  would be copied (assuming recursive) but then when the attributes were
  copied over, the directory's filetype (usually FFD, Data) and user access
  bits (both 0) were copied to the destination image file, rendering it
  unusable.
Admin:
  Tested on a Raspberry Pi with the DOS partition in the standard disc image.

Version 2.78. Tagged as 'FileSwitch-2_78'
parent d9c7abb7
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.77"
Module_Version SETA 277
Module_MajorVersion SETS "2.78"
Module_Version SETA 278
Module_MinorVersion SETS ""
Module_Date SETS "09 Jul 2012"
Module_ApplicationDate SETS "09-Jul-12"
Module_Date SETS "15 Jul 2012"
Module_ApplicationDate SETS "15-Jul-12"
Module_ComponentName SETS "FileSwitch"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/FileSwitch"
Module_FullVersion SETS "2.77"
Module_HelpVersion SETS "2.77 (09 Jul 2012)"
Module_FullVersion SETS "2.78"
Module_HelpVersion SETS "2.78 (15 Jul 2012)"
END
/* (2.77)
/* (2.78)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.77
#define Module_MajorVersion_CMHG 2.78
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 09 Jul 2012
#define Module_Date_CMHG 15 Jul 2012
#define Module_MajorVersion "2.77"
#define Module_Version 277
#define Module_MajorVersion "2.78"
#define Module_Version 278
#define Module_MinorVersion ""
#define Module_Date "09 Jul 2012"
#define Module_Date "15 Jul 2012"
#define Module_ApplicationDate "09-Jul-12"
#define Module_ApplicationDate "15-Jul-12"
#define Module_ComponentName "FileSwitch"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/FileSwitch"
#define Module_FullVersion "2.77"
#define Module_HelpVersion "2.77 (09 Jul 2012)"
#define Module_LibraryVersionInfo "2:77"
#define Module_FullVersion "2.78"
#define Module_HelpVersion "2.78 (15 Jul 2012)"
#define Module_LibraryVersionInfo "2:78"
......@@ -1379,9 +1379,26 @@ CopyDirectory Entry
TST r14, #util_noattr
BNE %FT50
[ {TRUE} ; don't change the filetype or user access attributes of destination
; directory - it may be an image file!
MOV r0, #fsfile_ReadInfo
BL CallFSFile_Given
LDR lr, =&FFF ; mask of filetype bits
LDR r3, util_load
AND r2, r2, lr, LSL #8
BIC r3, r3, lr, LSL #8
ORR r2, r2, r3
LDR r3, util_attr
AND r5, r5, #3
BIC r3, r3, #3
ORR r5, r5, r3
LDR r3, util_exec
|
LDR r2, util_load
LDR r3, util_exec
LDR r5, util_attr
]
;************** Horrendous kloodge to get round NetFS not being able to
; set the load and exec of a directory!
......
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