Commit cde23f48 authored by John Ballance's avatar John Ballance
Browse files

repair DOSMap display/output prior to rom inclusion

Detail:
       the DOSMap command had a couple of *8 multipliers which
       thus wrongly indexed dos extent info in printout.
Admin:
       long file name dosfs beta tested in the field .. appears fit
       for purpose.. Also tested at castle
       castle added IP


Version 0.83. Tagged as 'DOSFS-0_83'
parent b5811b3a
/* (0.82) /* (0.83)
* *
* 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.68. * Last processed by srccommit version: 1.68.
* *
*/ */
#define Module_MajorVersion_CMHG 0.82 #define Module_MajorVersion_CMHG 0.83
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 25 Oct 2004 #define Module_Date_CMHG 29 Oct 2004
#define Module_MajorVersion "0.82" #define Module_MajorVersion "0.83"
#define Module_Version 82 #define Module_Version 83
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "25 Oct 2004" #define Module_Date "29 Oct 2004"
#define Module_ApplicationDate "25-Oct-04" #define Module_ApplicationDate "29-Oct-04"
#define Module_ComponentName "DOSFS" #define Module_ComponentName "DOSFS"
#define Module_ComponentPath "RiscOS/Sources/FileSys/ImageFS/DOSFS" #define Module_ComponentPath "RiscOS/Sources/FileSys/ImageFS/DOSFS"
#define Module_FullVersion "0.82" #define Module_FullVersion "0.83"
#define Module_HelpVersion "0.82 (25 Oct 2004)" #define Module_HelpVersion "0.83 (29 Oct 2004)"
#define Module_LibraryVersionInfo "0:82" #define Module_LibraryVersionInfo "0:83"
...@@ -927,7 +927,7 @@ void fs_service(int service_number,_kernel_swi_regs *rset,void *privateword) ...@@ -927,7 +927,7 @@ void fs_service(int service_number,_kernel_swi_regs *rset,void *privateword)
sprintf(tbuff,"DOSMap ") ; sprintf(tbuff,"DOSMap ") ;
for (loop = 0; (loop < 7); loop++) for (loop = 0; (loop < 7); loop++)
{ {
char cchr = (*(char*)(cptr->dosext + (loop * 8))) ; char cchr = (*(char*)(cptr->dosext + (loop ))) ;
cchr = (((cchr > ' ') && (cchr != 0x7F)) ? cchr : ' ') ; cchr = (((cchr > ' ') && (cchr != 0x7F)) ? cchr : ' ') ;
sprintf(&tbuff[strlen(tbuff)],"%c",cchr) ; sprintf(&tbuff[strlen(tbuff)],"%c",cchr) ;
} }
...@@ -1221,7 +1221,7 @@ _kernel_oserror *fs_commands(const char *argv,int argc,int command,void *private ...@@ -1221,7 +1221,7 @@ _kernel_oserror *fs_commands(const char *argv,int argc,int command,void *private
for (loop = 0; (loop < 7); loop++) for (loop = 0; (loop < 7); loop++)
{ {
char cchr = (*(char*)(cptr->dosext + (loop * 8))) ; char cchr = (*(char*)(cptr->dosext + (loop))) ;
putchar( (((cchr > ' ') && (cchr != 0x7F)) ? cchr : ' ') ); putchar( (((cchr > ' ') && (cchr != 0x7F)) ? cchr : ' ') );
} }
...@@ -1331,7 +1331,7 @@ _kernel_oserror *fs_commands(const char *argv,int argc,int command,void *private ...@@ -1331,7 +1331,7 @@ _kernel_oserror *fs_commands(const char *argv,int argc,int command,void *private
if (cptr == NULL) if (cptr == NULL)
{ {
mapentry *newmapping ; mapentry *newmapping ;
if ((newmapping = (mapentry *)malloc(sizeof(mapentry))) == NULL) if ((newmapping = (mapentry *)calloc(sizeof(mapentry),1)) == NULL)
rerror = global_errorT(err_heapexhausted, tok_heapexhausted, 0, 0) ; rerror = global_errorT(err_heapexhausted, tok_heapexhausted, 0, 0) ;
else else
{ {
......
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