system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove incorrect paring of /proc/stat etc.

Browse Source
This commit is contained in:
Ryan S. Arnold 2010-04-03 19:20:29 -07:00 committed by Ulrich Drepper
parent ed08740859
commit 3ed8e24122
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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]

14
sysdeps/unix/sysv/linux/getsysstats.c
View File

@ -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);