commit 4381040f43c2d1887aea1c1ca8da8e75935db815
author Ben Cheng <bccheng@android.com> Mon Jun 17 20:55:43 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 17 20:55:43 2013 +0000
tree 164ad99da8278867da2e5e0d690269abb7bcfe87
parent cd7a9917db9ad4a4f56cca5153ea2a7b8fecfde9
parent edb0013923263b9bc2550e5cf02cf1494ba7660c

Merge "Change getline to not count the null terminator"

bionic-fixup/getline.c

diff --git a/bionic-fixup/getline.c b/bionic-fixup/getline.c
index 041a5ed..df07e81 100644
--- a/bionic-fixup/getline.c
+++ b/bionic-fixup/getline.c
@@ -44,6 +44,6 @@
     /* Write the NULL character */
     (*lineptr)[len-1] = '\0';
 
-    /* Return the length of the new buffer */
-    return len;
+    /* Return the length of the new buffer not counting the null character */
+    return len-1;
 }

host-darwin-fixup/getline.c

diff --git a/host-darwin-fixup/getline.c b/host-darwin-fixup/getline.c
index 041a5ed..df07e81 100644
--- a/host-darwin-fixup/getline.c
+++ b/host-darwin-fixup/getline.c
@@ -44,6 +44,6 @@
     /* Write the NULL character */
     (*lineptr)[len-1] = '\0';
 
-    /* Return the length of the new buffer */
-    return len;
+    /* Return the length of the new buffer not counting the null character */
+    return len-1;
 }