2eaea70111
e5905c4b ("Added control character check") introduced checking for
control characters but had the logic inverted, so it rejects all
characters that are not control ones.
Cast the character to `unsigned char` before passing to the character
checking functions to avoid UB.
Use strpbrk(3) for the illegal character test and return early.
106 lines
2.1 KiB
C
106 lines
2.1 KiB
C
/*
|
|
* SPDX-FileCopyrightText: 1990 , Julianne Frances Haugh
|
|
* SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
|
|
* SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
|
|
* SPDX-FileCopyrightText: 2007 , Nicolas François
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#ident "$Id$"
|
|
|
|
#include <ctype.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include "prototypes.h"
|
|
|
|
/*
|
|
* valid_field - insure that a field contains all legal characters
|
|
*
|
|
* The supplied field is scanned for non-printable and other illegal
|
|
* characters.
|
|
* + -1 is returned if an illegal or control character is present.
|
|
* + 1 is returned if no illegal or control characters are present,
|
|
* but the field contains a non-printable character.
|
|
* + 0 is returned otherwise.
|
|
*/
|
|
int valid_field (const char *field, const char *illegal)
|
|
{
|
|
const char *cp;
|
|
int err = 0;
|
|
|
|
if (NULL == field) {
|
|
return -1;
|
|
}
|
|
|
|
/* For each character of field, search if it appears in the list
|
|
* of illegal characters. */
|
|
if (illegal && NULL != strpbrk (field, illegal)) {
|
|
return -1;
|
|
}
|
|
|
|
/* Search if there are non-printable or control characters */
|
|
for (cp = field; '\0' != *cp; cp++) {
|
|
unsigned char c = *cp;
|
|
if (!isprint (c)) {
|
|
err = 1;
|
|
}
|
|
if (iscntrl (c)) {
|
|
err = -1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* change_field - change a single field if a new value is given.
|
|
*
|
|
* prompt the user with the name of the field being changed and the
|
|
* current value.
|
|
*/
|
|
void change_field (char *buf, size_t maxsize, const char *prompt)
|
|
{
|
|
char newf[200];
|
|
char *cp;
|
|
|
|
if (maxsize > sizeof (newf)) {
|
|
maxsize = sizeof (newf);
|
|
}
|
|
|
|
printf ("\t%s [%s]: ", prompt, buf);
|
|
(void) fflush (stdout);
|
|
if (fgets (newf, maxsize, stdin) != newf) {
|
|
return;
|
|
}
|
|
|
|
cp = strchr (newf, '\n');
|
|
if (NULL == cp) {
|
|
return;
|
|
}
|
|
*cp = '\0';
|
|
|
|
if ('\0' != newf[0]) {
|
|
/*
|
|
* Remove leading and trailing whitespace. This also
|
|
* makes it possible to change the field to empty, by
|
|
* entering a space. --marekm
|
|
*/
|
|
|
|
while (newf < cp && isspace (cp[-1])) {
|
|
cp--;
|
|
}
|
|
*cp = '\0';
|
|
|
|
cp = newf;
|
|
while (isspace (*cp)) {
|
|
cp++;
|
|
}
|
|
|
|
strcpy (buf, cp);
|
|
}
|
|
}
|