cvs commit: modperl-2.0/src/modules/perl modperl_options.c modperl_options.h

[do...@locus.apache.org]

dougm       00/06/13 14:04:55

  Added:       src/modules/perl modperl_options.c modperl_options.h
  Log:
  for PerlOptions directive
  
  Revision  Changes    Path
  1.1                  modperl-2.0/src/modules/perl/modperl_options.c
  
  Index: modperl_options.c
  ===================================================================
  #include "mod_perl.h"
  
  static modperl_opts_t flags_lookup(modperl_options_t *o,
                                     const char *str)
  {
      switch (o->unset) {
        case MpSrv_f_UNSET:
          return modperl_flags_lookup_srv(str);
        case MpDir_f_UNSET:
          return modperl_flags_lookup_dir(str);
        default:
          return '\0';
      };
  }
  
  modperl_options_t *modperl_options_new(ap_pool_t *p, int type)
  {
      modperl_options_t *options = 
          (modperl_options_t *)ap_pcalloc(p, sizeof(*options));
  
      options->opts = options->unset = 
          (type == MpSrvType ? MpSrv_f_UNSET : MpDir_f_UNSET);
  
      return options;
  }
  
  const char *modperl_options_set(ap_pool_t *p, modperl_options_t *o,
                                  const char *str)
  {
      modperl_opts_t opt;
      char action = '\0';
      const char *error = NULL;
  
      if (*str == '+' || *str == '-') {
          action = *(str++);
      }
  
      if (!(opt = flags_lookup(o, str))) {
          error = ap_pstrcat(p, "Unknown PerlOption: ", str, NULL);
          return error;
      }
      
      if (action == '-') {
          o->opts_remove |= opt;
          o->opts_add &= ~opt;
          o->opts &= ~opt;
      }
      else if (action == '+') {
          o->opts_add |= opt;
          o->opts_remove &= ~opt;
          o->opts |= opt;
      }
      else {
          o->opts |= opt;
      }
  
      return NULL;
  }
  
  modperl_options_t *modperl_options_merge(ap_pool_t *p,
                                           modperl_options_t *base,
                                           modperl_options_t *add)
  {
      modperl_options_t *conf = modperl_options_new(p, 0);
      memcpy((char *)conf, (const char *)base, sizeof(*base));
  
      if (add->opts & add->unset) {
  	/* there was no explicit setting of add->opts, so we merge
  	 * preserve the invariant (opts_add & opts_remove) == 0
  	 */
  	conf->opts_add = (conf->opts_add & ~add->opts_remove) | add->opts_add;
  	conf->opts_remove = (conf->opts_remove & ~add->opts_add)
  	                    | add->opts_remove;
  	conf->opts = (conf->opts & ~conf->opts_remove) | conf->opts_add;
      }
      else {
  	/* otherwise we just copy, because an explicit opts setting
  	 * overrides all earlier +/- modifiers
  	 */
  	conf->opts = add->opts;
  	conf->opts_add = add->opts_add;
  	conf->opts_remove = add->opts_remove;
      }
  
      return conf;
  }
  
  
  
  1.1                  modperl-2.0/src/modules/perl/modperl_options.h
  
  Index: modperl_options.h
  ===================================================================
  #ifndef MODPERL_OPTIONS_H
  #define MODPERL_OPTIONS_H
  
  modperl_options_t *modperl_options_new(ap_pool_t *p, int type);
  
  const char *modperl_options_set(ap_pool_t *p, modperl_options_t *o,
                                  const char *s);
  
  modperl_options_t *modperl_options_merge(ap_pool_t *p,
                                           modperl_options_t *base,
                                           modperl_options_t *new);
  
  #endif /* MODPERL_OPTIONS_H */