get rid of

[privoxy.git] / loadcfg.c

diff --git a/loadcfg.c b/loadcfg.c
index 49403eb..6282b31 100644 (file)
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.87 2009/02/15 07:56:13 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.92 2009/03/18 20:43:19 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -35,6 +35,31 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.87 2009/02/15 07:56:13 fabiankeil
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
+ *    Revision 1.92  2009/03/18 20:43:19  fabiankeil
+ *    Don't enable LOG_LEVEL_INFO by default and don't apply the user's
+ *    debug settings until the logfile has been opened (if there is one).
+ *    Patch submitted by Roland in #2624120.
+ *
+ *    Revision 1.91  2009/03/09 17:29:08  fabiankeil
+ *    As of r1.88, the show-status page can use a single line for
+ *    warnings about ignored directives and the names of the ignored
+ *    directives themselves. Reminded by Lee, finally closes #1856559.
+ *
+ *    Revision 1.90  2009/03/07 17:58:02  fabiankeil
+ *    Fix two mingw32-only buffer overflows. Note that triggering
+ *    them requires control over the configuration file in which
+ *    case all bets are off anyway.
+ *
+ *    Revision 1.89  2009/03/01 18:46:33  fabiankeil
+ *    - Help clang understand that we aren't
+ *      dereferencing NULL pointers here.
+ *    - Some style fixes in the modified region.
+ *
+ *    Revision 1.88  2009/02/28 10:57:10  fabiankeil
+ *    Gimme a break or two. Don't let the show-status page
+ *    link to the website documentation for the user-manual
+ *    directive itself.
+ *
  *    Revision 1.87  2009/02/15 07:56:13  fabiankeil
  *    Increase default socket timeout to 300 seconds.
  *
@@ -761,15 +786,16 @@ struct configuration_spec * load_config(void)
    int keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
 #endif
 
-   if ( !check_file_changed(current_configfile, configfile, &fs))
+   if (!check_file_changed(current_configfile, configfile, &fs))
    {
       /* No need to load */
       return ((struct configuration_spec *)current_configfile->f);
    }
-   if (!fs)
+   if (NULL == fs)
    {
-      log_error(LOG_LEVEL_FATAL, "can't check configuration file '%s':  %E",
-                configfile);
+      log_error(LOG_LEVEL_FATAL,
+         "can't check configuration file '%s':  %E", configfile);
+      return NULL;
    }
 
    if (NULL != current_configfile)
@@ -778,17 +804,17 @@ struct configuration_spec * load_config(void)
    }
 
 #ifdef FEATURE_TOGGLE
-   global_toggle_state      = 1;
+   global_toggle_state = 1;
 #endif /* def FEATURE_TOGGLE */
 
    fs->f = config = (struct configuration_spec *)zalloc(sizeof(*config));
 
-   if (config==NULL)
+   if (NULL == config)
    {
       freez(fs->filename);
       freez(fs);
       log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
-      /* Never get here - LOG_LEVEL_FATAL causes program exit */
+      return NULL;
    }
 
    /*
@@ -816,10 +842,11 @@ struct configuration_spec * load_config(void)
    config->feature_flags            &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS;
    config->feature_flags            &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS;
 
-   if ((configfp = fopen(configfile, "r")) == NULL)
+   configfp = fopen(configfile, "r");
+   if (NULL == configfp)
    {
-      log_error(LOG_LEVEL_FATAL, "can't open configuration file '%s':  %E",
-              configfile);
+      log_error(LOG_LEVEL_FATAL,
+         "can't open configuration file '%s':  %E", configfile);
       /* Never get here - LOG_LEVEL_FATAL causes program exit */
    }
 
@@ -863,7 +890,7 @@ struct configuration_spec * load_config(void)
       }
 
       /* Make sure the command field is lower case */
-      for (p=cmd; *p; p++)
+      for (p = cmd; *p; p++)
       {
          if (ijb_isupper(*p))
          {
@@ -1637,10 +1664,16 @@ struct configuration_spec * load_config(void)
             break;
 
 /* *************************************************************************
- * log-font-name fontnane
+ * log-font-name fontname
  * *************************************************************************/
          case hash_log_font_name :
-            strcpy( g_szFontFaceName, arg );
+            if (strlcpy(g_szFontFaceName, arg,
+                   sizeof(g_szFontFaceName)) >= sizeof(g_szFontFaceName))
+            {
+               log_error(LOG_LEVEL_FATAL,
+                  "log-font-name argument '%s' is longer than %u characters.",
+                  arg, sizeof(g_szFontFaceName)-1);
+            }
             break;
 
 /* *************************************************************************
@@ -1734,7 +1767,7 @@ struct configuration_spec * load_config(void)
             log_error(LOG_LEVEL_ERROR, "Ignoring unrecognized directive '%s' (%luul) in line %lu "
                   "in configuration file (%s).",  buf, directive_hash, linenum, configfile);
             string_append(&config->proxy_args,
-               " <strong class='warning'>Warning: ignored unrecognized directive above.</strong><br>");
+               " <strong class='warning'>Warning: Ignoring unrecognized directive:</strong>");
             break;
 
 /* *************************************************************************/