X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loadcfg.c;h=9881465941617b7307e1468e2fa4f719ceee0f76;hb=7905a9aa23e25b7677a6577fdafd25ad6cb046cb;hp=fa50a8621aa36ae25c5d45c81a389b40f06ce0a8;hpb=7b3843dfa3f352469c3d3ba169adf7312c921c1d;p=privoxy.git

diff --git a/loadcfg.c b/loadcfg.c
index fa50a862..98814659 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.33 2002/03/05 04:52:42 oes Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.35 2002/03/07 03:52:44 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -35,6 +35,12 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.33 2002/03/05 04:52:42 oes Exp $"
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
+ *    Revision 1.35  2002/03/07 03:52:44  oes
+ *    Set logging to tty for --no-daemon mode
+ *
+ *    Revision 1.34  2002/03/06 23:14:35  jongfoster
+ *    Trivial cosmetic changes to make function comments easier to find.
+ *
  *    Revision 1.33  2002/03/05 04:52:42  oes
  *    Deleted non-errlog debugging code
  *
@@ -771,7 +777,7 @@ struct configuration_spec * load_config(void)
             {
                cur_fwd->forward_host = strdup(p);
 
-               if ((p = strchr(cur_fwd->forward_host, ':')))
+               if (NULL != (p = strchr(cur_fwd->forward_host, ':')))
                {
                   *p++ = '\0';
                   cur_fwd->forward_port = atoi(p);
@@ -834,7 +840,7 @@ struct configuration_spec * load_config(void)
             {
                cur_fwd->gateway_host = strdup(p);
 
-               if ((p = strchr(cur_fwd->gateway_host, ':')))
+               if (NULL != (p = strchr(cur_fwd->gateway_host, ':')))
                {
                   *p++ = '\0';
                   cur_fwd->gateway_port = atoi(p);
@@ -852,7 +858,7 @@ struct configuration_spec * load_config(void)
             {
                cur_fwd->forward_host = strdup(p);
 
-               if ((p = strchr(cur_fwd->forward_host, ':')))
+               if (NULL != (p = strchr(cur_fwd->forward_host, ':')))
                {
                   *p++ = '\0';
                   cur_fwd->forward_port = atoi(p);
@@ -913,7 +919,7 @@ struct configuration_spec * load_config(void)
 
             cur_fwd->gateway_host = strdup(p);
 
-            if ((p = strchr(cur_fwd->gateway_host, ':')))
+            if (NULL != (p = strchr(cur_fwd->gateway_host, ':')))
             {
                *p++ = '\0';
                cur_fwd->gateway_port = atoi(p);
@@ -930,7 +936,7 @@ struct configuration_spec * load_config(void)
             {
                cur_fwd->forward_host = strdup(p);
 
-               if ((p = strchr(cur_fwd->forward_host, ':')))
+               if (NULL != (p = strchr(cur_fwd->forward_host, ':')))
                {
                   *p++ = '\0';
                   cur_fwd->forward_port = atoi(p);
@@ -981,7 +987,7 @@ struct configuration_spec * load_config(void)
  * *************************************************************************/
          case hash_logfile :
             freez(config->logfile);
-            config->logfile = make_path(config->logdir, arg);
+            config->logfile = no_daemon ? NULL : make_path(config->logdir, arg);
             continue;
 
 /* *************************************************************************
@@ -1307,7 +1313,7 @@ struct configuration_spec * load_config(void)
 
    if ( NULL != config->haddr )
    {
-      if ((p = strchr(config->haddr, ':')))
+      if (NULL != (p = strchr(config->haddr, ':')))
       {
          *p++ = '\0';
          if (*p)