Index: trunk/Ohana/src/opihi/cmd.basic/break.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.basic/break.c	(revision 23582)
+++ trunk/Ohana/src/opihi/cmd.basic/break.c	(revision 27817)
@@ -1,15 +1,16 @@
 # include "basic.h"
 
+// auto_break is currently a global
 int exec_break (int argc, char **argv) {
 
   int N, value;
 
+  if ((N = get_argument (argc, argv, "-h"))) goto usage;
+  if ((N = get_argument (argc, argv, "-help"))) goto usage;
+  if ((N = get_argument (argc, argv, "--help"))) goto usage;
+
   if ((N = get_argument (argc, argv, "-auto"))) {
     remove_argument (N, &argc, argv);
-    value = -1;
-    if (!strcasecmp (argv[N], "on")) value = 1;
-    if (!strcasecmp (argv[N], "off")) value = 0;
-    if (value == -1) {
-      gprint (GP_ERR, "USAGE: break -auto [on / off]\n");
+    if (N == argc) {
       if (auto_break) 
 	gprint (GP_ERR, "auto break on\n");
@@ -18,10 +19,17 @@
       return (FALSE);
     }
+    value = -1;
+    if (!strcasecmp (argv[N], "on")) value = 1;
+    if (!strcasecmp (argv[N], "off")) value = 0;
+    if (value == -1) goto usage;
     auto_break = value;
     return (TRUE);
   }
-
+  
   loop_break = TRUE;
   return (FALSE);
-
+  
+usage:
+  gprint (GP_ERR, "USAGE: break -auto [on / off]\n");
+  return (FALSE);
 }