oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged trunk. SVN SUCKS.

Browse Source 
Merged trunk.
SVN SUCKS.

svn path=/branches/affinity/; revision=2661
This commit is contained in:
Benoît Dejean
2007-09-21 21:29:17 +00:00
parent 4c6b506488
commit fcee021a2d
72 changed files with 2066 additions and 2041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sysdeps/linux/glibtop_private.c
View File

@@ -63,13 +63,16 @@ enum TRY_FILE_TO_BUFFER
TRY_FILE_TO_BUFFER_READ = -2
};
int try_file_to_buffer(char *buffer, const char *format, ...)
int try_file_to_buffer(char *buffer, size_t bufsiz, const char *format, ...)
{
char path[4096];
int fd;
ssize_t len;
va_list pa;
if (bufsiz <= sizeof(char*))
g_warning("Huhu, bufsiz of %lu looks bad", (gulong)bufsiz);
va_start(pa, format);
/* C99 also provides vsnprintf */
@@ -82,7 +85,7 @@ int try_file_to_buffer(char *buffer, const char *format, ...)
if((fd = open (path, O_RDONLY)) < 0)
return TRY_FILE_TO_BUFFER_OPEN;
len = read (fd, buffer, BUFSIZ-1);
len = read (fd, buffer, bufsiz - 1);
close (fd);
if (len < 0)
@@ -95,9 +98,9 @@ int try_file_to_buffer(char *buffer, const char *format, ...)
void
file_to_buffer(glibtop *server, char *buffer, const char *filename)
file_to_buffer(glibtop *server, char *buffer, size_t bufsiz, const char *filename)
{
switch(try_file_to_buffer(buffer, filename))
switch(try_file_to_buffer(buffer, bufsiz, filename))
{
case TRY_FILE_TO_BUFFER_OPEN:
glibtop_error_io_r (server, "open (%s)", filename);
@@ -115,7 +118,7 @@ read_boot_time(glibtop *server)
char buffer[BUFSIZ];
char *btime;
file_to_buffer(server, buffer, "/proc/stat");
file_to_buffer(server, buffer, sizeof buffer, "/proc/stat");
btime = strstr(buffer, "btime");