90afe61003
strsep(3) is stateless, and so is easier to reason about.
It also has a slight difference: strtok(3) jumps over empty fields,
while strsep(3) respects them as empty fields. In most of the cases
where we were using strtok(3), it makes more sense to respect empty
fields, and this commit probably silently fixes a few bugs.
In other cases (most notably filesystem paths), contiguous delimiters
("//") should be collapsed, so strtok(3) still makes more sense there.
This commit doesn't replace such strtok(3) calls.
While at this, remove some useless variables used by these calls, and
reduce the scope of others.
Signed-off-by: Alejandro Colomar <alx@kernel.org>
61 lines
1.1 KiB
C
61 lines
1.1 KiB
C
/*
|
|
* SPDX-FileCopyrightText: 1989 - 1991, Julianne Frances Haugh
|
|
* SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
|
|
* SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
|
|
* SPDX-FileCopyrightText: 2010 , Nicolas François
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#ident "$Id$"
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "defines.h"
|
|
#include "getdef.h"
|
|
#include "prototypes.h"
|
|
#include "string/strdup/xstrdup.h"
|
|
|
|
|
|
/*
|
|
* motd -- output the /etc/motd file
|
|
*
|
|
* motd() determines the name of a login announcement file and outputs
|
|
* it to the user's terminal at login time. The MOTD_FILE configuration
|
|
* option is a colon-delimited list of filenames.
|
|
*/
|
|
void
|
|
motd(void)
|
|
{
|
|
FILE *fp;
|
|
char *motdlist;
|
|
const char *motdfile;
|
|
char *mb;
|
|
int c;
|
|
|
|
motdfile = getdef_str ("MOTD_FILE");
|
|
if (NULL == motdfile) {
|
|
return;
|
|
}
|
|
|
|
motdlist = xstrdup (motdfile);
|
|
|
|
mb = motdlist;
|
|
while (NULL != (motdfile = strsep(&mb, ":"))) {
|
|
fp = fopen (motdfile, "r");
|
|
if (NULL != fp) {
|
|
while ((c = getc (fp)) != EOF) {
|
|
putchar (c);
|
|
}
|
|
fclose (fp);
|
|
}
|
|
}
|
|
fflush (stdout);
|
|
|
|
free (motdlist);
|
|
}
|
|
|