MFV (r262529): fix is_upper() predicate
MFC after: 1 week
This commit is contained in:
commit
69cfb77152
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=262530
@ -29,9 +29,9 @@ ideas:
|
||||
Hubert Feyrer <hubert@feyrer.de>
|
||||
Jason Evans <jasone@freebsd.org>
|
||||
Joe Marcus Clarke <marcus@freebsd.org>
|
||||
Juli Mallett <jmallett@freebsd.org>
|
||||
Ankita Pal <pal.ankita.ankita@gmail.com>
|
||||
Jörg Sonnenberger <joerg@britannica.bec.de>
|
||||
Juli Mallett <jmallett@freebsd.org>
|
||||
Larry Baird <lab@gta.com>
|
||||
Maëlle Lesage <lesage.maelle@gmail.com>
|
||||
Mark Murray <markm@freebsd.org>
|
||||
Matthias Drochner <drochner@netbsd.org>
|
||||
|
@ -38,11 +38,19 @@
|
||||
#define is_digit(ch) \
|
||||
(ch >= '0' && ch <= '9')
|
||||
|
||||
/*
|
||||
* Evaluates to non-zero if the argument is a hex digit.
|
||||
*/
|
||||
#define is_xdigit(ch) \
|
||||
((ch >= '0' && ch <= '9') || \
|
||||
(ch >= 'a' && ch <= 'f') || \
|
||||
(ch >= 'A' && ch <= 'F'))
|
||||
|
||||
/*
|
||||
* Evaluates to non-zero if the argument is an uppercase letter.
|
||||
*/
|
||||
#define is_upper(ch) \
|
||||
(ch >= 'A' && ch <= 'A')
|
||||
(ch >= 'A' && ch <= 'Z')
|
||||
|
||||
/*
|
||||
* Evaluates to non-zero if the argument is a lowercase letter.
|
||||
|
@ -6,6 +6,7 @@ noinst_HEADERS = t.h
|
||||
|
||||
# tests
|
||||
TESTS =
|
||||
TESTS += t_openpam_ctype
|
||||
TESTS += t_openpam_readword
|
||||
TESTS += t_openpam_readlinev
|
||||
check_PROGRAMS = $(TESTS)
|
||||
|
122
contrib/openpam/t/t_openpam_ctype.c
Normal file
122
contrib/openpam/t/t_openpam_ctype.c
Normal file
@ -0,0 +1,122 @@
|
||||
/*-
|
||||
* Copyright (c) 2014 Dag-Erling Smørgrav
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior written
|
||||
* permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "openpam_ctype.h"
|
||||
|
||||
#include "t.h"
|
||||
|
||||
#define OC_DIGIT "0123456789"
|
||||
#define OC_XDIGIT OC_DIGIT "ABCDEFabcdef"
|
||||
#define OC_UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
#define OC_LOWER "abcdefghijklmnopqrstuvwxyz"
|
||||
#define OC_LETTER OC_UPPER OC_LOWER
|
||||
#define OC_LWS " \t\f\r"
|
||||
#define OC_WS OC_LWS "\n"
|
||||
#define OC_P "!\"#$%&'()*+,-./" OC_DIGIT ":;<=>?@" OC_UPPER "[\\]^_`" OC_LOWER "{|}~"
|
||||
#define OC_PFCS OC_DIGIT OC_LETTER "._-"
|
||||
|
||||
static const char oc_digit[] = OC_DIGIT;
|
||||
static const char oc_xdigit[] = OC_XDIGIT;
|
||||
static const char oc_upper[] = OC_UPPER;
|
||||
static const char oc_lower[] = OC_LOWER;
|
||||
static const char oc_letter[] = OC_LETTER;
|
||||
static const char oc_lws[] = OC_LWS;
|
||||
static const char oc_ws[] = OC_WS;
|
||||
static const char oc_p[] = OC_P;
|
||||
static const char oc_pfcs[] = OC_PFCS;
|
||||
|
||||
#define T_OC(set) \
|
||||
T_FUNC(t_oc_##set, "is_" #set) \
|
||||
{ \
|
||||
char crib[256]; \
|
||||
unsigned int i, ret; \
|
||||
\
|
||||
memset(crib, 0, sizeof crib); \
|
||||
for (i = 0; oc_##set[i]; ++i) \
|
||||
crib[(int)oc_##set[i]] = 1; \
|
||||
for (i = ret = 0; i < sizeof crib; ++i) { \
|
||||
if (is_##set(i) != crib[i]) { \
|
||||
t_verbose("is_%s() incorrect " \
|
||||
"for %#02x\n", #set, i); \
|
||||
++ret; \
|
||||
} \
|
||||
} \
|
||||
return (ret == 0); \
|
||||
}
|
||||
|
||||
T_OC(digit)
|
||||
T_OC(xdigit)
|
||||
T_OC(upper)
|
||||
T_OC(lower)
|
||||
T_OC(letter)
|
||||
T_OC(lws)
|
||||
T_OC(ws)
|
||||
T_OC(p)
|
||||
T_OC(pfcs)
|
||||
|
||||
|
||||
/***************************************************************************
|
||||
* Boilerplate
|
||||
*/
|
||||
|
||||
const struct t_test *t_plan[] = {
|
||||
T(t_oc_digit),
|
||||
T(t_oc_xdigit),
|
||||
T(t_oc_upper),
|
||||
T(t_oc_lower),
|
||||
T(t_oc_letter),
|
||||
T(t_oc_lws),
|
||||
T(t_oc_ws),
|
||||
T(t_oc_p),
|
||||
T(t_oc_pfcs),
|
||||
NULL
|
||||
};
|
||||
|
||||
const struct t_test **
|
||||
t_prepare(int argc, char *argv[])
|
||||
{
|
||||
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
return (t_plan);
|
||||
}
|
||||
|
||||
void
|
||||
t_cleanup(void)
|
||||
{
|
||||
}
|
Loading…
Reference in New Issue
Block a user