0f60998368b493f90120180a93fc2e1e74490872covener

87587593f1a53030e840acc0dec6cc881022ea40covener

97cd2f98ad4abe68aaaba96b5bfc9ebf7109a2c1covener

97cd2f98ad4abe68aaaba96b5bfc9ebf7109a2c1covener#include "httpd.h"

97cd2f98ad4abe68aaaba96b5bfc9ebf7109a2c1covener#include "http_main.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "http_log.h"

43997561b2302d13dee973998e77743a3ddd2374trawick#include "http_protocol.h"

fa123db15501821e36e513afa78e839775ad2800covener#if defined(SUNOS4)

0568280364eb026393be492ebc732795c4934643jortonextern int fgetc(FILE *);

0568280364eb026393be492ebc732795c4934643jortonextern char *fgets(char *s, int, FILE*);

0568280364eb026393be492ebc732795c4934643jortonextern int fclose(FILE *);

0568280364eb026393be492ebc732795c4934643jorton#endif

0568280364eb026393be492ebc732795c4934643jorton

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#include "test_char.h"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#define TEST_CHAR(c, f) (test_char_table[(unsigned)(c)] & (f))

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

796e4a7141265d8ed7036e4628161c6eafb2a789jortonAPI_VAR_EXPORT const char ap_month_snames[12][4] =

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes};

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_VAR_EXPORT const char ap_day_snames[7][4] =

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes};

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_EXPORT(char *) ap_get_time()

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* ZZZ When we abstract out time, this whole function should change to use

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes time_t t;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *time_string;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe t = time(NULL);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes time_string = ctime(&t);

95b6fe1346805e1731e6e97c15d569c73be22cf7minfrin time_string[strlen(time_string) - 1] = '\0';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return (time_string);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

95b6fe1346805e1731e6e97c15d569c73be22cf7minfrin

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_EXPORT(char *) ap_field_noparam(ap_context_t *p, const char *intype)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes const char *semi;

95b6fe1346805e1731e6e97c15d569c73be22cf7minfrin

95b6fe1346805e1731e6e97c15d569c73be22cf7minfrin semi = strchr(intype, ';');

95b6fe1346805e1731e6e97c15d569c73be22cf7minfrin if (semi == NULL) {

a1790fb35c4b352dab721370985c623a9f8f5062rpluem return ap_pstrdup(p, intype);

713a2b68bac4aeb1e9c48785006c0732451039depquerna }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes else {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes while ((semi > intype) && ap_isspace(semi[-1])) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes semi--;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return ap_pstrndup(p, intype, semi - intype);

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe }

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_EXPORT(char *) ap_ht_time(ap_context_t *p, time_t t, const char *fmt, int gmt)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* ZZZ this function can be replaced by calls to time formatting routines

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char ts[MAX_STRING_LEN];

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char tf[MAX_STRING_LEN];

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes struct tm *tms;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes tms = (gmt ? gmtime(&t) : localtime(&t));

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if(gmt) {

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholes /* Convert %Z to "GMT" and %z to "+0000";

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes const char *f;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *strp;

fa123db15501821e36e513afa78e839775ad2800covener for(strp = tf, f = fmt; strp < tf + sizeof(tf) - 6 && (*strp = *f)

fa123db15501821e36e513afa78e839775ad2800covener ; f++, strp++) {

fa123db15501821e36e513afa78e839775ad2800covener if (*f != '%') continue;

fa123db15501821e36e513afa78e839775ad2800covener switch (f[1]) {

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim case '%':

fa123db15501821e36e513afa78e839775ad2800covener *++strp = *++f;

307219eca940aa30b873bfd68a44484dd3d3fa88covener break;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener case 'Z':

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim *strp++ = 'G';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *strp++ = 'M';

a81c0c1ae464b2063a21b45f80c9da8d89bb840ecovener *strp = 'T';

307219eca940aa30b873bfd68a44484dd3d3fa88covener f++;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes break;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener case 'z': /* common extension */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *strp++ = '+';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *strp++ = '0';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *strp++ = '0';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *strp++ = '0';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *strp = '0';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes f++;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes break;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *strp = '\0';

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe fmt = tf;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* check return code? */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes strftime(ts, MAX_STRING_LEN, fmt, tms);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ts[MAX_STRING_LEN - 1] = '\0';

307219eca940aa30b873bfd68a44484dd3d3fa88covener return ap_pstrdup(p, ts);

307219eca940aa30b873bfd68a44484dd3d3fa88covener}

307219eca940aa30b873bfd68a44484dd3d3fa88covener

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_EXPORT(char *) ap_gm_timestr_822(ap_context_t *p, time_t sec)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes struct tm *tms;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *date_str = ap_palloc(p, 48 * sizeof(char));

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *date_str_ptr = date_str;

fa123db15501821e36e513afa78e839775ad2800covener int real_year;

cceddc0b6c0fdaed0c73abda39975bb1d388243acovener

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf tms = gmtime(&sec); /* ZZZ replace with AP time routine */

fa123db15501821e36e513afa78e839775ad2800covener

cceddc0b6c0fdaed0c73abda39975bb1d388243acovener /* Assumption: this is always 3 */

f2be127030aa4190033084f0a6add531c9bc41desf /* i = strlen(ap_day_snames[tms->tm_wday]); */

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener memcpy(date_str_ptr, ap_day_snames[tms->tm_wday], 3);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener date_str_ptr += 3;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = ',';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = ' ';

60215f303c7e1ce8b6d272acb5bfa5b3d99dfd34covener *date_str_ptr++ = tms->tm_mday / 10 + '0';

60215f303c7e1ce8b6d272acb5bfa5b3d99dfd34covener *date_str_ptr++ = tms->tm_mday % 10 + '0';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = ' ';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener /* Assumption: this is also always 3 */

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener /* i = strlen(ap_month_snames[tms->tm_mon]); */

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener memcpy(date_str_ptr, ap_month_snames[tms->tm_mon], 3);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener date_str_ptr += 3;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = ' ';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener real_year = 1900 + tms->tm_year;

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim /* This routine isn't y10k ready. */

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = real_year / 1000 + '0';

6683642c1e0032eeeed5f99e8c14880692ef84c5sf *date_str_ptr++ = real_year % 1000 / 100 + '0';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = real_year % 100 / 10 + '0';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = real_year % 10 + '0';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = ' ';

6683642c1e0032eeeed5f99e8c14880692ef84c5sf *date_str_ptr++ = tms->tm_hour / 10 + '0';

