summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-03 09:13:23 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-03 09:13:23 -0700
commit324a98f1901fb84ec4c88196e01c3e14c2b5a4a4 (patch)
treeea20296fbb3af0222f0590d776244d0b75a62e0b
parentf7e148c1bc482fe7f8df49d216b1f9390f0638b9 (diff)
parent1bc4eae3492b5e5fd8afdb3bb92c63287e8e994c (diff)
downloadsystem_core-324a98f1901fb84ec4c88196e01c3e14c2b5a4a4.zip
system_core-324a98f1901fb84ec4c88196e01c3e14c2b5a4a4.tar.gz
system_core-324a98f1901fb84ec4c88196e01c3e14c2b5a4a4.tar.bz2
merge from open-source master
Change-Id: I6262a725068f89c989e2e6706bcd220ddb217c8e
-rw-r--r--sh/input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sh/input.c b/sh/input.c
index 9377bd0..bfb80f4 100644
--- a/sh/input.c
+++ b/sh/input.c
@@ -221,7 +221,7 @@ retry:
/* Add non-blank lines to history. */
linenoiseHistoryAdd(rl_start);
}
- out2str("\r\n");
+ out2str("\n");
/* Client expects a newline at end of input, doesn't expect null */
rl_start[el_len++] = '\n';
}