* libmisc/ttytype.c: Avoid implicit conversion of pointers / integers to booleans.
* libmisc/ttytype.c: Avoid assignments in comparisons. * libmisc/ttytype.c: Add brackets and parenthesis. * libmisc/ttytype.c: The return values of fclose is not checked on purpose.
This commit is contained in:
parent
c249832df1
commit
3d7aa44c8e
@ -1,3 +1,12 @@
|
|||||||
|
2008-05-26 Nicolas François <nicolas.francois@centraliens.net>
|
||||||
|
|
||||||
|
* libmisc/ttytype.c: Avoid implicit conversion of pointers /
|
||||||
|
integers to booleans.
|
||||||
|
* libmisc/ttytype.c: Avoid assignments in comparisons.
|
||||||
|
* libmisc/ttytype.c: Add brackets and parenthesis.
|
||||||
|
* libmisc/ttytype.c: The return values of fclose is not checked on
|
||||||
|
purpose.
|
||||||
|
|
||||||
2008-05-26 Nicolas François <nicolas.francois@centraliens.net>
|
2008-05-26 Nicolas François <nicolas.francois@centraliens.net>
|
||||||
|
|
||||||
* libmisc/mail.c: Avoid implicit conversion of pointers to
|
* libmisc/mail.c: Avoid implicit conversion of pointers to
|
||||||
|
@ -53,26 +53,33 @@ void ttytype (const char *line)
|
|||||||
return;
|
return;
|
||||||
if ((typefile = getdef_str ("TTYTYPE_FILE")) == NULL)
|
if ((typefile = getdef_str ("TTYTYPE_FILE")) == NULL)
|
||||||
return;
|
return;
|
||||||
if (access (typefile, F_OK))
|
if (access (typefile, F_OK) != 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!(fp = fopen (typefile, "r"))) {
|
fp = fopen (typefile, "r");
|
||||||
|
if (NULL == fp) {
|
||||||
perror (typefile);
|
perror (typefile);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
while (fgets (buf, sizeof buf, fp)) {
|
while (fgets (buf, sizeof buf, fp) == buf) {
|
||||||
if (buf[0] == '#')
|
if (buf[0] == '#') {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if ((cp = strchr (buf, '\n')))
|
cp = strchr (buf, '\n');
|
||||||
|
if (NULL != cp) {
|
||||||
*cp = '\0';
|
*cp = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
if (sscanf (buf, "%s %s", type, port) == 2 &&
|
if ((sscanf (buf, "%s %s", type, port) == 2) &&
|
||||||
strcmp (line, port) == 0)
|
(strcmp (line, port) == 0)) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!feof (fp) && !ferror (fp))
|
if ((feof (fp) == 0) && (ferror (fp) == 0)) {
|
||||||
addenv ("TERM", type);
|
addenv ("TERM", type);
|
||||||
|
}
|
||||||
|
|
||||||
fclose (fp);
|
(void) fclose (fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user