6683642c1e0032eeeed5f99e8c14880692ef84c5sf *date_str_ptr++ = tms->tm_hour % 10 + '0';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = ':';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = tms->tm_min / 10 + '0';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = tms->tm_min % 10 + '0';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = ':';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = tms->tm_sec / 10 + '0';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = tms->tm_sec % 10 + '0';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = ' ';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = 'G';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = 'M';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *date_str_ptr++ = 'T';

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim *date_str_ptr = '\0';

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim return date_str;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener /* RFC date format; as strftime '%a, %d %b %Y %T GMT' */

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener /* The equivalent using sprintf. Use this for more legible but slower code

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener}

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener#if defined(HAVE_GMTOFF)

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovenerAPI_EXPORT(struct tm *) ap_get_gmtoff(int *tz)

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener{

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener time_t tt = time(NULL);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener struct tm *t;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener t = localtime(&tt);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *tz = (int) (t->tm_gmtoff / 60);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return t;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener}

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim#else

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jimAPI_EXPORT(struct tm *) ap_get_gmtoff(int *tz)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes time_t tt = time(NULL);

60215f303c7e1ce8b6d272acb5bfa5b3d99dfd34covener struct tm gmt;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes struct tm *t;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes int days, hours, minutes;

0e05808dc59a321566303084c84b9826a4353cefrederpj

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* Assume we are never more than 24 hours away. */

b08925593f214f621161742925dcf074a8047e0acovener gmt = *gmtime(&tt); /* remember gmtime/localtime return ptr to static */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes t = localtime(&tt); /* buffer... so be careful */

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf days = t->tm_yday - gmt.tm_yday;

465bb68501690d7a47bfd2a6129580047d76d8f1rederpj hours = ((days < -1 ? 24 : 1 < days ? -24 : days * 24)

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim + t->tm_hour - gmt.tm_hour);

465bb68501690d7a47bfd2a6129580047d76d8f1rederpj minutes = hours * 60 + t->tm_min - gmt.tm_min;

e8f95a682820a599fe41b22977010636be5c2717jim *tz = minutes;

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes return t;

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes}

55e2e59e5910072e51c870afc68b0907f41a28e0sf#endif

55e2e59e5910072e51c870afc68b0907f41a28e0sf

55e2e59e5910072e51c870afc68b0907f41a28e0sf

55e2e59e5910072e51c870afc68b0907f41a28e0sf

55e2e59e5910072e51c870afc68b0907f41a28e0sfAPI_EXPORT(int) ap_strcmp_match(const char *str, const char *exp)

55e2e59e5910072e51c870afc68b0907f41a28e0sf{

54d22ed1c429b903b029bbd62621f11a9e286137minfrin int x, y;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes for (x = 0, y = 0; exp[y]; ++y, ++x) {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if ((!str[x]) && (exp[y] != '*'))

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return -1;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (exp[y] == '*') {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes while (exp[++y] == '*');

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf if (!exp[y])

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return 0;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf while (str[x]) {

55e2e59e5910072e51c870afc68b0907f41a28e0sf int ret;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((ret = ap_strcmp_match(&str[x++], &exp[y])) != 1)

513b324e774c559b579896df131fd7c8471ed529rederpj return ret;

513b324e774c559b579896df131fd7c8471ed529rederpj }

513b324e774c559b579896df131fd7c8471ed529rederpj return -1;

513b324e774c559b579896df131fd7c8471ed529rederpj }

513b324e774c559b579896df131fd7c8471ed529rederpj else if ((exp[y] != '?') && (str[x] != exp[y]))

513b324e774c559b579896df131fd7c8471ed529rederpj return 1;

513b324e774c559b579896df131fd7c8471ed529rederpj }

513b324e774c559b579896df131fd7c8471ed529rederpj return (str[x] != '\0');

513b324e774c559b579896df131fd7c8471ed529rederpj}

513b324e774c559b579896df131fd7c8471ed529rederpj

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholesAPI_EXPORT(int) ap_strcasecmp_match(const char *str, const char *exp)

02fd88c85a9850109753b87612955ad372de1575sf{

02fd88c85a9850109753b87612955ad372de1575sf int x, y;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes for (x = 0, y = 0; exp[y]; ++y, ++x) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((!str[x]) && (exp[y] != '*'))

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return -1;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (exp[y] == '*') {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes while (exp[++y] == '*');

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (!exp[y])

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return 0;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes while (str[x]) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int ret;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((ret = ap_strcasecmp_match(&str[x++], &exp[y])) != 1)

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return ret;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return -1;

307219eca940aa30b873bfd68a44484dd3d3fa88covener }

307219eca940aa30b873bfd68a44484dd3d3fa88covener else if ((exp[y] != '?') && (ap_tolower(str[x]) != ap_tolower(exp[y])))

707f6d077f73cc948deead8df5b40ea42c1eaa78covener return 1;

707f6d077f73cc948deead8df5b40ea42c1eaa78covener }

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf return (str[x] != '\0');

707f6d077f73cc948deead8df5b40ea42c1eaa78covener}

185aa71728867671e105178b4c66fbc22b65ae26sf

707f6d077f73cc948deead8df5b40ea42c1eaa78covenerAPI_EXPORT(int) ap_is_matchexp(const char *str)

707f6d077f73cc948deead8df5b40ea42c1eaa78covener{

707f6d077f73cc948deead8df5b40ea42c1eaa78covener register int x;

707f6d077f73cc948deead8df5b40ea42c1eaa78covener

707f6d077f73cc948deead8df5b40ea42c1eaa78covener for (x = 0; str[x]; x++)

9ad7b260be233be7d7b5576979825cac72e15498rederpj if ((str[x] == '*') || (str[x] == '?'))

9ad7b260be233be7d7b5576979825cac72e15498rederpj return 1;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return 0;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes}

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

54d22ed1c429b903b029bbd62621f11a9e286137minfrinstatic ap_status_t regex_cleanup(void *preg)

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes{

54d22ed1c429b903b029bbd62621f11a9e286137minfrin regfree((regex_t *) preg);

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return APR_SUCCESS;

55e2e59e5910072e51c870afc68b0907f41a28e0sf}

55e2e59e5910072e51c870afc68b0907f41a28e0sf

55e2e59e5910072e51c870afc68b0907f41a28e0sfAPI_EXPORT(regex_t *) ap_pregcomp(ap_context_t *p, const char *pattern,

55e2e59e5910072e51c870afc68b0907f41a28e0sf int cflags)

