1 files changed, 3 insertions, 1 deletions
diff --git a/libcli.c b/libcli.c
index 2f09d32..9c9a9ae 100644
--- a/libcli.c
+++ b/libcli.c
@@ -314,7 +314,7 @@ int cli_show_help(struct cli_def *cli, struct cli_command *c)
         if (p->command && p->callback && cli->privilege >= p->privilege &&
             (p->mode == cli->mode || p->mode == MODE_ANY))
         {
-            cli_error(cli, "  %-20s %s", cli_command_name(cli, p), (p->help != NULL ? p->help : ""));
+            cli_error(cli, "  %-35s %s", cli_command_name(cli, p), (p->help != NULL ? p->help : ""));
         }
 
         if (p->children)
@@ -1031,6 +1031,8 @@ int cli_loop_read_next_char(struct cli_def *cli, struct cli_loop_ctx *ctx, unsig
 	    ctx->l = -1;
 	    return CLI_LOOP_CTRL_BREAK;
 	}
+	if (n == 0)
+	    return CLI_LOOP_CTRL_CONTINUE;
     }
     else
     {