User's Guide: bugfix global state info

The "$ocd_HOSTOS" variable was wrongly documented.  Fix its
documentation, and its value on Linux.

Shrink a few of the too-long lines.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index e84f4c8b5d4b4f1becad0376dc93ed5bb93ecd33..d869f389fbd8c3c3b2286c3a07764702f57d26b2 100644 (file)
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -6476,10 +6476,8 @@ called "flash_banks".
 
 @section OpenOCD specific Global Variables
 
-@subsection HostOS
-
 Real Tcl has ::tcl_platform(), and platform::identify, and many other
-variables. JimTCL, as implemented in OpenOCD creates $HostOS which
+variables. JimTCL, as implemented in OpenOCD creates $ocd_HOSTOS which
 holds one of the following values:
 
 @itemize @bullet

diff --git a/src/helper/command.c b/src/helper/command.c
index ca83ec6f4341bffd99b3bae132f4e42da3c2a14b..bd317e6bdaa0995205618404100701a9ee195011 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -717,7 +717,7 @@ command_context_t* command_init()
         * "winxx" is generic.
         */
        HostOs = "winxx";
-#elif defined(__LINUX__)
+#elif defined(__linux__)
        HostOs = "linux";
 #elif defined(__DARWIN__)
        HostOs = "darwin";
@@ -726,9 +726,11 @@ command_context_t* command_init()
 #elif defined(__MINGW32__)
        HostOs = "mingw32";
 #else
+#warn unrecognized host OS...
        HostOs = "other";
 #endif
-       Jim_SetGlobalVariableStr(interp, "ocd_HOSTOS", Jim_NewStringObj(interp, HostOs , strlen(HostOs)));
+       Jim_SetGlobalVariableStr(interp, "ocd_HOSTOS",
+                       Jim_NewStringObj(interp, HostOs , strlen(HostOs)));
 
        Jim_CreateCommand(interp, "ocd_find", jim_find, NULL, NULL);
        Jim_CreateCommand(interp, "echo", jim_echo, NULL, NULL);
@@ -749,16 +751,19 @@ command_context_t* command_init()
 #endif
        if (Jim_Eval_Named(interp, startup_tcl, "embedded:startup.tcl",1) == JIM_ERR)
        {
-               LOG_ERROR("Failed to run startup.tcl (embedded into OpenOCD compile time)");
+               LOG_ERROR("Failed to run startup.tcl (embedded into OpenOCD)");
                Jim_PrintErrorMessage(interp);
                exit(-1);
        }
 
-       register_command(context, NULL, "sleep", handle_sleep_command,
-                                        COMMAND_ANY, "<n> [busy] - sleep for n milliseconds. \"busy\" means busy wait");
-
-       register_command(context, NULL, "fast", handle_fast_command,
-                                        COMMAND_ANY, "fast <enable/disable> - place at beginning of config files. Sets defaults to fast and dangerous.");
+       register_command(context, NULL, "sleep",
+                       handle_sleep_command, COMMAND_ANY,
+                       "<n> [busy] - sleep for n milliseconds. "
+                       "\"busy\" means busy wait");
+       register_command(context, NULL, "fast",
+                       handle_fast_command, COMMAND_ANY,
+                       "fast <enable/disable> - place at beginning of "
+                       "config files. Sets defaults to fast and dangerous.");
 
        return context;
 }