mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-04 16:25:18 +00:00
Code Issues Releases Wiki Activity

prog/dump/*.c, prog/detect/*.c: Handle possible error in fgets().

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4080 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2006-08-01 09:46:50 +00:00
parent dd7848c788
commit 4c211d81d9
7 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
prog/detect/i2cdetect.c
View File

@@ -330,8 +330,8 @@ int main(int argc, char *argv[])
fprintf(stderr, "Continue? [Y/n] "); fprintf(stderr, "Continue? [Y/n] ");
fflush(stderr); fflush(stderr);
fgets(s, 2, stdin); if (!fgets(s, 2, stdin)
if (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y') { || (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y')) {
fprintf(stderr, "Aborting on user request.\n"); fprintf(stderr, "Aborting on user request.\n");
exit(0); exit(0);
} }

7
prog/dump/i2cbusses.c
View File

@@ -177,9 +177,14 @@ found:
int i2cbus; int i2cbus;
enum adt type; enum adt type;
char x[120]; char x[120];
char *px;
fgets(x, 120, f); px = fgets(x, 120, f);
fclose(f); fclose(f);
if (!px) {
fprintf(stderr, "%s: read error\n", n);
continue;
}
if((border = index(x, '\n')) != NULL) if((border = index(x, '\n')) != NULL)
*border = 0; *border = 0;
if(count++ == 0 && !procfmt) if(count++ == 0 && !procfmt)

4
prog/dump/i2cdump.c
View File

@@ -281,8 +281,8 @@ int main(int argc, char *argv[])
fprintf(stderr, "Continue? [Y/n] "); fprintf(stderr, "Continue? [Y/n] ");
fflush(stderr); fflush(stderr);
fgets(s, 2, stdin); if (!fgets(s, 2, stdin)
if (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y') { || (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y')) {
fprintf(stderr, "Aborting on user request.\n"); fprintf(stderr, "Aborting on user request.\n");
exit(0); exit(0);
} }

4
prog/dump/i2cget.c
View File

@@ -156,8 +156,8 @@ int confirm(const char *filename, int address, int size, int daddress, int pec)
fprintf(stderr, "Continue? [%s] ", dont ? "y/N" : "Y/n"); fprintf(stderr, "Continue? [%s] ", dont ? "y/N" : "Y/n");
fflush(stderr); fflush(stderr);
fgets(s, 2, stdin); if (!fgets(s, 2, stdin)
if ((s[0] != '\n' || dont) && s[0] != 'y' && s[0] != 'Y') { || ((s[0] != '\n' || dont) && s[0] != 'y' && s[0] != 'Y')) {
fprintf(stderr, "Aborting on user request.\n"); fprintf(stderr, "Aborting on user request.\n");
return 0; return 0;
} }

8
prog/dump/i2cset.c
View File

@@ -192,8 +192,8 @@ int main(int argc, char *argv[])
fprintf(stderr, "Continue? [%s] ", dont ? "y/N" : "Y/n"); fprintf(stderr, "Continue? [%s] ", dont ? "y/N" : "Y/n");
fflush(stderr); fflush(stderr);
fgets(s, 2, stdin); if (!fgets(s, 2, stdin)
if ((s[0] != '\n' || dont) && s[0] != 'y' && s[0] != 'Y') { || ((s[0] != '\n' || dont) && s[0] != 'y' && s[0] != 'Y')) {
fprintf(stderr, "Aborting on user request.\n"); fprintf(stderr, "Aborting on user request.\n");
exit(0); exit(0);
} }
@@ -228,8 +228,8 @@ int main(int argc, char *argv[])
fprintf(stderr, "Continue? [Y/n] "); fprintf(stderr, "Continue? [Y/n] ");
fflush(stderr); fflush(stderr);
fgets(s, 2, stdin); if (!fgets(s, 2, stdin)
if (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y') { || (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y')) {
fprintf(stderr, "Aborting on user request.\n"); fprintf(stderr, "Aborting on user request.\n");
exit(0); exit(0);
} }

4
prog/dump/isadump.c
View File

@@ -248,8 +248,8 @@ int main(int argc, char *argv[])
fprintf(stderr, "Continue? [Y/n] "); fprintf(stderr, "Continue? [Y/n] ");
fflush(stderr); fflush(stderr);
fgets(s, 2, stdin); if (!fgets(s, 2, stdin)
if (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y') { || (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y')) {
fprintf(stderr, "Aborting on user request.\n"); fprintf(stderr, "Aborting on user request.\n");
exit(0); exit(0);
} }

8
prog/dump/isaset.c
View File

@@ -179,8 +179,8 @@ int main(int argc, char *argv[])
fprintf(stderr, "Continue? [Y/n] "); fprintf(stderr, "Continue? [Y/n] ");
fflush(stderr); fflush(stderr);
fgets(s, 2, stdin); if (!fgets(s, 2, stdin)
if (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y') { || (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y')) {
fprintf(stderr, "Aborting on user request.\n"); fprintf(stderr, "Aborting on user request.\n");
exit(0); exit(0);
} }
@@ -234,8 +234,8 @@ int main(int argc, char *argv[])
fprintf(stderr, "Continue? [Y/n] "); fprintf(stderr, "Continue? [Y/n] ");
fflush(stderr); fflush(stderr);
fgets(s, 2, stdin); if (!fgets(s, 2, stdin)
if (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y') { || (s[0] != '\n' && s[0] != 'y' && s[0] != 'Y')) {
fprintf(stderr, "Aborting on user request.\n"); fprintf(stderr, "Aborting on user request.\n");
exit(0); exit(0);
} }