86 lines
2.2 KiB
Diff
86 lines
2.2 KiB
Diff
--- powertop/powertop.c 2007-05-11 21:28:43.000000000 +0200
|
|
+++ powertop/powertop.c 2007-05-13 17:19:00.000000000 +0200
|
|
@@ -128,7 +128,8 @@
|
|
int nr = -1;
|
|
uint64_t count = 0;
|
|
memset(line,0,sizeof(line));
|
|
- fgets(line, 1024, file);
|
|
+ if (fgets(line, 1024, file) == NULL)
|
|
+ break;
|
|
c = strchr(line, ':');
|
|
if (!c)
|
|
continue;
|
|
@@ -189,7 +190,8 @@
|
|
|
|
while (!feof(file)) {
|
|
memset(line, 0, 4096);
|
|
- fgets(line, 4096, file);
|
|
+ if (fgets(line, 4096, file) == NULL)
|
|
+ break;
|
|
c = strstr(line, "age[");
|
|
if (!c)
|
|
continue;
|
|
@@ -294,7 +296,8 @@
|
|
char line[1024];
|
|
char *c;
|
|
int dontcount = 0;
|
|
- fgets(line, 1024, file);
|
|
+ if (fgets(line, 1024, file) == NULL)
|
|
+ break;
|
|
if (strstr(line, "present:") && strstr(line,"no"))
|
|
break;
|
|
|
|
@@ -320,7 +323,7 @@
|
|
}
|
|
|
|
|
|
-int main(int argc, char **argv)
|
|
+int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)))
|
|
{
|
|
char line[1024];
|
|
FILE *file = NULL;
|
|
@@ -392,7 +395,8 @@
|
|
while (file && !feof(file) && i<190) {
|
|
char *count, *pid, *process, *func;
|
|
int cnt;
|
|
- fgets(line, 1024, file);
|
|
+ if (fgets(line, 1024, file) == NULL)
|
|
+ break;
|
|
if (strstr(line, "total events"))
|
|
break;
|
|
c = count = & line[0];
|
|
--- powertop/config.c 2007-05-11 21:28:39.000000000 +0200
|
|
+++ powertop/config.c 2007-05-13 17:22:57.000000000 +0200
|
|
@@ -47,7 +47,8 @@
|
|
file = popen("zcat /proc/config.gz","r");
|
|
while (file && !feof(file)) {
|
|
char line[100];
|
|
- fgets(line, 100, file);
|
|
+ if (fgets(line, 100, file) == NULL)
|
|
+ break;
|
|
strcpy(configlines[configcount++], line);
|
|
}
|
|
pclose(file);
|
|
@@ -56,7 +57,10 @@
|
|
file = fopen("/proc/sys/kernel/osrelease","r");
|
|
if (!file)
|
|
return;
|
|
- fgets(version, 100, file);
|
|
+ if (fgets(version, 100, file) == NULL) {
|
|
+ fclose(file);
|
|
+ return;
|
|
+ }
|
|
fclose(file);
|
|
c = strchr(version, '\n');
|
|
if (c) *c=0;
|
|
@@ -66,7 +70,8 @@
|
|
return;
|
|
while (!feof(file)) {
|
|
char line[100];
|
|
- fgets(line, 100, file);
|
|
+ if (fgets(line, 100, file) == NULL)
|
|
+ break;
|
|
strcpy(configlines[configcount++], line);
|
|
}
|
|
fclose(file);
|