commit 5ccaf6209068f5c67cb481d8cf42bc5bde22df57
author David 'Digit' Turner <digit@google.com> Wed Jun 09 18:26:16 2010 -0700
committer David 'Digit' Turner <digit@google.com> Wed Jun 09 18:26:37 2010 -0700
tree faf8967e5edcd8167402a10b83b501972336d4d0
parent f45d94425b3ee071562d32b4313cb6231031d398
parent 43a3d66f132f5e93906d655a3f79d44dfc12f46d

resolved conflicts for merge of 43a3d66f to master

Change-Id: I5e09ee0778f6971ae2c34de23f719328035c61ed

libc/docs/CHANGES.TXT

diff --git a/libc/docs/CHANGES.TXT b/libc/docs/CHANGES.TXT
index 9407173..e700da4 100644
--- a/libc/docs/CHANGES.TXT
+++ b/libc/docs/CHANGES.TXT
@@ -13,6 +13,9 @@
 - <semaphore.h>: Use private futexes for semaphore implementation,
   unless your set 'pshared' to non-0 when calling sem_init().
 
+- sysconf() didn't work for some arguments due to a small bug in the
+  /proc line parser.
+
 -------------------------------------------------------------------------------
 Differences between Android 2.2. and Android 2.1:
 

libc/unistd/sysconf.c

diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c
index d3089a4..dedc5bc 100644
--- a/libc/unistd/sysconf.c
+++ b/libc/unistd/sysconf.c
@@ -317,7 +317,7 @@
 static int
 line_parser_getc( LineParser*  p )
 {
-    if (p->in_len >= p->in_pos) {
+    if (p->in_pos >= p->in_len) {
         int  ret;
 
         p->in_len = p->in_pos = 0;