mirror of
https://github.com/shadow-maint/shadow.git
synced 2026-01-31 00:04:35 +00:00
1ebca415b8
fgets(3) returns either NULL or the input pointer. Checking for NULL is more explicit, and simpler. <stddef.h> is the header that provides NULL; add it where appropriate. The meat of this patch can be approximated with the following semantic patch: $ cat ~/tmp/spatch/fgets_null.sp @@ expression a, b, c; @@ - fgets(a, b, c) == a + fgets(a, b, c) != NULL @@ expression a, b, c; @@ - fgetsx(a, b, c) == a + fgetsx(a, b, c) != NULL @@ expression a, b, c, p; @@ - p->cio_fgets(a, b, c) == a + p->cio_fgets(a, b, c) != NULL @@ expression a, b, c; @@ - fgets(a, b, c) != a + fgets(a, b, c) == NULL @@ expression a, b, c; @@ - fgetsx(a, b, c) != a + fgetsx(a, b, c) == NULL @@ expression a, b, c, p; @@ - p->cio_fgets(a, b, c) != a + p->cio_fgets(a, b, c) == NUL Applied as $ find contrib/ lib* src/ -type f \ | xargs spatch --sp-file ~/tmp/spatch/fgets_null.sp --in-place; The differences between the actual patch and the approximation via the semantic patch from above are includes, whitespace, braces, and a case where there was an implicit pointer-to-bool comparison which I made explicit. When reviewing, it'll be useful to use git-diff(1) with '-w' and '--color-words=.'. Signed-off-by: Alejandro Colomar <alx@kernel.org>
70 lines
1.3 KiB
C
70 lines
1.3 KiB
C
/*
|
|
* SPDX-FileCopyrightText: 1989 - 1994, Julianne Frances Haugh
|
|
* SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
|
|
* SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
|
|
* SPDX-FileCopyrightText: 2008 - 2010, Nicolas François
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ident "$Id$"
|
|
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "defines.h"
|
|
#include "getdef.h"
|
|
#include "prototypes.h"
|
|
#include "string/strcmp/streq.h"
|
|
#include "string/strcmp/strprefix.h"
|
|
#include "string/strtok/stpsep.h"
|
|
|
|
|
|
/*
|
|
* ttytype - set ttytype from port to terminal type mapping database
|
|
*/
|
|
void ttytype (const char *line)
|
|
{
|
|
FILE *fp;
|
|
char buf[BUFSIZ];
|
|
const char *typefile;
|
|
char type[1024] = "";
|
|
char port[1024];
|
|
|
|
if (getenv ("TERM") != NULL) {
|
|
return;
|
|
}
|
|
typefile = getdef_str ("TTYTYPE_FILE");
|
|
if (NULL == typefile) {
|
|
return;
|
|
}
|
|
|
|
fp = fopen (typefile, "r");
|
|
if (NULL == fp) {
|
|
if (errno != ENOENT)
|
|
perror (typefile);
|
|
return;
|
|
}
|
|
while (fgets(buf, sizeof(buf), fp) != NULL) {
|
|
if (strprefix(buf, "#")) {
|
|
continue;
|
|
}
|
|
|
|
stpsep(buf, "\n");
|
|
|
|
if ( (sscanf (buf, "%1023s %1023s", type, port) == 2)
|
|
&& streq(line, port)) {
|
|
break;
|
|
}
|
|
}
|
|
if ((feof(fp) == 0) && (ferror(fp) == 0) && !streq(type, "")) {
|
|
addenv ("TERM", type);
|
|
}
|
|
|
|
(void) fclose (fp);
|
|
}
|
|
|