httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@zyzzyva.com>
Subject Remove ConfigDir
Date Sat, 08 Jun 1996 03:58:25 GMT
Not sure if this makes it any easer to remove or not....

*** http_core.c.orig	Fri Jun  7 22:56:07 1996
--- http_core.c	Fri Jun  7 22:57:21 1996
***************
*** 612,656 ****
      return errmsg;
  }
  
- char *read_configdir (cmd_parms *cmd, void *dummy, char *arg)
- {
-     DIR *vdir;
-     struct DIR_TYPE *vdir_entry;
-     char *dirname, *fname, *p;
-     
-     dirname = server_root_relative (cmd->pool, arg);
-     
-     if (!is_directory (dirname))
- 	log_error ("ConfigDir must be a valid directory", cmd->server);
-     
-     vdir = opendir (dirname);
- 
-     if (vdir == NULL) {
-         return NULL;
-     }
- 
-     if ((p = strrchr (dirname, '\0')))
-     {
- 	if (*--p != '/')
- 	    dirname = pstrcat (cmd->pool, dirname, "/", NULL);
-     }
-     
-     while ((vdir_entry = readdir (vdir))) {
- 
- 	if ((strstr(vdir_entry->d_name, ".conf")) != NULL)
- 	{
- 	    fname = pstrcat (cmd->pool, dirname, vdir_entry->d_name, NULL);
- 	    process_resource_config (cmd->server, fname,
- 				     cmd->pool, cmd->temp_pool);
- 	}
- 	else
- 	    continue;
-     }
- 
-     closedir (vdir);
-     return NULL;
- }
- 
  char *set_server_string_slot (cmd_parms *cmd, void *dummy, char *arg)
  {
      /* This one's pretty generic... */
--- 612,617 ----
***************
*** 880,886 ****
        "a port number or a numeric IP address and a port number"},
  { "<VirtualHost", virtualhost_section, NULL, RSRC_CONF, RAW_ARGS, NULL },
  { "</VirtualHost>", end_virtualhost_section, NULL, RSRC_CONF, NO_ARGS, NULL },
- { "ConfigDir", read_configdir, NULL, RSRC_CONF, TAKE1, "directory containing config files"
},
  { NULL },
  };
  
--- 841,846 ----




Mime
View raw message