default_all() needs to copy input lines to static memory. this also

lets us fake config_lineno.
other misc fixes

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index cd2b122fd170ee7268fe55892c5f9299b5d97531..26b7134cee7a7b41eb7cb25e79165d0259f89e63 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.202 1997/07/14 05:57:51 wessels Exp $
+ * $Id: cache_cf.cc,v 1.203 1997/07/14 19:56:14 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -53,7 +53,6 @@ static void parseTimeLine _PARAMS((time_t *tptr, const char *units));
 
 static void parse_string _PARAMS((char **));
 static void parse_wordlist _PARAMS((wordlist **));
-static void dump_all _PARAMS((void));
 static void default_all _PARAMS((void));
 static int parse_line _PARAMS((char *));
 static cache_peer *configFindPeer _PARAMS((const char *name));
@@ -158,7 +157,7 @@ parseConfigFile(const char *file_name)
        if (config_input_line[0] == '\0')
            continue;
        debug(3, 5) ("Processing: '%s'\n", config_input_line);
-       strcpy(tmp_line, config_input_line);
+       xstrncpy(tmp_line, config_input_line, BUFSIZ);
        if (!parse_line(tmp_line)) {
            debug(3, 0) ("parseConfigFile: line %d unrecognized: '%s'\n",
                config_lineno,
@@ -206,7 +205,6 @@ parseConfigFile(const char *file_name)
     }
     fclose(fp);
     configDoConfigure();
-    dump_all();
     return 0;
 }
 
@@ -298,7 +296,7 @@ parseTimeUnits(const char *unit)
 static void
 dump_acl(acl *acl)
 {
-    debug(0,0)("XXX need to fix\n");
+    assert(0);
 }
 
 static void
@@ -316,7 +314,7 @@ free_acl(acl **acl)
 static void
 dump_acl_access(struct _acl_access *head)
 {
-    debug(0,0)("XXX need to fix\n");
+    assert(0);
 }
 
 static void
@@ -362,7 +360,7 @@ free_address(struct in_addr *addr)
 static void
 dump_cachedir(struct _cacheSwap swap)
 {
-    debug(0,0)("XXX need to fix\n");
+    assert(0);
 }
 
 static void
@@ -440,7 +438,7 @@ free_cachedir(struct _cacheSwap *swap)
 static void
 dump_cache_peer(cache_peer *p)
 {
-    debug(0,0)("XXX need to fix\n");
+    assert(0);
 }
 
 static void
@@ -512,7 +510,7 @@ free_cache_peer(cache_peer **P)
 static void
 dump_cachemgrpasswd(cachemgr_passwd *list)
 {
-    debug(0,0)("XXX need to fix\n");
+    assert(0);
 }
 
 static void
@@ -541,7 +539,7 @@ free_cachemgrpasswd(cachemgr_passwd **head)
 static void
 dump_denyinfo(struct _acl_deny_info_list *var)
 {
-    debug(0,0)("XXX need to fix\n");
+    assert(0);
 }
 
 static void
@@ -804,7 +802,7 @@ parse_pathname_stat(char **path)
 static void
 dump_refreshpattern(refresh_t *head)
 {
-    debug(0,0)("XXX need to fix\n");
+    assert(0);
 }
 
 static void
@@ -877,7 +875,7 @@ free_refreshpattern(refresh_t **head)
 static void
 dump_regexlist(relist * var)
 {
-    debug(0,0)("XXX need to fix\n");
+    assert(0);
 }
 
 static void

diff --git a/src/cf_gen.cc b/src/cf_gen.cc
index fa3bb1be412f5a68945c16eca7e13bca023d2f06..1ad31de43e440121f508c385700ecbb96c509292 100644 (file)
--- a/src/cf_gen.cc
+++ b/src/cf_gen.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cf_gen.cc,v 1.5 1997/07/14 04:27:38 wessels Exp $
+ * $Id: cf_gen.cc,v 1.6 1997/07/14 19:56:15 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Max Okumoto
@@ -286,11 +286,24 @@ gen_default(Entry * head, FILE * fp)
 {
     Entry *entry;
     int rc = 0;
+    fprintf(fp,
+       "void\n"
+       "default_line(const char *s)\n"
+       "{\n"
+       "\tLOCAL_ARRAY(char, tmp_line, BUFSIZ);\n"
+        "\txstrncpy(tmp_line, s, BUFSIZ);\n"
+        "\txstrncpy(config_input_line, s, BUFSIZ);\n"
+       "\tconfig_lineno++;\n"
+        "\tparse_line(tmp_line);\n"
+       "}\n"
+       );
+
     fprintf(fp,
        "void\n"
        "default_all(void)\n"
        "{\n"
        "\tcfg_filename = \"Default Configuration\";\n"
+       "\tconfig_lineno = 0;\n"
        );
     for (entry = head; entry != NULL; entry = entry->next) {
        assert(entry->name);
@@ -308,7 +321,7 @@ gen_default(Entry * head, FILE * fp)
        if (strcmp(entry->default_value, "none") == 0) {
            fprintf(fp, "\t/* No default for %s */\n", entry->name);
        } else {
-           fprintf(fp, "\tparse_line(\"%s %s\");\n",
+           fprintf(fp, "\tdefault_line(\"%s %s\");\n",
                entry->name,
                entry->default_value);
        }