Commit 8b79f20e authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Fixed fault in res library in RISC_OSLib.

  Module library builds of RISC_OSLib are exported during export_libs
Detail:
  Ever since res_findname was altered to use <appname>:<resourcename> as
    the filename, the !C++ tool has been broken, because C++:Messages
    returns a different error to "not found" when you try to open it (it
    says it is an invalid filename).  This error is now caught explicitly
    and res_findname falls back to using <appname$Dir>.<resourcename>
    like it did before.
Admin:
  Required by FrontEnd 1.21 or later.
  Required by !C++ (c++cmd-3_17 or later to function correctly)

Version 5.28. Tagged as 'RISC_OSLib-5_28'
parent 0bb3e26a
......@@ -250,6 +250,7 @@ EXPORTED_LIBS =\
Clib:o.ansilib \
CLib:o.stubs \
RISC_OSLib:o.risc_oslib \
RISC_OSLib:o.riscoslibm \
RISC_OSLib:o.rstubs \
RISC_OSLib:o.romstubs \
RISC_OSLib:o.romcstubs
......
......@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.27"
Module_Version SETA 527
Module_MajorVersion SETS "5.28"
Module_Version SETA 528
Module_MinorVersion SETS ""
Module_Date SETS "22 Feb 2001"
Module_ApplicationDate2 SETS "22-Feb-01"
Module_ApplicationDate4 SETS "22-Feb-2001"
Module_Date SETS "02 Mar 2001"
Module_ApplicationDate2 SETS "02-Mar-01"
Module_ApplicationDate4 SETS "02-Mar-2001"
Module_ComponentName SETS "RISC_OSLib"
Module_ComponentPath SETS "RiscOS/Sources/Lib/RISC_OSLib"
Module_FullVersion SETS "5.27"
Module_HelpVersion SETS "5.27 (22 Feb 2001)"
Module_FullVersion SETS "5.28"
Module_HelpVersion SETS "5.28 (02 Mar 2001)"
END
/* (5.27)
/* (5.28)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.27
#define Module_MajorVersion_CMHG 5.28
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Feb 2001
#define Module_Date_CMHG 02 Mar 2001
#define Module_MajorVersion "5.27"
#define Module_Version 527
#define Module_MajorVersion "5.28"
#define Module_Version 528
#define Module_MinorVersion ""
#define Module_Date "22 Feb 2001"
#define Module_Date "02 Mar 2001"
#define Module_ApplicationDate2 "22-Feb-01"
#define Module_ApplicationDate4 "22-Feb-2001"
#define Module_ApplicationDate2 "02-Mar-01"
#define Module_ApplicationDate4 "02-Mar-2001"
#define Module_ComponentName "RISC_OSLib"
#define Module_ComponentPath "RiscOS/Sources/Lib/RISC_OSLib"
#define Module_FullVersion "5.27"
#define Module_HelpVersion "5.27 (22 Feb 2001)"
#define Module_FullVersion "5.28"
#define Module_HelpVersion "5.28 (02 Mar 2001)"
......@@ -53,19 +53,30 @@ void res_init(const char *a) /* Started up with the program name */
BOOL res_findname(const char *leafname, char *buf /*out*/)
{
int l;
os_filestr str;
os_error *e;
const char *progname;
#ifndef UROM
progname = "Obey";
strcpy(buf, "<Obey$Dir>.");
if (programname) {
#endif
progname = programname;
strcpy(buf, programname);
l = strlen(buf);
buf[l++] = ':';
strcat(buf, ":");
#ifndef UROM
}
#endif
strcpy(buf + l, leafname);
strcat(buf, leafname);
str.action = 5;
str.name = buf;
e = os_file(&str);
if (e && e->errnum == 0xCC) {
/* File name 'contents of buf' not recognised - could be illegal path */
sprintf(buf, "<%s$Dir>.%s", progname, leafname);
}
return TRUE;
}
......
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