Merge branch 'for-next/misc'

2 files changed, 7 insertions, 4 deletions

diff --git a/commands/Kconfig b/commands/Kconfig
index 0853ffda7c..1743670ed3 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -1493,9 +1493,9 @@ config CMD_SPLASH
 
 config CMD_READLINE
 	tristate
-	prompt "Readline"
+	prompt "readline"
 	help
-	  rompt for user input
+	  Prompt for user input
 
 	  Usage: readline PROMPT VAR
 
diff --git a/commands/ls.c b/commands/ls.c
index 09437afcdf..ce02f16c49 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -124,7 +124,7 @@ out:
 
 static int do_ls(int argc, char *argv[])
 {
-	int ret, opt, o;
+	int ret, opt, o, exitcode = 0;
 	struct stat s;
 	ulong flags = LS_COLUMN;
 	struct string_list sl;
@@ -165,6 +165,7 @@ static int do_ls(int argc, char *argv[])
 			printf("%s: %s: %s\n", argv[0],
 					argv[o], errno_str());
 			o++;
+			exitcode = COMMAND_ERROR;
 			continue;
 		}
 
@@ -190,6 +191,7 @@ static int do_ls(int argc, char *argv[])
 		ret = lstat(argv[o], &s);
 		if (ret) {
 			o++;
+			exitcode = COMMAND_ERROR;
 			continue;
 		}
 
@@ -197,6 +199,7 @@ static int do_ls(int argc, char *argv[])
 			ret = ls(argv[o], flags);
 			if (ret) {
 				perror("ls");
+				exitcode = COMMAND_ERROR;
 				o++;
 				continue;
 			}
@@ -205,7 +208,7 @@ static int do_ls(int argc, char *argv[])
 		o++;
 	}
 
-	return 0;
+	return exitcode;
 }
 
 BAREBOX_CMD_HELP_START(ls)