emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

fix the problem with truncated output lines to 2048 characters

Browse Source 
Author: Karel Zak <kzak@redhat.com> and Olivier Fourdan <ofourdan@redhat.com>
Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=134516
Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=487700
This commit is contained in:
Jan Görig 2010-12-16 10:24:44 +01:00
parent af25453d9a
commit 356a1f9a37
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proc/readproc.c
View File

@ -465,17 +465,20 @@ static char** file2strvec(const char* directory, const char* what) {
if(fd==-1) return NULL; if(fd==-1) return NULL;
/* read whole file into a memory buffer, allocating as we go */ /* read whole file into a memory buffer, allocating as we go */
while ((n = read(fd, buf, sizeof buf - 1)) > 0) { while ((n = read(fd, buf, sizeof buf - 1)) >= 0) {
if (n < (int)(sizeof buf - 1)) if (n < (int)(sizeof buf - 1))
end_of_file = 1; end_of_file = 1;
if (n == 0 && rbuf == 0) if (n == 0 && rbuf == 0) {
close(fd);
return NULL; /* process died between our open and read */ return NULL; /* process died between our open and read */
}
if (n < 0) { if (n < 0) {
if (rbuf) if (rbuf)
free(rbuf); free(rbuf);
close(fd);
return NULL; /* read error */ return NULL; /* read error */
} }
if (end_of_file && buf[n-1]) /* last read char not null */ if (end_of_file && (n == 0 || buf[n-1]))/* last read char not null */
buf[n++] = '\0'; /* so append null-terminator */ buf[n++] = '\0'; /* so append null-terminator */
rbuf = xrealloc(rbuf, tot + n); /* allocate more memory */ rbuf = xrealloc(rbuf, tot + n); /* allocate more memory */
memcpy(rbuf + tot, buf, n); /* copy buffer into it */ memcpy(rbuf + tot, buf, n); /* copy buffer into it */