irc-dev-ipv6

[Zolty <zo...@us...>]

Update of /cvsroot/irc-dev/ipv6/ircd
In directory usw-pr-cvs1:/tmp/cvs-serv13639/ircd

Modified Files:
	chkconf.c s_conf.c 
Log Message:
INET6.4

Index: chkconf.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/chkconf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- chkconf.c	12 Sep 2002 16:38:57 -0000	1.2
+++ chkconf.c	14 Sep 2002 14:42:05 -0000	1.3
@@ -215,7 +215,7 @@
 	*line == ' ' || *line == '\t')
       continue;
 
-    if (line[1] != ':')
+    if (line[1] != IRCDCONF_DELIMITER)
     {
       fprintf(stderr, "ERROR: Bad config line (%s)\n", line);
       continue;
@@ -543,7 +543,7 @@
     return (NULL);
 
   field = line;
-  if ((end = strchr(line, ':')) == NULL)
+  if ((end = strchr(line, IRCDCONF_DELIMITER)) == NULL)
   {
     line = NULL;
     if ((end = strchr(field, '\n')) == NULL)

Index: s_conf.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_conf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- s_conf.c	12 Sep 2002 19:02:15 -0000	1.3
+++ s_conf.c	14 Sep 2002 14:42:05 -0000	1.4
@@ -103,12 +103,12 @@
 
   end = field = gfline;
 
-  if (fs != ':')
+  if (fs != IRCDCONF_DELIMITER)
   {
     if (*end == fs)
       ++end;
     else
-      fs = ':';
+      fs = IRCDCONF_DELIMITER;
   }
   do
   {
@@ -122,7 +122,8 @@
       ++end;
     }
   }
-  while (end && fs != ':' && *++end != ':' && *end != '\n');
+  while (end && fs != IRCDCONF_DELIMITER && *++end != IRCDCONF_DELIMITER
+      && *end != '\n');
 
   if (end == NULL)
   {
@@ -869,7 +870,7 @@
 	line[0] == ' ' || line[0] == '\t')
       continue;
     /* Could we test if it's conf line at all?      -Vesa */
-    if (line[1] != ':')
+    if (line[1] != IRCDCONF_DELIMITER)
     {
       Debug((DEBUG_ERROR, "Bad config line: %s", line));
       continue;
@@ -878,7 +879,7 @@
       free_conf(aconf);
     aconf = make_conf();
 
-    tmp = getfield(line, ':');
+    tmp = getfield(line, IRCDCONF_DELIMITER);
     if (!tmp)
       continue;
     switch (*tmp)
@@ -980,20 +981,20 @@
 
     for (;;)			/* Fake loop, that I can use break here --msa */
     {
-      if ((tmp = getfield(NULL, ':')) == NULL)
+      if ((tmp = getfield(NULL, IRCDCONF_DELIMITER)) == NULL)
 	break;
       DupString(aconf->host, tmp);
       if ((tmp = getfield(NULL, (aconf->status == CONF_KILL
-	  || aconf->status == CONF_IPKILL) ? '"' : ':')) == NULL)
+	  || aconf->status == CONF_IPKILL) ? '"' : IRCDCONF_DELIMITER)) == NULL)
 	break;
       DupString(aconf->passwd, tmp);
-      if ((tmp = getfield(NULL, ':')) == NULL)
+      if ((tmp = getfield(NULL, IRCDCONF_DELIMITER)) == NULL)
 	break;
       DupString(aconf->name, tmp);
-      if ((tmp = getfield(NULL, ':')) == NULL)
+      if ((tmp = getfield(NULL, IRCDCONF_DELIMITER)) == NULL)
 	break;
       aconf->port = atoi(tmp);
-      tmp = getfield(NULL, ':');
+      tmp = getfield(NULL, IRCDCONF_DELIMITER);
       if (aconf->status & CONF_ME)
       {
 	server_port = aconf->port;