com32/chain: once more rename option: stop -> break

Seems to be most appropriate...

Signed-off-by: Michal Soltys <soltys@ziu.info>

diff --git a/com32/chain/chain.c b/com32/chain/chain.c
index e35eee5..bb7d2a4 100644 (file)
--- a/com32/chain/chain.c
+++ b/com32/chain/chain.c
@@ -641,7 +641,7 @@ int main(int argc, char *argv[])
        wait_key();
     }
 
-    if (ndata && !opt.stop) /* boot only if we actually chainload */
+    if (ndata && !opt.brkchain) /* boot only if we actually chainload */
        do_boot(data, ndata);
     else
        error("Service-only run completed, exiting.\n");

diff --git a/com32/chain/options.c b/com32/chain/options.c
index a897c32..658a45c 100644 (file)
--- a/com32/chain/options.c
+++ b/com32/chain/options.c
@@ -86,7 +86,7 @@ Usage:\n\
     nokeeppxe            Keep the PXE and UNDI stacks in memory (PXELINUX)\n\
     nowarn               Wait for a keypress to continue chainloading\n\
                          - useful to see emited warnings\n\
-    nostop               Actually perform the chainloading\n\
+    nobreak              Actually perform the chainloading\n\
 ", "\
 \nOptions continued ...\n\
     file=<file>          Load and execute <file>\n\
@@ -122,10 +122,10 @@ Usage:\n\
 void opt_set_defs(void)
 {
     memset(&opt, 0, sizeof(opt));
-    opt.sect = true;   /* by def. load sector */
-    opt.maps = true;   /* by def. map sector */
-    opt.hand = true;   /* by def. prepare handover */
-    opt.stop = false;  /* by def. do chainload */
+    opt.sect = true;       /* by def. load sector */
+    opt.maps = true;       /* by def. map sector */
+    opt.hand = true;       /* by def. prepare handover */
+    opt.brkchain = false;   /* by def. do chainload */
     opt.foff = opt.soff = opt.fip = opt.sip = 0x7C00;
     opt.drivename = "boot";
 #ifdef DEBUG
@@ -300,10 +300,10 @@ int opt_parse_args(int argc, char *argv[])
            opt.warn = true;
        } else if (!strcmp(argv[i], "nowarn")) {
            opt.warn = false;
-       } else if (!strcmp(argv[i], "nostop")) {
-           opt.stop = false;
-       } else if (!strcmp(argv[i], "stop")) {
-           opt.stop = true;
+       } else if (!strcmp(argv[i], "nobreak")) {
+           opt.brkchain = false;
+       } else if (!strcmp(argv[i], "break")) {
+           opt.brkchain = true;
            opt.file = NULL;
            opt.maps = false;
            opt.hand = false;

diff --git a/com32/chain/options.h b/com32/chain/options.h
index 1f34cd0..4493ef1 100644 (file)
--- a/com32/chain/options.h
+++ b/com32/chain/options.h
@@ -32,7 +32,7 @@ struct options {
     bool filebpb;
     bool fixchs;
     bool warn;
-    bool stop;
+    bool brkchain;
     uint16_t keeppxe;
     struct syslinux_rm_regs regs;
 };

diff --git a/doc/chain.txt b/doc/chain.txt
index 68238a0..6dd0632 100644 (file)
--- a/doc/chain.txt
+++ b/doc/chain.txt
@@ -34,7 +34,7 @@ jumps to 0:0x7c00.
 
 A "service-only" run is possible when either:
 
-- 'stop' is in effect
+- 'break' is in effect
 
 or
 
@@ -42,9 +42,9 @@ or
 
 This is useful for invocations such as:
 
-chain.c32 hdN M setbpb save stop
-chain.c32 hdN fixchs stop
-chain.c32 hdN unhideall stop
+chain.c32 hdN M setbpb save break
+chain.c32 hdN fixchs break
+chain.c32 hdN unhideall break
 
 Please see respective options for more details.
 
@@ -229,13 +229,13 @@ stacks in memory (pxelinux only).
 This option will wait for a keypress right before continuing the chainloading.
 Useful to see warnings emited by the chain module.
 
-       *nostop
-       stop
-       stop sets: nofile nomaps nohand
+       *nobreak
+       break
+       break sets: nofile nomaps nohand
 
 It is possible to trigger a "service-only" run - The chain module will do
 everything requested as usual, but it will not perform the actual chainloading.
-'stop' option disables handover, file loading and sector mapping, as these
+'break' option disables handover, file loading and sector mapping, as these
 are pointless in such scenario (although file might be reenabled in some future
 version, if writing to actual files becomes possible). Mainly useful for
 options 'fixchs', '[un]hide[all]' and setbpb.