From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 04/10] hush: refactor get_user_input()
Date: Tue, 12 Nov 2013 14:52:13 +0100 [thread overview]
Message-ID: <1384264339-15986-5-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1384264339-15986-1-git-send-email-s.hauer@pengutronix.de>
Save indentation level by returning early.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/hush.c | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/common/hush.c b/common/hush.c
index 0f1a9b9..7a077ba 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -441,25 +441,27 @@ static void get_user_input(struct in_str *i)
if (i->promptmode == 1) {
strcpy(the_command,console_buffer);
i->p = the_command;
- } else {
- if (console_buffer[0] != '\n') {
- if (strlen(the_command) + strlen(console_buffer)
- < CONFIG_CBSIZE) {
- n = strlen(the_command);
- the_command[n - 1] = ' ';
- strcpy(&the_command[n], console_buffer);
- }
- else {
- the_command[0] = '\n';
- the_command[1] = '\0';
- }
- }
- if (i->__promptme == 0) {
+ return;
+ }
+
+ if (console_buffer[0] != '\n') {
+ if (strlen(the_command) + strlen(console_buffer)
+ < CONFIG_CBSIZE) {
+ n = strlen(the_command);
+ the_command[n - 1] = ' ';
+ strcpy(&the_command[n], console_buffer);
+ } else {
the_command[0] = '\n';
the_command[1] = '\0';
}
- i->p = console_buffer;
}
+
+ if (i->__promptme == 0) {
+ the_command[0] = '\n';
+ the_command[1] = '\0';
+ }
+
+ i->p = console_buffer;
}
/* This is the magic location that prints prompts
--
1.8.4.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-11-12 13:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-12 13:52 hush patches Sascha Hauer
2013-11-12 13:52 ` [PATCH 01/10] hush: fix exit on syntax error behaviour Sascha Hauer
2013-11-12 13:52 ` [PATCH 02/10] hush: refactor readline call Sascha Hauer
2013-11-12 13:52 ` [PATCH 03/10] readline: remove unused variable Sascha Hauer
2013-11-12 13:52 ` Sascha Hauer [this message]
2013-11-12 13:52 ` [PATCH 05/10] hush: refactor file_get() Sascha Hauer
2013-11-12 13:52 ` [PATCH 06/10] hush: rename __promptme to interrupt Sascha Hauer
2013-11-12 13:52 ` [PATCH 07/10] consolidate syntax() and syntax_err() Sascha Hauer
2013-11-12 13:52 ` [PATCH 08/10] hush: Be more informative on syntax error Sascha Hauer
2013-11-12 13:52 ` [PATCH 09/10] hush: use standard ARRAY_SIZE Sascha Hauer
2013-11-12 13:52 ` [PATCH 10/10] hush: refactor reserved_word() Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384264339-15986-5-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox