altered channels file so that # is no longer considered a comment in

`version 1' files.

Author: drscholl

channel.c

@@ -17,10 +17,12 @@ void
 load_channels (void)
 {
     char path[_POSIX_PATH_MAX], *name, *slimit, *slevel, *topic, *ptr;
+    char realname[256];
     FILE *fp;
     int limit, level, line = 0;
     CHANNEL *chan;
     LIST *list;
+    int version = 0;
 
     snprintf (path, sizeof (path), "%s/channels", Config_Dir);
     fp = fopen (path, "r");
@@ -30,13 +32,23 @@ load_channels (void)
 	    logerr ("load_channels", path);
 	return;
     }
+    if(fgets(Buf,sizeof(Buf),fp)==NULL)
+    {
+	fclose(fp);
+	return;
+    }
+    if(!strncmp(":version 1", Buf, 10))
+	version = 1;
+    else
+	rewind(fp);
+
     while (fgets (Buf, sizeof (Buf), fp))
     {
 	line++;
 	ptr = Buf;
 	while (ISSPACE (*ptr))
 	    ptr++;
-	if (*ptr == '#' || *ptr == 0)
+	if (*ptr == 0 || (version == 0 && *ptr == '#'))
 	    continue;		/* blank or comment line */
 	name = next_arg (&ptr);
 	slimit = next_arg (&ptr);
@@ -47,6 +59,12 @@ load_channels (void)
 	    log ("load_channels(): %s:%d: too few parameters", path, line);
 	    continue;
 	}
+	/*force new channel name restrictions*/
+	if(*name!='#' && *name!='&')
+	{
+	    snprintf(realname,sizeof(realname),"#%s",name);
+	    name=realname;
+	}
 	if (invalid_channel (name))
 	{
 	    log ("load_channels(): %s:%d: %s: invalid channel name", name);
@@ -127,9 +145,7 @@ dump_channels (void)
 	logerr ("dump_channels", path);
 	return;
     }
-    fprintf (fp,
-	     "# auto generated by %s %s\r\n# Don't edit this file while %s is running or changes will be lost!\r\n",
-	     PACKAGE, VERSION, PACKAGE);
+    fputs(":version 1\n",fp);
     hash_foreach (Channels, (hash_callback_t) dump_channel_cb, fp);
     if (fclose (fp))
 	logerr ("dump_channels", "fclose");

sample.channels

@@ -1,22 +1,3 @@
-# $Id$
-#
-# sample channel configuration file
-#
-# This file contains a list of persistent channels that should be maintained
-# even when no users are present in them
-#
-# <channel> <limit> <level> "<topic>" [ nick ... ]
-#
-# <channel> is the channel name
-# <limit> is the maximum number of people allowed on the channel
-# <level> is the minimum user level required for a user to enter (leech,
-#	user, moderator, admin, elite)
-# <topic> is the initial topic for the channel (MUST BE QUOTED)
-#
-# optionally, there may be a list of nicknames separated by a space.  these
-# nicknames are the channel operators which will be given privilege to
-# execute commands relating to the channel (kick, ban, topic, limit, level)
-
-Help 200 Leech "Get your OpenNap questions answered here!"
-Admins 200 Moderator "OpenNap administration channel"
-Lobby 200 User "General chat channel"
+#Help 200 Leech "Get your OpenNap questions answered here!"
+#Admins 200 Moderator "OpenNap administration channel"
+#Lobby 200 User "General chat channel"