chomp should only remove the newline if it occurs at the end of the input.

This was caught by the test suite (in sed/sed-aic-commands).

* libbb/chomp.c: Revert to revision 1.5.


git-svn-id: svn://busybox.net/trunk/busybox@3992 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 5 insertions, 3 deletions

diff --git a/libbb/chomp.c b/libbb/chomp.c
index e5a522f01..94404a98d 100644
--- a/libbb/chomp.c
+++ b/libbb/chomp.c
@@ -25,11 +25,13 @@
 #include <string.h>
 #include "libbb.h"
 
+
 void chomp(char *s)
 {
-        if (!(s && *s)) return;
-        while (*s && (*s != '\n')) s++;
-        *s = 0;
+        char *lc = last_char_is(s, '\n');
+        
+        if(lc)
+                *lc = 0;
 }