← Back to branch summary

~ubuntu-branches/ubuntu/trusty/htp/trusty

« back to all changes in this revision

Viewing changes to src/htp-files.c

  • Committer: Bazaar Package Importer
  • Author(s): Diego Escalante Urrelo
  • Date: 2007-10-21 21:59:40 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20071021215940-90qtozny64s4f1rg
Tags: 1.16-2
http://bugs.debian.org/443616
* Makefile.config: Hardcode /usr as the PREFIX, it was using /usr/local
  otherwise by unknown reasons.
* src/snprintf.c:
* src/snprintf.h: Remove the asnprintf and asprintf functions since they were
keeping s390 from building and are actually not used, closes: #443616.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/htp-files.c
15
15
#include "option.h"
16
16
#include "streams.h"
17
17
#include "bool-proc.h"
 
18
#include "snprintf.h"
18
19
 
19
20
/*
20
21
// returns the full, qualified pathname of the default htp include file
303
304
                /* comment tag: check for -- */
304
305
                ? strncmp(markupBuffer+ctr-3, "--", 2) == 0
305
306
                /* PHP tag: check for ? */
306
 
                : markupBuffer[1] == '?' ? markupBuffer[ctr-2] == '?'
 
307
                : markupBuffer[0] == '?' ? markupBuffer[ctr-2] == '?'
307
308
                /* normal tag: check for matching quotes */
308
309
                : inQuotes == NUL)
309
310
            {
419
420
        /* check markup type ... only interested in htp markups currently */
420
421
        if((markupType & MARKUP_TYPE_HTP) == 0)
421
422
        {
 
423
            DestroyMarkupStruct(&markup);
422
424
            continue;
423
425
        }
424
426
 
432
434
                /* If we find an execute tag, we can't be sure that it
433
435
                 * is up to date */
434
436
                result = FALSE;
 
437
                DestroyMarkupStruct(&markup);
435
438
                break;
436
439
            }
437
440
            includeFile = MarkupAttributeValue(&markup, "INCLUDE");