X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpicksbr.c;h=61d5afb88e3df8599d0bdcd8fc0a968968f4f1ec;hp=a7276d78febe3b352327bad7730caf7d62d04083;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=d2f12554a254e814dcdafb3828fc0d9936154eef diff --git a/uip/picksbr.c b/uip/picksbr.c index a7276d7..61d5afb 100644 --- a/uip/picksbr.c +++ b/uip/picksbr.c @@ -82,7 +82,7 @@ static struct swit parswit[] = { #define STAR 01 #define LBSIZE 1024 -#define ESIZE 256 +#define ESIZE 1024 static char linebuf[LBSIZE + 1]; @@ -105,6 +105,23 @@ static char cc[] = { 0150,0151,0152,0153,0154,0155,0156,0157, 0160,0161,0162,0163,0164,0165,0166,0167, 0170,0171,0172,0173,0174,0175,0176,0177, + + 0200,0201,0202,0203,0204,0205,0206,0207, + 0210,0211,0212,0213,0214,0215,0216,0217, + 0220,0221,0222,0223,0224,0225,0226,0227, + 0230,0231,0232,0233,0234,0235,0236,0237, + 0240,0241,0242,0243,0244,0245,0246,0247, + 0250,0251,0252,0253,0254,0255,0256,0257, + 0260,0261,0262,0263,0264,0265,0266,0267, + 0270,0271,0272,0273,0274,0275,0276,0277, + 0300,0301,0302,0303,0304,0305,0306,0307, + 0310,0311,0312,0313,0314,0315,0316,0317, + 0320,0321,0322,0323,0324,0325,0326,0327, + 0330,0331,0332,0333,0334,0335,0336,0337, + 0340,0341,0342,0343,0344,0345,0346,0347, + 0350,0351,0352,0353,0354,0355,0356,0357, + 0360,0361,0362,0363,0364,0365,0366,0367, + 0370,0371,0372,0373,0374,0375,0376,0377, }; /* @@ -179,9 +196,9 @@ static int cclass(); static int tcompile(); static struct nexus *parse(); -static struct nexus *exp1(); -static struct nexus *exp2(); -static struct nexus *exp3(); +static struct nexus *nexp1(); +static struct nexus *nexp2(); +static struct nexus *nexp3(); static struct nexus *newnexus(); static int ORaction(); @@ -222,7 +239,7 @@ parse (void) register char *cp; register struct nexus *n, *o; - if ((n = exp1 ()) == NULL || (cp = nxtarg ()) == NULL) + if ((n = nexp1 ()) == NULL || (cp = nxtarg ()) == NULL) return n; if (*cp != '-') { @@ -258,12 +275,12 @@ header: ; } static struct nexus * -exp1 (void) +nexp1 (void) { register char *cp; register struct nexus *n, *o; - if ((n = exp2 ()) == NULL || (cp = nxtarg ()) == NULL) + if ((n = nexp2 ()) == NULL || (cp = nxtarg ()) == NULL) return n; if (*cp != '-') { @@ -286,7 +303,7 @@ exp1 (void) case PRAND: o = newnexus (ANDaction); o->n_L_child = n; - if ((o->n_R_child = exp1 ())) + if ((o->n_R_child = nexp1 ())) return o; padvise (NULL, "missing conjunctive"); return NULL; @@ -300,7 +317,7 @@ header: ; static struct nexus * -exp2 (void) +nexp2 (void) { register char *cp; register struct nexus *n; @@ -310,7 +327,7 @@ exp2 (void) if (*cp != '-') { prvarg (); - return exp3 (); + return nexp3 (); } if (*++cp == '-') @@ -327,7 +344,7 @@ exp2 (void) case PRNOT: n = newnexus (NOTaction); - if ((n->n_L_child = exp3 ())) + if ((n->n_L_child = nexp3 ())) return n; padvise (NULL, "missing negation"); return NULL; @@ -335,12 +352,12 @@ exp2 (void) header: ; default: prvarg (); - return exp3 (); + return nexp3 (); } } static struct nexus * -exp3 (void) +nexp3 (void) { int i; register char *cp, *dp; @@ -431,7 +448,7 @@ exp3 (void) padvise (NULL, "missing argument to %s", argp[-2]); return NULL; } - return exp3 (); + return nexp3 (); case PRAFTR: case PRBEFR: @@ -521,7 +538,8 @@ PRaction (struct nexus *n, int level) dasctime (&n->n_tws, TW_NULL)); return; } - fprintf (stderr, "UNKNOWN(0x%x)\n", (unsigned int) (*n->n_action)); + fprintf (stderr, "UNKNOWN(0x%x)\n", + (unsigned int)(unsigned long) (*n->n_action)); } @@ -558,7 +576,7 @@ gcompile (struct nexus *n, char *astr) { register int c; int cclcnt; - register char *ep, *dp, *sp, *lastep; + register unsigned char *ep, *dp, *sp, *lastep = 0; dp = (ep = n->n_expbuf) + sizeof n->n_expbuf; sp = astr; @@ -597,17 +615,33 @@ gcompile (struct nexus *n, char *astr) case '[': *ep++ = CCL; *ep++ = 0; - cclcnt = 1; + cclcnt = 0; if ((c = *sp++) == '^') { c = *sp++; ep[-2] = NCCL; } - do { + if (c == '-') { *ep++ = c; cclcnt++; - if (c == '\0' || ep >= dp) - goto cerror; + c = *sp++; + } + do { + if (c == '-' && *sp != '\0' && *sp != ']') { + for (c = ep[-1]+1; c < *sp; c++) { + *ep++ = c; + cclcnt++; + if (c == '\0' || ep >= dp) + goto cerror; + } + } else { + *ep++ = c; + cclcnt++; + if (c == '\0' || ep >= dp) + goto cerror; + } } while ((c = *sp++) != ']'); + if (cclcnt > 255) + goto cerror; lastep[1] = cclcnt; continue; @@ -713,14 +747,14 @@ plist static int advance (char *alp, char *aep) { - register char *lp, *ep, *curlp; + register unsigned char *lp, *ep, *curlp; - lp = alp; - ep = aep; + lp = (unsigned char *)alp; + ep = (unsigned char *)aep; for (;;) switch (*ep++) { case CCHR: - if (*ep++ == *lp++ || ep[-1] == cc[(unsigned char)lp[-1]]) + if (*ep++ == *lp++ || ep[-1] == cc[lp[-1]]) continue; return 0; @@ -739,14 +773,14 @@ advance (char *alp, char *aep) case CCL: if (cclass (ep, *lp++, 1)) { - ep += *ep; + ep += *ep + 1; continue; } return 0; case NCCL: if (cclass (ep, *lp++, 0)) { - ep += *ep; + ep += *ep + 1; continue; } return 0; @@ -759,7 +793,7 @@ advance (char *alp, char *aep) case CCHR | STAR: curlp = lp; - while (*lp++ == *ep || cc[(unsigned char)lp[-1]] == *ep) + while (*lp++ == *ep || cc[lp[-1]] == *ep) continue; ep++; goto star; @@ -769,7 +803,7 @@ advance (char *alp, char *aep) curlp = lp; while (cclass (ep, *lp++, ep[-1] == (CCL | STAR))) continue; - ep += *ep; + ep += *ep + 1; goto star; star: @@ -788,19 +822,18 @@ advance (char *alp, char *aep) static int -cclass (char *aset, int ac, int af) +cclass (unsigned char *aset, int ac, int af) { - register int n; - register char c, - *set; + register unsigned int n; + register unsigned char c, *set; set = aset; if ((c = ac) == 0) return (0); n = *set++; - while (--n) - if (*set++ == c) + while (n--) + if (*set++ == c || set[-1] == cc[c]) return (af); return (!af);