Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2005-12-31 01:38:34 UTC
Modified files:
Tag: u2_10_12_branch
ircd/convert-conf.c RELEASE.NOTES ChangeLog
Log message:
Fix config conversion bugs (functional and documentation).
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.51 ircu2.10/ChangeLog:1.710.2.52
--- ircu2.10/ChangeLog:1.710.2.51 Fri Dec 30 05:28:42 2005
+++ ircu2.10/ChangeLog Fri Dec 30 17:38:24 2005
@@ -1,5 +1,14 @@
2005-12-30 Michael Poole <[EMAIL PROTECTED]>
+ * RELEASE.NOTES: Mention removal of HIS_STATS_h.
+
+ * ircd/convert-conf.c (removed_features): Add AUTOHIDE,
+ HIS_DESYNCS and TIMESEC.
+ (get_connect): Do not downcase connection name on insert.
+ (do_feature): Do not upcase feature name (cf HIS_STATS_k).
+
+2005-12-30 Michael Poole <[EMAIL PROTECTED]>
+
* ircd/engine_devpoll.c (engine_loop): Remove bogus assert.
2005-12-31 Perry Lorier <[EMAIL PROTECTED]>
Index: ircu2.10/RELEASE.NOTES
diff -u ircu2.10/RELEASE.NOTES:1.22 ircu2.10/RELEASE.NOTES:1.22.2.1
--- ircu2.10/RELEASE.NOTES:1.22 Mon Sep 12 09:11:58 2005
+++ ircu2.10/RELEASE.NOTES Fri Dec 30 17:38:24 2005
@@ -123,6 +123,8 @@
Deleted features since they are now controlled by other configuration
entries: VIRTUAL_HOST, oper and locop privilege features.
+Deleted feature since it no longer applies: HIS_STATS_h.
+
Compile Time Options:
A listing of supported compile-time options may be seen by running
Index: ircu2.10/ircd/convert-conf.c
diff -u ircu2.10/ircd/convert-conf.c:1.2.2.4
ircu2.10/ircd/convert-conf.c:1.2.2.5
--- ircu2.10/ircd/convert-conf.c:1.2.2.4 Fri Dec 30 05:28:41 2005
+++ ircu2.10/ircd/convert-conf.c Fri Dec 30 17:38:24 2005
@@ -17,7 +17,7 @@
* USA.
*/
-#include <ctype.h> /* tolower(), toupper(), isdigit() */
+#include <ctype.h> /* tolower() */
#include <stdio.h> /* *printf(), fgets() */
#include <stdlib.h> /* free(), strtol() */
#include <string.h> /* strlen(), memcpy(), strchr(), strspn() */
@@ -30,7 +30,7 @@
*general_names[] = { "name", "vhost", "description", "", "#numeric", 0 },
*motd_names[] = { "host", "file", 0 },
*class_names[] = { "name", "#pingfreq", "#connectfreq", "#maxlinks",
"#sendq", 0 },
- *removed_features[] = { "VIRTUAL_HOST", "OPERS_SEE_IN_SECRET_CHANNELS",
"LOCOP_SEE_IN_SECRET_CHANNELS", 0 };
+ *removed_features[] = { "VIRTUAL_HOST", "TIMESEC",
"OPERS_SEE_IN_SECRET_CHANNELS", "LOCOP_SEE_IN_SECRET_CHANNELS", "HIS_STATS_h",
"HIS_DESYNCS", "AUTOHIDE", 0 };
char orig_line[512], line[512], dbuf[512];
char *fields[MAX_FIELDS + 1];
unsigned int nfields;
@@ -159,7 +159,7 @@
nlen = strlen(name);
for (conn = connects; conn; conn = conn->next)
{
- for (ii = 0; tolower(name[ii]) == conn->name[ii] && ii < nlen; ++ii) ;
+ for (ii = 0; tolower(name[ii]) == tolower(conn->name[ii]) && ii <
nlen; ++ii) ;
if (conn->name[ii] == '\0' && name[ii] == '\0')
break;
}
@@ -169,7 +169,7 @@
{
conn = calloc(1, sizeof(*conn) + nlen);
for (ii = 0; ii < nlen; ++ii)
- conn->name[ii] = tolower(name[ii]);
+ conn->name[ii] = name[ii];
conn->next = connects;
connects = conn;
}
@@ -311,7 +311,7 @@
ii = strlen(fields[0]);
feat = calloc(1, sizeof(*feat) + ii);
while (ii-- > 0)
- feat->name[ii] = toupper(fields[0][ii]);
+ feat->name[ii] = fields[0][ii];
feat->next = features;
features = feat;
string_get(&feat->origins, orig_line);
@@ -610,9 +610,10 @@
fputs(line, stdout);
continue;
}
- /* Strip EOL character(s) and pass blank lines through. */
- while (len > 0 && (line[len-1] == '\n' || line[len-1] == '\r'))
+ /* Strip trailing whitespace. */
+ while (len > 0 && isspace(line[len-1]))
line[--len] = '\0';
+ /* Pass blank lines through. */
if (len == 0) {
fputc('\n', stdout);
continue;
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
