Re: [X2serv-cvs] CVS: x2/source parse.c,1.65,1.66
Brought to you by:
sirvulcan
Menu
▾
▴
Re: [X2serv-cvs] CVS: x2/source parse.c,1.65,1.66
|
From: Alex <ru...@bl...> - 2001-07-29 00:06:22
|
Probably misc.c is a good place for the table, but i'm not really picky.
-Rubin
On Sat, 28 Jul 2001, Richard Peters wrote:
> Update of /cvsroot/x2serv/x2/source
> In directory usw-pr-cvs1:/tmp/cvs-serv17214
>
> Modified Files:
> parse.c
> Log Message:
> Fixed a bug.
>
> ircu cleans up a channelname when you do a /join #channame. Some special
> chars have a lowercase variant, that lowercase is used. The cleaned-up
> channel name is passed on to other servers, like x2. When you do a /part
> #channame, then channame is not cleaned up before sending to other servers.
> X2 gets stuck with a channame that it doesn't recognize, and it wallops
> about it. The sollution: let x2 clean up the channame when it processes the
> /part
>
> The block that I pasted from ircu that solves this bug, is kinda large and I
> don't know if this is the right place to insert it into the source. You
> might want to take a look for a more appropriate place.
>
>
> Index: parse.c
> ===================================================================
> RCS file: /cvsroot/x2serv/x2/source/parse.c,v
> retrieving revision 1.65
> retrieving revision 1.66
> diff -C2 -r1.65 -r1.66
> *** parse.c 2001/06/28 10:06:13 1.65
> --- parse.c 2001/07/28 19:17:24 1.66
> ***************
> *** 489,492 ****
> --- 489,634 ----
> return(0);
> }
> +
> + /* Copied this from ircu. Since they were so nice to provide this
> + check only on /join, and not on /part, we were getting strange
> + wallops */
> + #define CHAR_MIN -128
> + const unsigned int NTL_char_attrib[] = {
> + #if (CHAR_MIN<0)
> + /* x80-x87 */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* x88-x8f */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* x90-x97 */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* x98-x9f */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* xa0-xa7 */ 0x0000, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* xa8-xaf */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* xb0-xb7 */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* xb8-xbf */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* xc0-xc7 */ 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00,
> + /* xc8-xcf */ 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00,
> + /* xd0-xd7 */ 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x0400,
> + /* xd8-xdf */ 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x0400,
> + /* xe0-xe7 */ 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400,
> + /* xe8-xef */ 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400,
> + /* xf0-xf7 */ 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x0400,
> + /* xf8-xff */ 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x0400
> + ,
> + #endif /* (CHAR_MIN<0) */
> + /* x00-x07 */ 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0004,
> + /* x08-x0f */ 0x0404, 0x0504, 0x10504, 0x0504, 0x0504, 0x10504, 0x0404, 0x0404,
> + /* x10-x17 */ 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404,
> + /* x18-x1f */ 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404,
> + /* ' '-x27 */ 0x0140, 0x04d0, 0x04d0, 0x04d0, 0x04d0, 0x04d0, 0x04d0, 0x24d0,
> + /* '('-'/' */ 0x04d0, 0x04d0, 0x04d0, 0x04d0, 0x00d0, 0x74d0, 0xe4d0, 0x04d0,
> + /* '0'-'7' */ 0xf459, 0xf459, 0xf459, 0xf459, 0xf459, 0xf459, 0xf459, 0xf459,
> + /* '8'-'?' */ 0xf459, 0xf459, 0x04d0, 0x04d0, 0x04d0, 0x04d0, 0x04d0, 0x04d0,
> + /* '@'-'G' */ 0x04d0, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653,
> + /* 'H'-'O' */ 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653,
> + /* 'P'-'W' */ 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653,
> + /* 'X'-'_' */ 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x7653, 0x74d0,
> + /* '`'-'g' */ 0x34d0, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473,
> + /* 'h'-'o' */ 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473,
> + /* 'p'-'w' */ 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473,
> + /* 'x'-x7f */ 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x7473, 0x0400
> + #if (!(CHAR_MIN<0))
> + ,
> + /* x80-x87 */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* x88-x8f */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* x90-x97 */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* x98-x9f */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* xa0-xa7 */ 0x0000, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* xa8-xaf */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* xb0-xb7 */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* xb8-xbf */ 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400, 0x0400,
> + /* xc0-xc7 */ 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00,
> + /* xc8-xcf */ 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00,
> + /* xd0-xd7 */ 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x0400,
> + /* xd8-xdf */ 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x2c00, 0x0400,
> + /* xe0-xe7 */ 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400,
> + /* xe8-xef */ 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400,
> + /* xf0-xf7 */ 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x0400,
> + /* xf8-xff */ 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x2400, 0x0400
> + #endif /* (!(CHAR_MIN<0)) */
> + };
> + const char NTL_tolower_tab[] = {
> + #if (CHAR_MIN<0)
> + /* x80-x87 */ '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
> + /* x88-x8f */ '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
> + /* x90-x97 */ '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
> + /* x98-x9f */ '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
> + /* xa0-xa7 */ '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
> + /* xa8-xaf */ '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
> + /* xb0-xb7 */ '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
> + /* xb8-xbf */ '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
> + /* xc0-xc7 */ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
> + /* xc8-xcf */ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
> + /* xd0-xd7 */ '\xd0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xd7',
> + /* xd8-xdf */ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xdf',
> + /* xe0-xe7 */ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
> + /* xe8-xef */ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
> + /* xf0-xf7 */ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
> + /* xf8-xff */ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff'
> + ,
> + #endif /* (CHAR_MIN<0) */
> + /* x00-x07 */ '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
> + /* x08-x0f */ '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
> + /* x10-x17 */ '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
> + /* x18-x1f */ '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
> + /* ' '-x27 */ ' ', '!', '"', '#', '$', '%', '&', '\x27',
> + /* '('-'/' */ '(', ')', '*', '+', ',', '-', '.', '/',
> + /* '0'-'7' */ '0', '1', '2', '3', '4', '5', '6', '7',
> + /* '8'-'?' */ '8', '9', ':', ';', '<', '=', '>', '?',
> + /* '@'-'G' */ '@', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
> + /* 'H'-'O' */ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
> + /* 'P'-'W' */ 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
> + /* 'X'-'_' */ 'x', 'y', 'z', '{', '|', '}', '~', '_',
> + /* '`'-'g' */ '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
> + /* 'h'-'o' */ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
> + /* 'p'-'w' */ 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
> + /* 'x'-x7f */ 'x', 'y', 'z', '{', '|', '}', '~', '\x7f'
> + #if (!(CHAR_MIN<0))
> + ,
> + /* x80-x87 */ '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
> + /* x88-x8f */ '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
> + /* x90-x97 */ '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
> + /* x98-x9f */ '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
> + /* xa0-xa7 */ '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
> + /* xa8-xaf */ '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
> + /* xb0-xb7 */ '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
> + /* xb8-xbf */ '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
> + /* xc0-xc7 */ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
> + /* xc8-xcf */ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
> + /* xd0-xd7 */ '\xd0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xd7',
> + /* xd8-xdf */ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xdf',
> + /* xe0-xe7 */ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
> + /* xe8-xef */ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
> + /* xf0-xf7 */ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
> + /* xf8-xff */ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff'
> + #endif /* (!(CHAR_MIN<0)) */
> + };
> + #define NTL_IRCCH 0x0400 /* Channel's names charset */
> + #define NTL_IRCCL 0x0800 /* Force toLower() in ch-name */
> + #define isIrcCh(c) (NTL_char_attrib[(c)-CHAR_MIN] & NTL_IRCCH)
> + #define isIrcCl(c) (NTL_char_attrib[(c)-CHAR_MIN] & NTL_IRCCL)
> + #define toLower(c) (NTL_tolower_tab[(c)-CHAR_MIN])
> +
> + static void clean_channelname(char *cn)
> + {
> + for (; *cn; cn++)
> + {
> + if (!isIrcCh(*cn))
> + {
> + *cn = '\0';
> + return;
> + }
> + if (isIrcCl(*cn))
> + {
> + *cn = toLower(*cn);
> + /* Missed the Icelandic letter ETH last time: */
> + if ((unsigned char)(*cn) == 0xd0)
> + *cn = (char)0xf0;
> + }
> + }
> + }
> +
> /* PART */
> int m_part(M_PARAMS)
> ***************
> *** 506,509 ****
> --- 648,652 ----
> if(channel[i] == ',')
> {
> + clean_channelname(&channel[i+1]);
> if((cptr = GetChannel(&channel[i+1])))
> {
> ***************
> *** 517,520 ****
> --- 660,664 ----
> }
> }
> + clean_channelname(channel);
> if((cptr = GetChannel(channel)))
> {
>
>
> _______________________________________________
> X2serv-cvs mailing list
> X2s...@li...
> http://lists.sourceforge.net/lists/listinfo/x2serv-cvs
>
|