aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan S. Arnold <rsa@us.ibm.com>2010-04-03 19:20:29 -0700
committerUlrich Drepper <drepper@redhat.com>2010-04-03 19:20:29 -0700
commit3ed8e241229e370cca96650ed727f09838c51d67 (patch)
tree68644689ff3c2fadee968290f23cac2400fe405d
parented0874085976531bda8a05540b0816e8bf711b71 (diff)
downloadglibc-3ed8e241229e370cca96650ed727f09838c51d67.tar
glibc-3ed8e241229e370cca96650ed727f09838c51d67.tar.gz
glibc-3ed8e241229e370cca96650ed727f09838c51d67.tar.bz2
glibc-3ed8e241229e370cca96650ed727f09838c51d67.zip
Remove incorrect paring of /proc/stat etc.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/getsysstats.c14
2 files changed, 7 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index dd6b608114..6420b9df48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-25 Ryan S. Arnold <rsa@us.ibm.com>
+
+ * sysdeps/unix/sysv/linux/getsysstats.c (next_line): Remove
+ redundant and incorrect else block which overwrites current line
+ with the partial next line.
+
2010-04-03 Ulrich Drepper <drepper@redhat.com>
[BZ #11438]
diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
index 97e20d249b..af454b650d 100644
--- a/sysdeps/unix/sysv/linux/getsysstats.c
+++ b/sysdeps/unix/sysv/linux/getsysstats.c
@@ -1,5 +1,5 @@
/* Determine various system internal values, Linux version.
- Copyright (C) 1996-2003, 2006, 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1996-2003,2006,2007,2009,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -117,18 +117,6 @@ next_line (int fd, char *const buffer, char **cp, char **re,
if (nl == NULL)
nl = *re - 1;
}
- else if (nl + 5 >= *re)
- {
- memmove (buffer, nl, *re - nl);
- *re = buffer + (*re - nl);
- nl = *cp = buffer;
-
- ssize_t n = read_not_cancel (fd, *re, buffer_end - *re);
- if (n < 0)
- return NULL;
-
- *re += n;
- }
*cp = nl + 1;
assert (*cp <= *re);