X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Fcmdedit.c;h=9c66ce2842c4d73133109310a69bd1ecf12da5dd;hb=1e6aba967ce2e1225e7ed566e5b83cbfb117b6b4;hp=c0fa1b2552c90643b6560e323371f051835df8e2;hpb=16e45d7e29a35c57fc31484e72f1294144e4899c;p=oweals%2Fbusybox.git

diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index c0fa1b255..9c66ce284 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -186,7 +186,7 @@ static void cmdedit_reset_term(void)
 {
 	if ((handlers_sets & SET_RESET_TERM) != 0) {
 /* sparc and other have broken termios support: use old termio handling. */
-		setTermSettings(fileno(stdin), (void *) &initial_settings);
+		setTermSettings(STDIN_FILENO, (void *) &initial_settings);
 		handlers_sets &= ~SET_RESET_TERM;
 	}
 	if ((handlers_sets & SET_WCHG_HANDLERS) != 0) {
@@ -1207,7 +1207,7 @@ enum {
 /*
  * This function is used to grab a character buffer
  * from the input file descriptor and allows you to
- * a string with full command editing (sortof like
+ * a string with full command editing (sort of like
  * a mini readline).
  *
  * The following standard commands are not implemented:
@@ -1290,7 +1290,7 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
 			put_prompt();
 #else
 			len = 0;
-			break_out = -1; /* for control traps */
+			break_out = -1; /* to control traps */
 #endif
 			break;
 		case 4:
@@ -1304,7 +1304,8 @@ prepare_to_die:
 				/* cmdedit_reset_term() called in atexit */
 				exit(EXIT_SUCCESS);
 #else
-				len = break_out = -1; /* for control stoped jobs */
+				/* to control stopped jobs */
+				len = break_out = -1;
 				break;
 #endif
 			} else {
@@ -1430,12 +1431,12 @@ rewrite_line:
 				break;
 			case '1':
 			case 'H':
-				/* Home (Ctrl-A) */
+				/* <Home> */
 				input_backward(cursor);
 				break;
 			case '4':
 			case 'F':
-				/* End (Ctrl-E) */
+				/* <End> */
 				input_end();
 				break;
 			default:
@@ -1496,10 +1497,11 @@ rewrite_line:
 #if MAX_HISTORY >= 1
 	/* Handle command history log */
 	/* cleanup may be saved current command line */
-	free(history[MAX_HISTORY]);
-	history[MAX_HISTORY] = 0;
 	if (len> 0) {                                      /* no put empty line */
 		int i = n_history;
+
+		free(history[MAX_HISTORY]);
+		history[MAX_HISTORY] = 0;
 			/* After max history, remove the oldest command */
 		if (i >= MAX_HISTORY) {
 			free(history[0]);