Changed to conform to new pcrs interface

diff --git a/cgi.c b/cgi.c
index cfa10f2..60806b1 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.9 2001/06/29 21:45:41 oes Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.10 2001/07/13 13:53:13 oes Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.c,v $


@@ -36,6 +36,9 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.9 2001/06/29 21:45:41 oes Exp $";
  *
  * Revisions   :
  *    $Log: cgi.c,v $
  *
  * Revisions   :
  *    $Log: cgi.c,v $

+ *    Revision 1.10  2001/07/13 13:53:13  oes
+ *    Removed all #ifdef PCRS and related code
+ *

  *    Revision 1.9  2001/06/29 21:45:41  oes
  *    Indentation, CRLF->LF, Tab-> Space
  *
  *    Revision 1.9  2001/06/29 21:45:41  oes
  *    Indentation, CRLF->LF, Tab-> Space
  *


@@ -129,7 +132,6 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.9 2001/06/29 21:45:41 oes Exp $";
 #include "project.h"
 #include "cgi.h"
 #include "list.h"
 #include "project.h"
 #include "cgi.h"
 #include "list.h"

-#include "pcrs.h"

 #include "encode.h"
 #include "ssplit.h"
 #include "jcc.h"
 #include "encode.h"
 #include "ssplit.h"
 #include "jcc.h"


@@ -899,8 +901,8 @@ char *fill_template(struct client_state *csp, const char *template, struct map *
       /* Enclose name in @@ */
       snprintf(buf, BUFFER_SIZE, "@%s@", m->name);
 
       /* Enclose name in @@ */
       snprintf(buf, BUFFER_SIZE, "@%s@", m->name);
 

-      /* Make and chain in job */
-      if ( NULL == (job = (pcrs_make_job(buf, m->value, "sigTU", &error))) ) 
+      /* Make and chain job */
+      if ( NULL == (job = (pcrs_compile(buf, m->value, "sigTU", &error))) ) 

       {
          log_error(LOG_LEVEL_ERROR, "Error compiling template fill job %s: %d", m->name, error);
       }
       {
          log_error(LOG_LEVEL_ERROR, "Error compiling template fill job %s: %d", m->name, error);
       }

diff --git a/loaders.c b/loaders.c
index 312fc2a..4fb6e9f 100644 (file)
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.19 2001/07/13 14:01:54 oes Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.20 2001/07/17 13:07:01 oes Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $


@@ -35,6 +35,10 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.19 2001/07/13 14:01:54 oes Exp $"
  *
  * Revisions   :
  *    $Log: loaders.c,v $
  *
  * Revisions   :
  *    $Log: loaders.c,v $

+ *    Revision 1.20  2001/07/17 13:07:01  oes
+ *    Fixed segv when last line in config files
+ *     lacked a terminating (\r)\n
+ *

  *    Revision 1.19  2001/07/13 14:01:54  oes
  *    Removed all #ifdef PCRS
  *
  *    Revision 1.19  2001/07/13 14:01:54  oes
  *    Removed all #ifdef PCRS
  *


@@ -917,7 +921,7 @@ int load_re_filterfile(struct client_state *csp)
       enlist( bl->patterns, buf );
 
       /* We have a meaningful line -> make it a job */
       enlist( bl->patterns, buf );
 
       /* We have a meaningful line -> make it a job */

-      if ((dummy = pcrs_compile(buf, &error)) == NULL)
+      if ((dummy = pcrs_compile_command(buf, &error)) == NULL)

       {
          log_error(LOG_LEVEL_RE_FILTER, 
                "Adding re_filter job %s failed with error %d.", buf, error);
       {
          log_error(LOG_LEVEL_RE_FILTER, 
                "Adding re_filter job %s failed with error %d.", buf, error);