b.c (118194) | b.c (125601) |
---|---|
1/**************************************************************** 2Copyright (C) Lucent Technologies 1997 3All Rights Reserved 4 5Permission to use, copy, modify, and distribute this software and 6its documentation for any purpose and without fee is hereby 7granted, provided that the above copyright notice appear in all 8copies and that both that the copyright notice and this --- 468 unchanged lines hidden (view full) --- 477 478int pmatch(fa *f, const char *p0) /* longest match, for sub */ 479{ 480 int s, ns; 481 uschar *p = (uschar *) p0; 482 uschar *q; 483 int i, k; 484 | 1/**************************************************************** 2Copyright (C) Lucent Technologies 1997 3All Rights Reserved 4 5Permission to use, copy, modify, and distribute this software and 6its documentation for any purpose and without fee is hereby 7granted, provided that the above copyright notice appear in all 8copies and that both that the copyright notice and this --- 468 unchanged lines hidden (view full) --- 477 478int pmatch(fa *f, const char *p0) /* longest match, for sub */ 479{ 480 int s, ns; 481 uschar *p = (uschar *) p0; 482 uschar *q; 483 int i, k; 484 |
485 s = f->reset ? makeinit(f,1) : f->initstat; | 485 /* s = f->reset ? makeinit(f,1) : f->initstat; */ 486 if (f->reset) { 487 f->initstat = s = makeinit(f,1); 488 } else { 489 s = f->initstat; 490 } |
486 patbeg = (char *) p; 487 patlen = -1; 488 do { 489 q = p; 490 do { 491 if (f->out[s]) /* final state */ 492 patlen = q-p; 493 if ((ns = f->gototab[s][*q]) != 0) --- 36 unchanged lines hidden (view full) --- 530 531int nematch(fa *f, const char *p0) /* non-empty match, for sub */ 532{ 533 int s, ns; 534 uschar *p = (uschar *) p0; 535 uschar *q; 536 int i, k; 537 | 491 patbeg = (char *) p; 492 patlen = -1; 493 do { 494 q = p; 495 do { 496 if (f->out[s]) /* final state */ 497 patlen = q-p; 498 if ((ns = f->gototab[s][*q]) != 0) --- 36 unchanged lines hidden (view full) --- 535 536int nematch(fa *f, const char *p0) /* non-empty match, for sub */ 537{ 538 int s, ns; 539 uschar *p = (uschar *) p0; 540 uschar *q; 541 int i, k; 542 |
538 s = f->reset ? makeinit(f,1) : f->initstat; | 543 /* s = f->reset ? makeinit(f,1) : f->initstat; */ 544 if (f->reset) { 545 f->initstat = s = makeinit(f,1); 546 } else { 547 s = f->initstat; 548 } |
539 patlen = -1; 540 while (*p) { 541 q = p; 542 do { 543 if (f->out[s]) /* final state */ 544 patlen = q-p; 545 if ((ns = f->gototab[s][*q]) != 0) 546 s = ns; --- 379 unchanged lines hidden --- | 549 patlen = -1; 550 while (*p) { 551 q = p; 552 do { 553 if (f->out[s]) /* final state */ 554 patlen = q-p; 555 if ((ns = f->gototab[s][*q]) != 0) 556 s = ns; --- 379 unchanged lines hidden --- |