-const char pcrs_rcs[] = "$Id: pcrs.c,v 1.6 2001/06/03 19:12:45 oes Exp $";
+const char pcrs_rcs[] = "$Id: pcrs.c,v 1.8 2001/06/29 21:45:41 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/pcrs.c,v $
*
- * Purpose : This is the alpha release of libpcrs. It is only published
- * at this early stage of development, because it is
- * needed for a new feature in JunkBuster.
- *
- * While no inconsistencies, memory leaks or functional bugs
- * are known at this time, there *could* be plenty ;-). Also,
- * Many pcre-specific options are not yet supported, and
- * error handling needs improvement.
- *
- * pcrs is a supplement to the brilliant pcre library by Philip
+ * Purpose : pcrs is a supplement to the brilliant pcre library by Philip
* Hazel (ph10@cam.ac.uk) and adds Perl-style substitution. That
* is, it mimics Perl's 's' operator.
*
* Currently, there's no documentation besides comments and the
* source itself ;-)
*
- * Short note: I addition to perl's options, 'U' for ungreedy
- * and 't' for trivial (i.e.: ignore backrefs in the substitute)
- * are supported.
+ * Note: In addition to perl's options, 'U' for ungreedy and 'T'
+ * for trivial (i.e.: ignore backrefs in the substitute) are
+ * supported.
*
* Copyright : Written and Copyright (C) 2000, 2001 by Andreas S. Oesterhelt
* <andreas@oesterhelt.org>
*
* Revisions :
* $Log: pcrs.c,v $
+ * Revision 1.8 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
+ *
+ * Revision 1.7 2001/06/29 13:33:04 oes
+ * - Cleaned up, renamed and reordered functions,
+ * improved comments
+ * - Removed my_strsep
+ * - Replaced globalflag with a general flags int
+ * that holds PCRS_GLOBAL, PCRS_SUCCESS, and PCRS_TRIVIAL
+ * - Introduced trivial option that will prevent pcrs
+ * from honouring backreferences in the substitute,
+ * which is useful for large substitutes that are
+ * red in from somewhere and saves the pain of escaping
+ * the backrefs
+ * - Introduced convenience function pcrs_free_joblist()
+ * - Split pcrs_make_job() into pcrs_compile(), which still
+ * takes a complete s/// comand as argument and parses it,
+ * and a new function pcrs_make_job, which takes the
+ * three separate components. This should make for a
+ * much friendlier frontend.
+ * - Removed create_pcrs_job() which was useless
+ * - Fixed a bug in pcrs_execute
+ * - Success flag is now handled by pcrs instead of user
+ * - Removed logentry from cancelled commit
+ *
* Revision 1.6 2001/06/03 19:12:45 oes
* added FIXME
*
case 's': rc |= PCRE_DOTALL; break;
case 'x': rc |= PCRE_EXTENDED; break;
case 'U': rc |= PCRE_UNGREEDY; break;
- case 'T': *flags |= PCRS_TRIVIAL; break;
+ case 'T': *flags |= PCRS_TRIVIAL; break;
default: break;
}
}
if (trivialflag)
{
- k = length;
+ k = length;
}
else
- {
+ {
for (i=0; i < length; i++)
{
/* Backslash treatment */
text[k++] = replacement[i];
quoted = 0;
}
- } /* -END- if (!trivialflag) */
+ } /* -END- if (!trivialflag) */
text[k] = '\0';
r->text = text;
/*********************************************************************
*
- * Function : pcrs_compile
+ * Function : pcrs_compile_command
*
- * Description : Main entry point. Takes a string with a Perl-style
- * s/// command and returns a corresponding pcrs_job,
- * or NULL if compiling the job fails at any stage.
+ * Description : Parses a string with a Perl-style s/// command,
+ * calls pcrs_compile, and returns a corresponding
+ * pcrs_job, or NULL if parsing or compiling the job
+ * fails.
*
* Parameters :
* 1 : command = string with perl-style s/// command
* has the reason.
*
*********************************************************************/
-pcrs_job *pcrs_compile(char *command, int *errptr)
+pcrs_job *pcrs_compile_command(char *command, int *errptr)
{
int i, k, l, limit, quoted = FALSE;
char delimiter;
*/
limit = strlen(command);
if (limit < 4)
- {
+ {
*errptr = PCRS_ERR_CMDSYNTAX;
return NULL;
}
else
- {
- delimiter = command[1];
- }
+ {
+ delimiter = command[1];
+ }
tokens[l] = (char *) malloc(limit + 1);
if (command[i] == delimiter && !quoted)
{
- if (l == 3)
- {
- l = -1;
+ if (l == 3)
+ {
+ l = -1;
break;
}
- tokens[0][k++] = '\0';
+ tokens[0][k++] = '\0';
tokens[++l] = tokens[0] + k;
- continue;
+ continue;
}
else if (command[i] == '\\' && !quoted && i+1 < limit && command[i+1] == delimiter)
*/
if (l != 3)
{
- *errptr = PCRS_ERR_CMDSYNTAX;
+ *errptr = PCRS_ERR_CMDSYNTAX;
free(tokens[0]);
return NULL;
}
- newjob = pcrs_make_job(tokens[1], tokens[2], tokens[3], errptr);
+ newjob = pcrs_compile(tokens[1], tokens[2], tokens[3], errptr);
free(tokens[0]);
return newjob;
/*********************************************************************
*
- * Function : pcrs_make_job
+ * Function : pcrs_compile
*
* Description : Takes the three arguments to a perl s/// command
* and compiles a pcrs_job structure from them.
* has the reason.
*
*********************************************************************/
-pcrs_job *pcrs_make_job(char *pattern, char *substitute, char *options, int *errptr)
+pcrs_job *pcrs_compile(char *pattern, char *substitute, char *options, int *errptr)
{
pcrs_job *newjob;
int flags;
const char *error;
+
/*
* Handle NULL arguments
*/
if (substitute == NULL) substitute = "";
if (options == NULL) options = "";
+
/*
* Get and init memory
*/
while ((submatches = pcre_exec(job->pattern, job->hints, subject, subject_length, offset, 0, offsets, 3 * PCRS_MAX_SUBMATCHES)) > 0)
{
- job->flags |= PCRS_SUCCESS;
+ job->flags |= PCRS_SUCCESS;
matches[i].submatches = submatches;
for (k=0; k < submatches; k++)
{
else
offset = offsets[1];
}
- /* Pass pcre error through if failiure*/
+ /* Pass pcre error through if failiure */
if (submatches < -1) return submatches;
matches_found = i;
memcpy(result_offset, job->substitute->text + job->substitute->block_offset[k], job->substitute->block_length[k]);
result_offset += job->substitute->block_length[k];
- /* ..plus, if it's not the last chunk (i.e.: There IS a backref).. */
+ /* ..plus, if it's not the last chunk, i.e.: There *is* a backref.. */
if (k != job->substitute->backrefs
- /* ..and a nonempty match.. */
- && matches[i].submatch_length[job->substitute->backref[k]] > 0
- /* ..and in legal range, ... */
- && job->substitute->backref[k] <= PCRS_MAX_SUBMATCHES)
+ /* ..in legal range.. */
+ && job->substitute->backref[k] <= PCRS_MAX_SUBMATCHES
+ /* ..and referencing a nonempty match.. */
+ && matches[i].submatch_length[job->substitute->backref[k]] > 0)
{
- /* copy the submatch that is ref'd. */
+ /* ..copy the submatch that is ref'd. */
memcpy(
result_offset,
subject + matches[i].submatch_offset[job->substitute->backref[k]],
projects / privoxy.git / blobdiff