Skip to content

GitLab

Commit 194ac5ff authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Fix BootApps BootBoot BootRun to not append a new section 

Previously the default 'Desktop' file in the 5.xx boot sequence had the above 3 sections demarked with "RISC OS" with a space, while this plugin was searching for one demarked with "Acorn".
Now, both use "RISCOS", so the existing settings will be correctly read in, and new settings not written in a new section when merged.

Version 0.08. Tagged as 'Bootxxxx-0_08'
parent dcdf4da7
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
VersionNum
View file @ 194ac5ff
/* (0.07)
/* (0.08)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.07
#define Module_MajorVersion_CMHG 0.08
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 09 Jul 2012
#define Module_Date_CMHG 28 Jul 2012
#define Module_MajorVersion "0.07"
#define Module_Version 7
#define Module_MajorVersion "0.08"
#define Module_Version 8
#define Module_MinorVersion ""
#define Module_Date "09 Jul 2012"
#define Module_Date "28 Jul 2012"
#define Module_ApplicationDate "09-Jul-12"
#define Module_ApplicationDate "28-Jul-12"
#define Module_ComponentName "Bootxxxx"
#define Module_ComponentPath "castle/RiscOS/Sources/SystemRes/Configure2/PlugIns/Bootxxxx"
#define Module_FullVersion "0.07"
#define Module_HelpVersion "0.07 (09 Jul 2012)"
#define Module_LibraryVersionInfo "0:7"
#define Module_FullVersion "0.08"
#define Module_HelpVersion "0.08 (28 Jul 2012)"
#define Module_LibraryVersionInfo "0:8"
c/List
View file @ 194ac5ff
......@@ -186,18 +186,18 @@ _kernel_oserror *List_Read (BOOL rescan)
#if APP == BOOTAPPS
if (!err)
{
err = static_FindRange (PREDESKTOP, "ResApps", "Acorn", "BootApps", &found, &line_first, &line_last);
err = static_FindRange (PREDESKTOP, "ResApps", "RISCOS", "BootApps", &found, &line_first, &line_last);
if (!err && !found)
{
/* Entry doesn't exist, it'll go after all Acorn ResApps */
err = static_FindRange (PREDESKTOP, "ResApps", "Acorn", NULL, &found, NULL, &line_last);
/* Entry doesn't exist, it'll go after all RISCOS ResApps */
err = static_FindRange (PREDESKTOP, "ResApps", "RISCOS", NULL, &found, NULL, &line_last);
if (!err && found)
{
line_first = line_last;
}
else if (!err && !found)
{
/* Acorn ResApps doesn't exist, entry will go after all ResApps */
/* RISCOS ResApps doesn't exist, entry will go after all ResApps */
err = static_FindRange (PREDESKTOP, "ResApps", NULL, NULL, &found, NULL, &line_last);
if (!err && found)
{
......@@ -233,18 +233,18 @@ _kernel_oserror *List_Read (BOOL rescan)
#elif APP == BOOTBOOT
if (!err)
{
err = static_FindRange (DESKTOP, "Boot", "Acorn", "BootBoot", &found, &line_first, &line_last);
err = static_FindRange (DESKTOP, "Boot", "RISCOS", "BootBoot", &found, &line_first, &line_last);
if (!err && !found)
{
/* Entry doesn't exist, it'll go after all Acorn Boot */
err = static_FindRange (DESKTOP, "Boot", "Acorn", NULL, &found, NULL, &line_last);
/* Entry doesn't exist, it'll go after all RISCOS Boot */
err = static_FindRange (DESKTOP, "Boot", "RISCOS", NULL, &found, NULL, &line_last);
if (!err && found)
{
line_first = line_last;
}
else if (!err && !found)
{
/* Acorn Boot doesn't exist, entry will go after all Boot */
/* RISCOS Boot doesn't exist, entry will go after all Boot */
err = static_FindRange (DESKTOP, "Boot", NULL, NULL, &found, NULL, &line_last);
if (!err && found)
{
......@@ -271,18 +271,18 @@ _kernel_oserror *List_Read (BOOL rescan)
#elif APP == BOOTRUN
if (!err)
{
err = static_FindRange (DESKTOP, "Run", "Acorn", "BootRun", &found, &line_first, &line_last);
err = static_FindRange (DESKTOP, "Run", "RISCOS", "BootRun", &found, &line_first, &line_last);
if (!err && !found)
{
/* Entry doesn't exist, it'll go after all Acorn Run */
err = static_FindRange (DESKTOP, "Run", "Acorn", NULL, &found, NULL, &line_last);
/* Entry doesn't exist, it'll go after all RISCOS Run */
err = static_FindRange (DESKTOP, "Run", "RISCOS", NULL, &found, NULL, &line_last);
if (!err && found)
{
line_first = line_last;
}
else if (!err && !found)
{
/* Acorn Run doesn't exist, entry will go after all Run */
/* RISCOS Run doesn't exist, entry will go after all Run */
err = static_FindRange (DESKTOP, "Run", NULL, NULL, &found, NULL, &line_last);
if (!err && found)
{
......@@ -398,7 +398,7 @@ _kernel_oserror *List_Write (int buttons)
#if APP == BOOTAPPS
fprintf (f, "|App Configure>*\n|Variable\n\n");
fprintf (f, "|Start Acorn BootApps %s ResApps\n", version);
fprintf (f, "|Start RISCOS BootApps %s ResApps\n", version);
for (ptr = ListHead.next; ptr->next != NULL; ptr = ptr->next)
{
......@@ -411,7 +411,7 @@ _kernel_oserror *List_Write (int buttons)
#elif APP == BOOTBOOT
fprintf (f, "|Section Boot>Auto\n|Variable\n\n");
fprintf (f, "|Start Acorn BootBoot %s Boot\n", version);
fprintf (f, "|Start RISCOS BootBoot %s Boot\n", version);
for (ptr = ListHead.next; ptr->next != NULL; ptr = ptr->next)
{
......@@ -425,7 +425,7 @@ _kernel_oserror *List_Write (int buttons)
#elif APP == BOOTRUN
fprintf (f, "|Section Run>Boot Run>Auto\n|Variable\n\n");
fprintf (f, "|Start Acorn BootRun %s Run\n", version);
fprintf (f, "|Start RISCOS BootRun %s Run\n", version);
for (ptr = ListHead.next; ptr->next != NULL; ptr = ptr->next)
{
......
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