=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcs.c,v retrieving revision 1.65 retrieving revision 1.66 diff -c -r1.65 -r1.66 *** src/usr.bin/rcs/rcs.c 2010/09/29 09:23:54 1.65 --- src/usr.bin/rcs/rcs.c 2010/10/05 15:13:04 1.66 *************** *** 1,4 **** ! /* $OpenBSD: rcs.c,v 1.65 2010/09/29 09:23:54 tobias Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: rcs.c,v 1.66 2010/10/05 15:13:04 tobias Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. *************** *** 98,103 **** --- 98,106 ---- #define RCS_TOKSTR(rfp) ((struct rcs_pdata *)rfp->rf_pdata)->rp_buf #define RCS_TOKLEN(rfp) ((struct rcs_pdata *)rfp->rf_pdata)->rp_tlen + /* invalid characters in RCS states */ + static const char rcs_state_invch[] = RCS_STATE_INVALCHAR; + /* invalid characters in RCS symbol names */ static const char rcs_sym_invch[] = RCS_SYM_INVALCHAR; *************** *** 2972,2981 **** int rcs_state_check(const char *state) { ! if (strchr(state, ' ') != NULL) return (-1); ! return (0); } /* --- 2975,2995 ---- int rcs_state_check(const char *state) { ! int ret; ! const char *cp; ! ! ret = 0; ! cp = state; ! if (!isalpha(*cp++)) return (-1); ! for (; *cp != '\0'; cp++) ! if (!isgraph(*cp) || (strchr(rcs_state_invch, *cp) != NULL)) { ! ret = -1; ! break; ! } ! ! return (ret); } /*