浏览代码

* Changed set of "other" chars for random strings

svn: 2097
Bryan Drewery 21 年之前
父节点
当前提交
474b367e2b
共有 2 个文件被更改,包括 4 次插入6 次删除
  1. 3 2
      src/eggdrop.h
  2. 1 4
      src/misc.c

+ 3 - 2
src/eggdrop.h

@@ -54,8 +54,9 @@
 #define NOTENAMELEN     ((HANDLEN << 1) + 1)
 #define BADPASSCHARS    "-+"
 #define LISTSEPERATORS  ",=:; "
-#define BADREPEATEDRAND "*?"
-
+#define BADREPEATEDRAND "*"
+#define RANDSPECIAL     "#*+,-./;<=>?[]^_{}|"
+#define RANDSPECIALLEN  19
 
 #if (NICKMAX < 9) || (NICKMAX > 32)
 #  include "invalid NICKMAX value"

+ 1 - 4
src/misc.c

@@ -433,10 +433,7 @@ void make_rand_str(char *s, size_t len)
     else if (r == 2)
       s[j] = 'A' + randint(26);
     else if (r == 3)
-      s[j] = '!' + randint(15);
-
-    if (s[j] == 33 || s[j] == 37 || s[j] == 34 || s[j] == 40 || s[j] == 41 || s[j] == 38 || s[j] == 36) /* no % ( ) & */
-      s[j] = 'a' + randint(26);
+      s[j] = RANDSPECIAL[randint(RANDSPECIALLEN)];
 
     if (j && strchr(BADREPEATEDRAND, s[j]) && s[j] == s[j - 1]) {
       while (s[j] == s[j - 1])