55e2e59e5910072e51c870afc68b0907f41a28e0sf{

55e2e59e5910072e51c870afc68b0907f41a28e0sf regex_t *preg = ap_palloc(p, sizeof(regex_t));

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf if (regcomp(preg, pattern, cflags)) {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return NULL;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes ap_register_cleanup(p, (void *) preg, regex_cleanup, regex_cleanup);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes return preg;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

b08925593f214f621161742925dcf074a8047e0acovenerAPI_EXPORT(void) ap_pregfree(ap_context_t *p, regex_t * reg)

b08925593f214f621161742925dcf074a8047e0acovener{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_block_alarms();

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim regfree(reg);

707f6d077f73cc948deead8df5b40ea42c1eaa78covener ap_kill_cleanup(p, (void *) reg, regex_cleanup);

185aa71728867671e105178b4c66fbc22b65ae26sf ap_unblock_alarms();

707f6d077f73cc948deead8df5b40ea42c1eaa78covener}

707f6d077f73cc948deead8df5b40ea42c1eaa78covener

185aa71728867671e105178b4c66fbc22b65ae26sfAPI_EXPORT(int) ap_regexec(const regex_t *preg, const char *string,

707f6d077f73cc948deead8df5b40ea42c1eaa78covener size_t nmatch, regmatch_t pmatch[], int eflags)

707f6d077f73cc948deead8df5b40ea42c1eaa78covener{

707f6d077f73cc948deead8df5b40ea42c1eaa78covener return regexec(preg, string, nmatch, pmatch, eflags);

707f6d077f73cc948deead8df5b40ea42c1eaa78covener}

707f6d077f73cc948deead8df5b40ea42c1eaa78covener

707f6d077f73cc948deead8df5b40ea42c1eaa78covenerAPI_EXPORT(size_t) ap_regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)

707f6d077f73cc948deead8df5b40ea42c1eaa78covener{

707f6d077f73cc948deead8df5b40ea42c1eaa78covener return regerror(errcode, preg, errbuf, errbuf_size);

707f6d077f73cc948deead8df5b40ea42c1eaa78covener}

707f6d077f73cc948deead8df5b40ea42c1eaa78covener

707f6d077f73cc948deead8df5b40ea42c1eaa78covener

707f6d077f73cc948deead8df5b40ea42c1eaa78covener

707f6d077f73cc948deead8df5b40ea42c1eaa78covenerAPI_EXPORT(char *) ap_pregsub(ap_context_t *p, const char *input, const char *source,

707f6d077f73cc948deead8df5b40ea42c1eaa78covener size_t nmatch, regmatch_t pmatch[])

707f6d077f73cc948deead8df5b40ea42c1eaa78covener{

9ad7b260be233be7d7b5576979825cac72e15498rederpj const char *src = input;

9ad7b260be233be7d7b5576979825cac72e15498rederpj char *dest, *dst;

9ad7b260be233be7d7b5576979825cac72e15498rederpj char c;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf size_t no;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf int len;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if (!source)

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf return NULL;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf if (!nmatch)

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf return ap_pstrdup(p, src);

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf /* First pass, find the size */

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf len = 0;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf while ((c = *src++) != '\0') {

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf if (c == '&')

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf no = 0;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf else if (c == '$' && ap_isdigit(*src))

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf no = *src++ - '0';

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf else

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf no = 10;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf if (no > 9) { /* Ordinary character. */

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf if (c == '\\' && (*src == '$' || *src == '&'))

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf c = *src++;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf len++;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf }

141e1368614dc7564e1627671361b01b4869b491bnicholes else if (no < nmatch && pmatch[no].rm_so < pmatch[no].rm_eo) {

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes len += pmatch[no].rm_eo - pmatch[no].rm_so;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

e8f95a682820a599fe41b22977010636be5c2717jim

1ae7a5fbce5d4f65f3da355792258fe5dbc4ef55covener dest = dst = ap_pcalloc(p, len + 1);

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf /* Now actually fill in the string */

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

185aa71728867671e105178b4c66fbc22b65ae26sf src = input;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes while ((c = *src++) != '\0') {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (c == '&')

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes no = 0;

3dfeb02cfb853d8717ca0cc259b59fea610173f5bnicholes else if (c == '$' && ap_isdigit(*src))

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf no = *src++ - '0';

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf else

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf no = 10;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (no > 9) { /* Ordinary character. */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (c == '\\' && (*src == '$' || *src == '&'))

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf c = *src++;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf *dst++ = c;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf else if (no < nmatch && pmatch[no].rm_so < pmatch[no].rm_eo) {

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf len = pmatch[no].rm_eo - pmatch[no].rm_so;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf memcpy(dst, source + pmatch[no].rm_so, len);

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf dst += len;

185aa71728867671e105178b4c66fbc22b65ae26sf }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf *dst = '\0';

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf return dest;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes}

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

96ebb616bbf4ac2a422cc5d9770c9ad07ccecdc0covenerAPI_EXPORT(void) ap_getparents(char *name)

96ebb616bbf4ac2a422cc5d9770c9ad07ccecdc0covener{

96ebb616bbf4ac2a422cc5d9770c9ad07ccecdc0covener int l, w;

96ebb616bbf4ac2a422cc5d9770c9ad07ccecdc0covener

96ebb616bbf4ac2a422cc5d9770c9ad07ccecdc0covener /* Four paseses, as per RFC 1808 */

96ebb616bbf4ac2a422cc5d9770c9ad07ccecdc0covener /* a) remove ./ path segments */

96ebb616bbf4ac2a422cc5d9770c9ad07ccecdc0covener

96ebb616bbf4ac2a422cc5d9770c9ad07ccecdc0covener for (l = 0, w = 0; name[l] != '\0';) {

96ebb616bbf4ac2a422cc5d9770c9ad07ccecdc0covener if (name[l] == '.' && name[l + 1] == '/' && (l == 0 || name[l - 1] == '/'))

783874b86bfe13d7a4fe0922f344a3779cdccea3covener l += 2;

7dbf29be626018bc389ef94c1846aeac4b72633bsf else

7dbf29be626018bc389ef94c1846aeac4b72633bsf name[w++] = name[l++];

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim }

7dbf29be626018bc389ef94c1846aeac4b72633bsf

7dbf29be626018bc389ef94c1846aeac4b72633bsf /* b) remove trailing . path, segment */

7dbf29be626018bc389ef94c1846aeac4b72633bsf if (w == 1 && name[0] == '.')

7dbf29be626018bc389ef94c1846aeac4b72633bsf w--;

7dbf29be626018bc389ef94c1846aeac4b72633bsf else if (w > 1 && name[w - 1] == '.' && name[w - 2] == '/')

7dbf29be626018bc389ef94c1846aeac4b72633bsf w--;

7dbf29be626018bc389ef94c1846aeac4b72633bsf name[w] = '\0';

7dbf29be626018bc389ef94c1846aeac4b72633bsf

7dbf29be626018bc389ef94c1846aeac4b72633bsf /* c) remove all xx/../ segments. (including leading ../ and /../) */

7dbf29be626018bc389ef94c1846aeac4b72633bsf l = 0;

7dbf29be626018bc389ef94c1846aeac4b72633bsf

7dbf29be626018bc389ef94c1846aeac4b72633bsf while (name[l] != '\0') {

783874b86bfe13d7a4fe0922f344a3779cdccea3covener if (name[l] == '.' && name[l + 1] == '.' && name[l + 2] == '/' &&

7dbf29be626018bc389ef94c1846aeac4b72633bsf (l == 0 || name[l - 1] == '/')) {

7dbf29be626018bc389ef94c1846aeac4b72633bsf register int m = l + 3, n;

7dbf29be626018bc389ef94c1846aeac4b72633bsf

7dbf29be626018bc389ef94c1846aeac4b72633bsf l = l - 2;

7dbf29be626018bc389ef94c1846aeac4b72633bsf if (l >= 0) {

783874b86bfe13d7a4fe0922f344a3779cdccea3covener while (l >= 0 && name[l] != '/')

7dbf29be626018bc389ef94c1846aeac4b72633bsf l--;

7dbf29be626018bc389ef94c1846aeac4b72633bsf l++;

7dbf29be626018bc389ef94c1846aeac4b72633bsf }

7dbf29be626018bc389ef94c1846aeac4b72633bsf else

7dbf29be626018bc389ef94c1846aeac4b72633bsf l = 0;

7dbf29be626018bc389ef94c1846aeac4b72633bsf n = l;

7dbf29be626018bc389ef94c1846aeac4b72633bsf while ((name[n] = name[m]))

783874b86bfe13d7a4fe0922f344a3779cdccea3covener (++n, ++m);

7dbf29be626018bc389ef94c1846aeac4b72633bsf }

307219eca940aa30b873bfd68a44484dd3d3fa88covener else

307219eca940aa30b873bfd68a44484dd3d3fa88covener ++l;

307219eca940aa30b873bfd68a44484dd3d3fa88covener }

7dbf29be626018bc389ef94c1846aeac4b72633bsf

7dbf29be626018bc389ef94c1846aeac4b72633bsf /* d) remove trailing xx/.. segment. */

7dbf29be626018bc389ef94c1846aeac4b72633bsf if (l == 2 && name[0] == '.' && name[1] == '.')

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes name[0] = '\0';

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes else if (l > 2 && name[l - 1] == '.' && name[l - 2] == '.' && name[l - 3] == '/') {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes l = l - 4;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (l >= 0) {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes while (l >= 0 && name[l] != '/')

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes l--;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes l++;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes else

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes l = 0;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes name[l] = '\0';

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf}

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholesAPI_EXPORT(void) ap_no2slash(char *name)

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes{

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes char *d, *s;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes s = d = name;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes#ifdef WIN32

307219eca940aa30b873bfd68a44484dd3d3fa88covener /* Check for UNC names. Leave leading two slashes. */

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if (s[0] == '/' && s[1] == '/')

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes *d++ = *s++;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes#endif

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes while (*s) {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes if ((*d++ = *s) == '/') {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes do {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes ++s;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes } while (*s == '/');

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes else {

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes ++s;

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes }

d330a801b1e5d63a4b8b4fd431542ad0903fd71bbnicholes *d = '\0';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_EXPORT(char *) ap_make_dirstr_prefix(char *d, const char *s, int n)

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf{

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener for (;;) {

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener if (*s == '\0' || (*s == '/' && (--n) == 0)) {

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim *d = '/';

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener break;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener }

7dbf29be626018bc389ef94c1846aeac4b72633bsf *d++ = *s++;

7dbf29be626018bc389ef94c1846aeac4b72633bsf }

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener *++d = 0;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener return (d);

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener}

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covenerAPI_EXPORT(char *) ap_make_dirstr_parent(ap_context_t *p, const char *s)

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener{

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener char *last_slash = strrchr(s, '/');

185aa71728867671e105178b4c66fbc22b65ae26sf char *d;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener int l;

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener if (last_slash == NULL) {

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener /* XXX: well this is really broken if this happens */

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim return (ap_pstrdup(p, "/"));

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener }

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener l = (last_slash - s) + 1;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener d = ap_palloc(p, l + 1);

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener memcpy(d, s, l);

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener d[l] = 0;

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim return (d);

9c63a05713cb83a44a1590b4af33edeebf39f118sf}

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jimAPI_EXPORT(char *) ap_make_dirstr(ap_context_t *p, const char *s, int n)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes register int x, f;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *res;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes for (x = 0, f = 0; s[x]; x++) {

9c63a05713cb83a44a1590b4af33edeebf39f118sf if (s[x] == '/')

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if ((++f) == n) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes res = ap_palloc(p, x + 2);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes memcpy(res, s, x);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes res[x] = '/';

307219eca940aa30b873bfd68a44484dd3d3fa88covener res[x + 1] = '\0';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return res;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrin if (s[strlen(s) - 1] == '/')

54d22ed1c429b903b029bbd62621f11a9e286137minfrin return ap_pstrdup(p, s);

54d22ed1c429b903b029bbd62621f11a9e286137minfrin else

54d22ed1c429b903b029bbd62621f11a9e286137minfrin return ap_pstrcat(p, s, "/", NULL);

54d22ed1c429b903b029bbd62621f11a9e286137minfrin}

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrinAPI_EXPORT(int) ap_count_dirs(const char *path)

54d22ed1c429b903b029bbd62621f11a9e286137minfrin{

e8f95a682820a599fe41b22977010636be5c2717jim register int x, n;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe

8a03cd420b800a2428f49f4617293de9b2387b20jorton for (x = 0, n = 0; path[x]; x++)

54d22ed1c429b903b029bbd62621f11a9e286137minfrin if (path[x] == '/')

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf n++;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin return n;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin}

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrinAPI_EXPORT(void) ap_chdir_file(const char *file)

54d22ed1c429b903b029bbd62621f11a9e286137minfrin{

54d22ed1c429b903b029bbd62621f11a9e286137minfrin const char *x;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin char buf[HUGE_STRING_LEN];

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrin x = strrchr(file, '/');

54d22ed1c429b903b029bbd62621f11a9e286137minfrin if (x == NULL) {

54d22ed1c429b903b029bbd62621f11a9e286137minfrin chdir(file);

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf }

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf else if (x - file < sizeof(buf) - 1) {

54d22ed1c429b903b029bbd62621f11a9e286137minfrin memcpy(buf, file, x - file);

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener buf[x - file] = '\0';

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener chdir(buf);

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener }

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener /* XXX: well, this is a silly function, no method of reporting an

6999a76d8eb5ef6b4b295e51df0b2fb6064bd373covener}

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrinAPI_EXPORT(char *) ap_getword_nc(ap_context_t *atrans, char **line, char stop)

54d22ed1c429b903b029bbd62621f11a9e286137minfrin{

54d22ed1c429b903b029bbd62621f11a9e286137minfrin return ap_getword(atrans, (const char **) line, stop);

54d22ed1c429b903b029bbd62621f11a9e286137minfrin}

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

54d22ed1c429b903b029bbd62621f11a9e286137minfrinAPI_EXPORT(char *) ap_getword(ap_context_t *atrans, const char **line, char stop)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *pos = strchr(*line, stop);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *res;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (!pos) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes res = ap_pstrdup(atrans, *line);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *line += strlen(*line);

e8f95a682820a599fe41b22977010636be5c2717jim return res;

e8f95a682820a599fe41b22977010636be5c2717jim }

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes res = ap_pstrndup(atrans, *line, pos - *line);

e8f95a682820a599fe41b22977010636be5c2717jim

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe while (*pos == stop) {

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe ++pos;

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe }

f0f6f1b90ab582896f8a7d56d85bd62a55e57d90covener

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe *line = pos;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

560fd0658902ab57754616c172d8953e69fc4722bnicholes return res;

a81c0c1ae464b2063a21b45f80c9da8d89bb840ecovener}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

e8f95a682820a599fe41b22977010636be5c2717jimAPI_EXPORT(char *) ap_getword_white_nc(ap_context_t *atrans, char **line)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return ap_getword_white(atrans, (const char **) line);

9ad7b260be233be7d7b5576979825cac72e15498rederpj}

9ad7b260be233be7d7b5576979825cac72e15498rederpj

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_EXPORT(char *) ap_getword_white(ap_context_t *atrans, const char **line)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int pos = -1, x;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *res;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes for (x = 0; (*line)[x]; x++) {

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf if (ap_isspace((*line)[x])) {

560fd0658902ab57754616c172d8953e69fc4722bnicholes pos = x;

560fd0658902ab57754616c172d8953e69fc4722bnicholes break;

560fd0658902ab57754616c172d8953e69fc4722bnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (pos == -1) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes res = ap_pstrdup(atrans, *line);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *line += strlen(*line);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return res;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

e8f95a682820a599fe41b22977010636be5c2717jim

e8f95a682820a599fe41b22977010636be5c2717jim res = ap_palloc(atrans, pos + 1);

e8f95a682820a599fe41b22977010636be5c2717jim ap_cpystrn(res, *line, pos + 1);

e8f95a682820a599fe41b22977010636be5c2717jim

e8f95a682820a599fe41b22977010636be5c2717jim while (ap_isspace((*line)[pos]))

e8f95a682820a599fe41b22977010636be5c2717jim ++pos;

ae1981fc94adf2b231e2d0e15d2f895b2138c969covener

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe *line += pos;

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim return res;

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim}

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim

a81c0c1ae464b2063a21b45f80c9da8d89bb840ecovenerAPI_EXPORT(char *) ap_getword_nulls_nc(ap_context_t *atrans, char **line, char stop)

307219eca940aa30b873bfd68a44484dd3d3fa88covener{

a81c0c1ae464b2063a21b45f80c9da8d89bb840ecovener return ap_getword_nulls(atrans, (const char **) line, stop);

54091ac5c596337658fc568231ca1a900abdc5fecovener}

a81c0c1ae464b2063a21b45f80c9da8d89bb840ecovener

307219eca940aa30b873bfd68a44484dd3d3fa88covenerAPI_EXPORT(char *) ap_getword_nulls(ap_context_t *atrans, const char **line, char stop)

307219eca940aa30b873bfd68a44484dd3d3fa88covener{

307219eca940aa30b873bfd68a44484dd3d3fa88covener char *pos = strchr(*line, stop);

a81c0c1ae464b2063a21b45f80c9da8d89bb840ecovener char *res;

54091ac5c596337658fc568231ca1a900abdc5fecovener

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (!pos) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes res = ap_pstrdup(atrans, *line);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *line += strlen(*line);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return res;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes res = ap_pstrndup(atrans, *line, pos - *line);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ++pos;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *line = pos;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return res;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesstatic char *substring_conf(ap_context_t *p, const char *start, int len, char quote)

e8f95a682820a599fe41b22977010636be5c2717jim{

560fd0658902ab57754616c172d8953e69fc4722bnicholes char *result = ap_palloc(p, len + 2);

ae1981fc94adf2b231e2d0e15d2f895b2138c969covener char *resp = result;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe int i;

307219eca940aa30b873bfd68a44484dd3d3fa88covener

307219eca940aa30b873bfd68a44484dd3d3fa88covener for (i = 0; i < len; ++i) {

307219eca940aa30b873bfd68a44484dd3d3fa88covener if (start[i] == '\\' && (start[i + 1] == '\\'

307219eca940aa30b873bfd68a44484dd3d3fa88covener || (quote && start[i + 1] == quote)))

307219eca940aa30b873bfd68a44484dd3d3fa88covener *resp++ = start[++i];

307219eca940aa30b873bfd68a44484dd3d3fa88covener else

307219eca940aa30b873bfd68a44484dd3d3fa88covener *resp++ = start[i];

307219eca940aa30b873bfd68a44484dd3d3fa88covener }

307219eca940aa30b873bfd68a44484dd3d3fa88covener

307219eca940aa30b873bfd68a44484dd3d3fa88covener *resp++ = '\0';

307219eca940aa30b873bfd68a44484dd3d3fa88covener return result;

307219eca940aa30b873bfd68a44484dd3d3fa88covener}

307219eca940aa30b873bfd68a44484dd3d3fa88covener

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jimAPI_EXPORT(char *) ap_getword_conf_nc(ap_context_t *p, char **line)

307219eca940aa30b873bfd68a44484dd3d3fa88covener{

307219eca940aa30b873bfd68a44484dd3d3fa88covener return ap_getword_conf(p, (const char **) line);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

307219eca940aa30b873bfd68a44484dd3d3fa88covenerAPI_EXPORT(char *) ap_getword_conf(ap_context_t *p, const char **line)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes const char *str = *line, *strend;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *res;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char quote;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes while (*str && ap_isspace(*str))

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ++str;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (!*str) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *line = str;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return "";

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((quote = *str) == '"' || quote == '\'') {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes strend = str + 1;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes while (*strend && *strend != quote) {

0e05808dc59a321566303084c84b9826a4353cefrederpj if (*strend == '\\' && strend[1] && strend[1] == quote)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes strend += 2;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes else

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ++strend;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener }

0e05808dc59a321566303084c84b9826a4353cefrederpj res = substring_conf(p, str + 1, strend - str - 1, quote);

185aa71728867671e105178b4c66fbc22b65ae26sf

ebe5305f8b22507374358f32b74d12fb50c05a25covener if (*strend == quote)

ebe5305f8b22507374358f32b74d12fb50c05a25covener ++strend;

ebe5305f8b22507374358f32b74d12fb50c05a25covener }

ebe5305f8b22507374358f32b74d12fb50c05a25covener else {

ebe5305f8b22507374358f32b74d12fb50c05a25covener strend = str;

ebe5305f8b22507374358f32b74d12fb50c05a25covener while (*strend && !ap_isspace(*strend))

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim ++strend;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener res = substring_conf(p, str, strend - str, 0);

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener }

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener while (*strend && ap_isspace(*strend))

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener ++strend;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener *line = strend;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return res;

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener}

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener

0e05808dc59a321566303084c84b9826a4353cefrederpjAPI_EXPORT(int) ap_cfg_closefile(configfile_t *cfp)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener#ifdef DEBUG

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "Done with config file %s", cfp->name);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#endif

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener return (cfp->close == NULL) ? 0 : cfp->close(cfp->param);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesstatic ap_status_t cfg_close(void *param)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

9ad7b260be233be7d7b5576979825cac72e15498rederpj ap_file_t *cfp = (ap_file_t *) param;

9ad7b260be233be7d7b5576979825cac72e15498rederpj return (ap_close(cfp));

54d22ed1c429b903b029bbd62621f11a9e286137minfrin}

54d22ed1c429b903b029bbd62621f11a9e286137minfrin

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sfstatic int cfg_getch(void *param)

54d22ed1c429b903b029bbd62621f11a9e286137minfrin{

54d22ed1c429b903b029bbd62621f11a9e286137minfrin char ch;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin ap_file_t *cfp = (ap_file_t *) param;

560fd0658902ab57754616c172d8953e69fc4722bnicholes if (ap_getc(&ch, cfp) == APR_SUCCESS)

54d22ed1c429b903b029bbd62621f11a9e286137minfrin return ch;

54d22ed1c429b903b029bbd62621f11a9e286137minfrin return (int)EOF;

ae1981fc94adf2b231e2d0e15d2f895b2138c969covener}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

a81c0c1ae464b2063a21b45f80c9da8d89bb840ecovenerstatic void *cfg_getstr(void *buf, size_t bufsiz, void *param)

7a55c294da84865fe13262ed66ffd0c5841a9da5covener{

4e9c24785b525d2956e6e381015c0f2bd0a72f4bcovener ap_file_t *cfp = (ap_file_t *) param;

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim if (ap_fgets(buf, bufsiz, cfp) == APR_SUCCESS)

fa123db15501821e36e513afa78e839775ad2800covener return buf;

185aa71728867671e105178b4c66fbc22b65ae26sf return NULL;

fa123db15501821e36e513afa78e839775ad2800covener}

fa123db15501821e36e513afa78e839775ad2800covener

fa123db15501821e36e513afa78e839775ad2800covenerAPI_EXPORT(configfile_t *) ap_pcfg_openfile(ap_context_t *p, const char *name)

fa123db15501821e36e513afa78e839775ad2800covener{

fa123db15501821e36e513afa78e839775ad2800covener configfile_t *new_cfg;

fa123db15501821e36e513afa78e839775ad2800covener ap_file_t *file;

fa123db15501821e36e513afa78e839775ad2800covener int saved_errno;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_status_t stat;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_filetype_e type;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (name == NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, NULL,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes "Internal error: pcfg_openfile() called with NULL filename");

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return NULL;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (!ap_os_is_filename_valid(name)) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, NULL,

307219eca940aa30b873bfd68a44484dd3d3fa88covener "Access to config file %s denied: not a valid filename",

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes name);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes errno = EACCES;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return NULL;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes stat = ap_open(&file, p, name, APR_READ | APR_BUFFERED, APR_OS_DEFAULT);

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe#ifdef DEBUG

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe saved_errno = errno;

e8f95a682820a599fe41b22977010636be5c2717jim ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, NULL,

e8f95a682820a599fe41b22977010636be5c2717jim "Opening config file %s (%s)",

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe name, (stat != APR_SUCCESS) ? strerror(errno) : "successful");

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes errno = saved_errno;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#endif

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (stat != APR_SUCCESS)

e8f95a682820a599fe41b22977010636be5c2717jim return NULL;

e8f95a682820a599fe41b22977010636be5c2717jim

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe if (ap_get_filetype(&type, file) == APR_SUCCESS &&

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes type != APR_REG &&

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#if defined(WIN32) || defined(OS2)

e8f95a682820a599fe41b22977010636be5c2717jim !(strcasecmp(name, "nul") == 0 ||

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes (strlen(name) >= 4 &&

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes strcasecmp(name + strlen(name) - 4, "/nul") == 0))) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#else

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes strcmp(name, "/dev/null") != 0) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#endif /* WIN32 || OS2 */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes saved_errno = errno;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, NULL,

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe "Access to file %s denied by server: not a regular file",

e8f95a682820a599fe41b22977010636be5c2717jim name);

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe ap_close(file);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes errno = saved_errno;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return NULL;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg = ap_palloc(p, sizeof(*new_cfg));

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->param = file;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->name = ap_pstrdup(p, name);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->getch = (int (*)(void *)) cfg_getch;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->getstr = (void *(*)(void *, size_t, void *)) cfg_getstr;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->close = (int (*)(void *)) cfg_close;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->line_number = 0;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return new_cfg;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_EXPORT(configfile_t *) ap_pcfg_open_custom(ap_context_t *p, const char *descr,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes void *param,

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int(*getch)(void *param),

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes void *(*getstr) (void *buf, size_t bufsiz, void *param),

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes int(*close_func)(void *param))

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes configfile_t *new_cfg = ap_palloc(p, sizeof(*new_cfg));

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#ifdef DEBUG

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, NULL, "Opening config handler %s", descr);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#endif

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->param = param;

e8f95a682820a599fe41b22977010636be5c2717jim new_cfg->name = descr;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->getch = getch;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->getstr = getstr;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->close = close_func;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes new_cfg->line_number = 0;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return new_cfg;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_EXPORT(int) ap_cfg_getc(configfile_t *cfp)

e8f95a682820a599fe41b22977010636be5c2717jim{

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes register int ch = cfp->getch(cfp->param);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (ch == LF)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ++cfp->line_number;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return ch;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covenerAPI_EXPORT(int) ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp)

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener{

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener /* If a "get string" function is defined, use it */

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener if (cfp->getstr != NULL) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes char *src, *dst;

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholes char *cp;

43c3e6a4b559b76b750c245ee95e2782c15b4296jim char *cbuf = buf;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes size_t cbufsize = bufsize;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes while (1) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ++cfp->line_number;

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener if (cfp->getstr(cbuf, cbufsize, cfp->param) == NULL)

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener return 1;

ab86c68ce36c715e93f403dde41d0b9c1522c8b0sf

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener /*

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholes cp = cbuf;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener while (cp < cbuf+cbufsize && *cp != '\0')

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes cp++;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (cp > cbuf && cp[-1] == LF) {

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf cp--;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (cp > cbuf && cp[-1] == CR)

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf cp--;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (cp > cbuf && cp[-1] == '\\') {

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf cp--;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (!(cp > cbuf && cp[-1] == '\\')) {

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf /*

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf cbufsize -= (cp-cbuf);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes cbuf = cp;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes continue;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes else {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /*

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes for ( ; cp < cbuf+cbufsize && *cp != '\0'; cp++)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes cp[0] = cp[1];

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes break;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /*

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes src = buf;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes while (ap_isspace(*src))

e8f95a682820a599fe41b22977010636be5c2717jim ++src;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* blast trailing whitespace */

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe dst = &src[strlen(src)];

e8f95a682820a599fe41b22977010636be5c2717jim while (--dst >= src && ap_isspace(*dst))

e8f95a682820a599fe41b22977010636be5c2717jim *dst = '\0';

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe /* Zap leading whitespace by shifting */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (src != buf)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes for (dst = buf; (*dst++ = *src++) != '\0'; )

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#ifdef DEBUG_CFG_LINES

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, "Read config: %s", buf);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#endif

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return 0;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes } else {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* No "get string" function defined; read character by character */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes register int c;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes register size_t i = 0;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes buf[0] = '\0';

e8f95a682820a599fe41b22977010636be5c2717jim /* skip leading whitespace */

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem do {

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem c = cfp->getch(cfp->param);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem } while (c == '\t' || c == ' ');

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (c == EOF)

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe return 1;

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe

8113dac419143273351446c3ad653f3fe5ba5cfdwrowe if(bufsize < 2) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* too small, assume caller is crazy */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return 1;

e8f95a682820a599fe41b22977010636be5c2717jim }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes while (1) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if ((c == '\t') || (c == ' ')) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes buf[i++] = ' ';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes while ((c == '\t') || (c == ' '))

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes c = cfp->getch(cfp->param);

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe }

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe if (c == CR) {

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe /* silently ignore CR (_assume_ that a LF follows) */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes c = cfp->getch(cfp->param);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (c == LF) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* increase line number and return on LF */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ++cfp->line_number;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (c == EOF || c == 0x4 || c == LF || i >= (bufsize - 2)) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /*

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (i > 0 && buf[i-1] == '\\') {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes i--;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (!(i > 0 && buf[i-1] == '\\')) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* line is continued */

e8f95a682820a599fe41b22977010636be5c2717jim c = cfp->getch(cfp->param);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes continue;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* else nothing needs be done because

e8f95a682820a599fe41b22977010636be5c2717jim }

e8f95a682820a599fe41b22977010636be5c2717jim /* blast trailing whitespace */

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe while (i > 0 && ap_isspace(buf[i - 1]))

e8f95a682820a599fe41b22977010636be5c2717jim --i;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes buf[i] = '\0';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#ifdef DEBUG_CFG_LINES

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, "Read config: %s", buf);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes#endif

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return 0;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes buf[i] = c;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ++i;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes c = cfp->getch(cfp->param);

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_EXPORT(const char *) ap_size_list_item(const char **field, int *len)

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj{

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj const unsigned char *ptr = (const unsigned char *)*field;

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj const unsigned char *token;

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj int in_qpair, in_qstr, in_com;

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj /* Find first non-comma, non-whitespace byte */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes while (*ptr == ',' || ap_isspace(*ptr))

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ++ptr;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes token = ptr;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes /* Find the end of this item, skipping over dead bits */

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes for (in_qpair = in_qstr = in_com = 0;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *ptr && (in_qpair || in_qstr || in_com || *ptr != ',');

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj ++ptr) {

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener if (in_qpair) {

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener in_qpair = 0;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener }

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholes else {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes switch (*ptr) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes case '\\': in_qpair = 1; /* quoted-pair */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes break;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes case '"' : if (!in_com) /* quoted string delim */

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener in_qstr = !in_qstr;

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener break;

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener case '(' : if (!in_qstr) /* comment (may nest) */

37af4b0cf648275b68ff41c866c665b4ccf4667dcovener ++in_com;

5bfaaf573bacb45c1cf290ce85ecc676587e8a64jim break;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes case ')' : if (in_com) /* end comment */

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes --in_com;

f43b67c5a9d29b572eac916f8335cedc80c908bebnicholes break;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener default : break;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if ((*len = (ptr - token)) == 0) {

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf *field = (const char *)ptr;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf return NULL;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf }

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener /* Advance field pointer to the next non-comma, non-white byte */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf while (*ptr == ',' || ap_isspace(*ptr))

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ++ptr;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

e8f95a682820a599fe41b22977010636be5c2717jim *field = (const char *)ptr;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes return (const char *)token;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes}

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholesAPI_EXPORT(char *) ap_get_list_item(ap_context_t *p, const char **field)

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe{

e8f95a682820a599fe41b22977010636be5c2717jim const char *tok_start;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe const unsigned char *ptr;

e8f95a682820a599fe41b22977010636be5c2717jim unsigned char *pos;

482f676c6c19b1c5bb5cca04dad11509c1da3a4cwrowe char *token;

e8f95a682820a599fe41b22977010636be5c2717jim int addspace = 0, in_qpair = 0, in_qstr = 0, in_com = 0, tok_len = 0;

e8f95a682820a599fe41b22977010636be5c2717jim

e8f95a682820a599fe41b22977010636be5c2717jim /* Find the beginning and maximum length of the list item so that

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj if ((tok_start = ap_size_list_item(field, &tok_len)) == NULL) {

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj return NULL;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem }

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem token = ap_palloc(p, tok_len + 1);

9c63a05713cb83a44a1590b4af33edeebf39f118sf

185aa71728867671e105178b4c66fbc22b65ae26sf /* Scan the token again, but this time copy only the good bytes.

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes for (ptr = (const unsigned char *)tok_start, pos = (unsigned char *)token;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *ptr && (in_qpair || in_qstr || in_com || *ptr != ',');

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes ++ptr) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (in_qpair) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes in_qpair = 0;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *pos++ = *ptr;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes }

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes else {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes switch (*ptr) {

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes case '\\': in_qpair = 1;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (addspace == 1)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *pos++ = ' ';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *pos++ = *ptr;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes addspace = 0;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes break;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes case '"' : if (!in_com)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes in_qstr = !in_qstr;

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes if (addspace == 1)

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *pos++ = ' ';

d5b12fe8ae917e654a33247fd4e59dc9e75170aebnicholes *pos++ = *ptr;

8869662bb1a4078297020e94ae5e928626d877c6rederpj addspace = 0;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem break;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem case '(' : if (!in_qstr)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem ++in_com;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if (addspace == 1)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem *pos++ = ' ';

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem *pos++ = *ptr;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem addspace = 0;

8869662bb1a4078297020e94ae5e928626d877c6rederpj break;

8869662bb1a4078297020e94ae5e928626d877c6rederpj case ')' : if (in_com)

8869662bb1a4078297020e94ae5e928626d877c6rederpj --in_com;

8869662bb1a4078297020e94ae5e928626d877c6rederpj *pos++ = *ptr;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem addspace = 0;

8869662bb1a4078297020e94ae5e928626d877c6rederpj break;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener case ' ' :

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener case '\t': if (addspace)

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener break;

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (in_com || in_qstr)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem *pos++ = *ptr;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem else

8869662bb1a4078297020e94ae5e928626d877c6rederpj addspace = 1;

8869662bb1a4078297020e94ae5e928626d877c6rederpj break;

8869662bb1a4078297020e94ae5e928626d877c6rederpj case '=' :

8869662bb1a4078297020e94ae5e928626d877c6rederpj case '/' :

8869662bb1a4078297020e94ae5e928626d877c6rederpj case ';' : if (!(in_com || in_qstr))

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem addspace = -1;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem *pos++ = *ptr;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem break;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener default : if (addspace == 1)

8869662bb1a4078297020e94ae5e928626d877c6rederpj *pos++ = ' ';

8869662bb1a4078297020e94ae5e928626d877c6rederpj *pos++ = (in_com || in_qstr) ? *ptr

8869662bb1a4078297020e94ae5e928626d877c6rederpj : ap_tolower(*ptr);

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener addspace = 0;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener break;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener }

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener }

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener }

8869662bb1a4078297020e94ae5e928626d877c6rederpj *pos = '\0';

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj return token;

8869662bb1a4078297020e94ae5e928626d877c6rederpj}

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8445dae5cc606ba8ba04efc341cc1e081d95920drpluemAPI_EXPORT(int) ap_find_list_item(ap_context_t *p, const char *line, const char *tok)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem{

8869662bb1a4078297020e94ae5e928626d877c6rederpj const unsigned char *pos;

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener const unsigned char *ptr = (const unsigned char *)line;

8869662bb1a4078297020e94ae5e928626d877c6rederpj int good = 0, addspace = 0, in_qpair = 0, in_qstr = 0, in_com = 0;

8869662bb1a4078297020e94ae5e928626d877c6rederpj

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf if (!line || !tok)

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf return 0;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf do { /* loop for each item in line's list */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf /* Find first non-comma, non-whitespace byte */

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

60d81cab99dccfbb0c8d378cf6aa7338be0fdb74covener while (*ptr == ',' || ap_isspace(*ptr))

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf ++ptr;

4be9c459920a7c1cfe62d654327dae5c4bb6b284sf

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (*ptr)

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = 1; /* until proven otherwise for this item */

8869662bb1a4078297020e94ae5e928626d877c6rederpj else

8869662bb1a4078297020e94ae5e928626d877c6rederpj break; /* no items left and nothing good found */

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj /* We skip extra whitespace and any whitespace around a '=', '/',

8869662bb1a4078297020e94ae5e928626d877c6rederpj for (pos = (const unsigned char *)tok;

8869662bb1a4078297020e94ae5e928626d877c6rederpj *ptr && (in_qpair || in_qstr || in_com || *ptr != ',');

8869662bb1a4078297020e94ae5e928626d877c6rederpj ++ptr) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (in_qpair) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj in_qpair = 0;

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (good)

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = (*pos++ == *ptr);

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj else {

8869662bb1a4078297020e94ae5e928626d877c6rederpj switch (*ptr) {

8869662bb1a4078297020e94ae5e928626d877c6rederpj case '\\': in_qpair = 1;

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (addspace == 1)

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = good && (*pos++ == ' ');

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = good && (*pos++ == *ptr);

8869662bb1a4078297020e94ae5e928626d877c6rederpj addspace = 0;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem break;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem case '"' : if (!in_com)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem in_qstr = !in_qstr;

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (addspace == 1)

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = good && (*pos++ == ' ');

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = good && (*pos++ == *ptr);

8869662bb1a4078297020e94ae5e928626d877c6rederpj addspace = 0;

8869662bb1a4078297020e94ae5e928626d877c6rederpj break;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem case '(' : if (!in_qstr)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem ++in_com;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem if (addspace == 1)

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem good = good && (*pos++ == ' ');

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem good = good && (*pos++ == *ptr);

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem addspace = 0;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem break;

8869662bb1a4078297020e94ae5e928626d877c6rederpj case ')' : if (in_com)

8869662bb1a4078297020e94ae5e928626d877c6rederpj --in_com;

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = good && (*pos++ == *ptr);

8869662bb1a4078297020e94ae5e928626d877c6rederpj addspace = 0;

8869662bb1a4078297020e94ae5e928626d877c6rederpj break;

8869662bb1a4078297020e94ae5e928626d877c6rederpj case ' ' :

8869662bb1a4078297020e94ae5e928626d877c6rederpj case '\t': if (addspace || !good)

8869662bb1a4078297020e94ae5e928626d877c6rederpj break;

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (in_com || in_qstr)

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = (*pos++ == *ptr);

8869662bb1a4078297020e94ae5e928626d877c6rederpj else

8869662bb1a4078297020e94ae5e928626d877c6rederpj addspace = 1;

8869662bb1a4078297020e94ae5e928626d877c6rederpj break;

8869662bb1a4078297020e94ae5e928626d877c6rederpj case '=' :

8869662bb1a4078297020e94ae5e928626d877c6rederpj case '/' :

8869662bb1a4078297020e94ae5e928626d877c6rederpj case ';' : if (!(in_com || in_qstr))

8869662bb1a4078297020e94ae5e928626d877c6rederpj addspace = -1;

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = good && (*pos++ == *ptr);

8869662bb1a4078297020e94ae5e928626d877c6rederpj break;

8869662bb1a4078297020e94ae5e928626d877c6rederpj default : if (!good)

8869662bb1a4078297020e94ae5e928626d877c6rederpj break;

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (addspace == 1)

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = (*pos++ == ' ');

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (in_com || in_qstr)

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = good && (*pos++ == *ptr);

342377e75b69a70c16175cce7f694472f9f8a6adjailletc else

342377e75b69a70c16175cce7f694472f9f8a6adjailletc good = good && (*pos++ == ap_tolower(*ptr));

8869662bb1a4078297020e94ae5e928626d877c6rederpj addspace = 0;

8869662bb1a4078297020e94ae5e928626d877c6rederpj break;

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj }

8869662bb1a4078297020e94ae5e928626d877c6rederpj if (good && *pos)

8869662bb1a4078297020e94ae5e928626d877c6rederpj good = 0; /* not good if only a prefix was matched */

8869662bb1a4078297020e94ae5e928626d877c6rederpj

8869662bb1a4078297020e94ae5e928626d877c6rederpj } while (*ptr && !good);

8869662bb1a4078297020e94ae5e928626d877c6rederpj

3f5585f7f4a7d74f2f94ec729ea8c1879d419e35rederpj return good;

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem}

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem

8445dae5cc606ba8ba04efc341cc1e081d95920drpluem