diff -bur psybnc/lang/english.lng psybnc-2.3.2-5+netprefix/lang/english.lng --- psybnc/lang/english.lng 2005-02-14 20:11:27.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/lang/english.lng 2005-03-26 22:06:04.903797376 +0100 @@ -110,7 +110,7 @@ ; p_client.c line 485: msg0051=:irc.psychoid.net KICK %s %s :Switching Network ; p_client.c line 494: -msg0052=:irc.psychoid.net KICK #%s~%s %s :Switching Network +msg0052=:irc.psychoid.net KICK #%s'%s %s :Switching Network ; p_client.c line 526: msg0053=:%s!%s@%s NICK :%s ; p_client.c line 544: @@ -772,7 +772,7 @@ ; p_inifunc.c line 325: msg0382=USER%d. ; p_intnet.c line 132: -msg0383=:-psyBNC!psyBNC@lam3rz.de PRIVMSG %s :The internal network (int~) could not be joined, because your nick is already in use by %s!%s@%s. Change your nick, then retry to join. +msg0383=:-psyBNC!psyBNC@lam3rz.de PRIVMSG %s :The internal network (int') could not be joined, because your nick is already in use by %s!%s@%s. Change your nick, then retry to join. ; p_intnet.c line 137: msg0384=:intnet!intnet@%s INTNET *@* :USER %s %s %s :%s ; p_intnet.c line 295: @@ -1154,7 +1154,7 @@ ; p_log.c line 134: msg0573=log/USER%d.LOG ; p_log.c line 139: -msg0574=%s~%s :(%s) %s˙ +msg0574=%s'%s :(%s) %s˙ ; p_log.c line 156: msg0575=log/USER%d.LOG ; p_log.c line 158: @@ -1280,7 +1280,7 @@ ; p_memory.c line 513: msg0636=Killed - stopping application. ; p_network.c line 86: -msg0637=:int~%s!%s +msg0637=:int'%s!%s ; p_network.c line 88: msg0638=:%s!%s ; p_network.c line 110: @@ -1294,11 +1294,11 @@ ; p_network.c line 184: msg0643=%s - Unknown Network˙ ; p_network.c line 261: -msg0644=%s%c#%s~%s +msg0644=%s%c#%s'%s ; p_network.c line 282: -msg0645=%s:%s~%s +msg0645=%s:%s'%s ; p_network.c line 292: -msg0646=%c%s~%s +msg0646=%c%s'%s ; p_network.c line 333: msg0647=%s%c%s%c ; p_network.c line 335: @@ -1306,33 +1306,33 @@ ; p_network.c line 338: msg0649=%s%s%c ; p_network.c line 342: -msg0650=%s%c%s~%s%c +msg0650=%s%c%s'%s%c ; p_network.c line 344: -msg0651=%s%s~%s%c +msg0651=%s%s'%s%c ; p_network.c line 377: -msg0652=%s %s~%s +msg0652=%s %s'%s ; p_network.c line 423: msg0653=%s :%s ; p_network.c line 443: msg0654=%s %s %s ; p_network.c line 445: -msg0655=%s %s~%s %s +msg0655=%s %s'%s %s ; p_network.c line 485: msg0656=0123456789 ; p_network.c line 490: msg0657=%s%s%c ; p_network.c line 492: -msg0658=%s%s~%s%c +msg0658=%s%s'%s%c ; p_network.c line 495: msg0659=%s%s%c ; p_network.c line 504: msg0660=INVITE ; p_network.c line 511: -msg0661=%s :#%s~%s +msg0661=%s :#%s'%s ; p_network.c line 535: msg0662=%s %s %s ; p_network.c line 537: -msg0663=%s %s~%s %s +msg0663=%s %s'%s %s ; p_peer.c line 132: msg0664=LINK %d: First time linked on SSL. Stored Certificate ; p_peer.c line 137: @@ -1784,7 +1784,7 @@ ; p_uchannel.c line 476: msg0888=CHANNELS ; p_uchannel.c line 601: -msg0889=#int~ +msg0889=#int' ; p_uchannel.c line 606: msg0890=:%s 353 %s = %s%s : ; p_uchannel.c line 635: diff -bur psybnc/lang/german.lng psybnc-2.3.2-5+netprefix/lang/german.lng --- psybnc/lang/german.lng 2005-02-14 20:11:27.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/lang/german.lng 2005-03-26 22:05:05.668802464 +0100 @@ -115,7 +115,7 @@ ; p_client.c line 485: msg0051=:irc.psychoid.net KICK %s %s :Netzwerkwechsel ; p_client.c line 494: -msg0052=:irc.psychoid.net KICK #%s~%s %s :Netzwerkwechsel +msg0052=:irc.psychoid.net KICK #%s'%s %s :Netzwerkwechsel ; p_client.c line 526: msg0053=:%s!%s@%s NICK :%s ; p_client.c line 544: @@ -777,7 +777,7 @@ ; p_inifunc.c line 325: msg0382=USER%d. ; p_intnet.c line 132: -msg0383=:-psyBNC!psyBNC@lam3rz.de PRIVMSG %s :Das interne Netzwek (int~) konnte nicht betreten werden, da Dein Nick bereits in Verwendung ist durch %s!%s@%s. Aendere deinen Nick, dann versuchs nochmal. +msg0383=:-psyBNC!psyBNC@lam3rz.de PRIVMSG %s :Das interne Netzwek (int') konnte nicht betreten werden, da Dein Nick bereits in Verwendung ist durch %s!%s@%s. Aendere deinen Nick, dann versuchs nochmal. ; p_intnet.c line 137: msg0384=:intnet!intnet@%s INTNET *@* :USER %s %s %s :%s ; p_intnet.c line 295: @@ -1159,7 +1159,7 @@ ; p_log.c line 134: msg0573=log/USER%d.LOG ; p_log.c line 139: -msg0574=%s~%s :(%s) %s˙ +msg0574=%s'%s :(%s) %s˙ ; p_log.c line 156: msg0575=log/USER%d.LOG ; p_log.c line 158: @@ -1285,7 +1285,7 @@ ; p_memory.c line 513: msg0636=Gekillt - Stoppe AppliKation. ; p_network.c line 86: -msg0637=:int~%s!%s +msg0637=:int'%s!%s ; p_network.c line 88: msg0638=:%s!%s ; p_network.c line 110: @@ -1299,11 +1299,11 @@ ; p_network.c line 184: msg0643=%s - Unbekanntes Netzwerk˙ ; p_network.c line 261: -msg0644=%s%c#%s~%s +msg0644=%s%c#%s'%s ; p_network.c line 282: -msg0645=%s:%s~%s +msg0645=%s:%s'%s ; p_network.c line 292: -msg0646=%c%s~%s +msg0646=%c%s'%s ; p_network.c line 333: msg0647=%s%c%s%c ; p_network.c line 335: @@ -1311,33 +1311,33 @@ ; p_network.c line 338: msg0649=%s%s%c ; p_network.c line 342: -msg0650=%s%c%s~%s%c +msg0650=%s%c%s'%s%c ; p_network.c line 344: -msg0651=%s%s~%s%c +msg0651=%s%s'%s%c ; p_network.c line 377: -msg0652=%s %s~%s +msg0652=%s %s'%s ; p_network.c line 423: msg0653=%s :%s ; p_network.c line 443: msg0654=%s %s %s ; p_network.c line 445: -msg0655=%s %s~%s %s +msg0655=%s %s'%s %s ; p_network.c line 485: msg0656=0123456789 ; p_network.c line 490: msg0657=%s%s%c ; p_network.c line 492: -msg0658=%s%s~%s%c +msg0658=%s%s'%s%c ; p_network.c line 495: msg0659=%s%s%c ; p_network.c line 504: msg0660=INVITE ; p_network.c line 511: -msg0661=%s :#%s~%s +msg0661=%s :#%s'%s ; p_network.c line 535: msg0662=%s %s %s ; p_network.c line 537: -msg0663=%s %s~%s %s +msg0663=%s %s'%s %s ; p_peer.c line 132: msg0664=LINK %d: Erstmals ueber SSL verlinkt. Speichere Zertifikat ; p_peer.c line 137: @@ -1789,7 +1789,7 @@ ; p_uchannel.c line 476: msg0888=CHANNELS ; p_uchannel.c line 601: -msg0889=#int~ +msg0889=#int' ; p_uchannel.c line 606: msg0890=:%s 353 %s = %s%s : ; p_uchannel.c line 635: diff -bur psybnc/lang/italiano.lng psybnc-2.3.2-5+netprefix/lang/italiano.lng --- psybnc/lang/italiano.lng 2005-02-14 20:11:27.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/lang/italiano.lng 2005-03-26 22:27:53.426871632 +0100 @@ -110,7 +110,7 @@ ; p_client.c line 485: msg0051=:irc.psychoid.net KICK %s %s :Cambio di Network ; p_client.c line 494: -msg0052=:irc.psychoid.net KICK #%s~%s %s :Cambio di Network +msg0052=:irc.psychoid.net KICK #%s'%s %s :Cambio di Network ; p_client.c line 526: msg0053=:%s!%s@%s NICK :%s ; p_client.c line 544: @@ -772,7 +772,7 @@ ; p_inifunc.c line 325: msg0382=USER%d. ; p_intnet.c line 132: -msg0383=:-psyBNC!psyBNC@lam3rz.de PRIVMSG %s :Il Network interno (int~) non puo' essere joinato, perche' il tuo nick e' gia' in uso da %s!%s@%s. Cambia il tuo nick quindi riprova ad entrare. +msg0383=:-psyBNC!psyBNC@lam3rz.de PRIVMSG %s :Il Network interno (int') non puo' essere joinato, perche' il tuo nick e' gia' in uso da %s!%s@%s. Cambia il tuo nick quindi riprova ad entrare. ; p_intnet.c line 137: msg0384=:intnet!intnet@%s INTNET *@* :USER %s %s %s :%s ; p_intnet.c line 295: @@ -1154,7 +1154,7 @@ ; p_log.c line 134: msg0573=log/USER%d.LOG ; p_log.c line 139: -msg0574=%s~%s :(%s) %s˙ +msg0574=%s'%s :(%s) %s˙ ; p_log.c line 156: msg0575=log/USER%d.LOG ; p_log.c line 158: @@ -1280,7 +1280,7 @@ ; p_memory.c line 513: msg0636=Killato - chiusura applicazione. ; p_network.c line 86: -msg0637=:int~%s!%s +msg0637=:int'%s!%s ; p_network.c line 88: msg0638=:%s!%s ; p_network.c line 110: @@ -1294,11 +1294,11 @@ ; p_network.c line 184: msg0643=%s - Network sconosciuto˙ ; p_network.c line 261: -msg0644=%s%c#%s~%s +msg0644=%s%c#%s'%s ; p_network.c line 282: -msg0645=%s:%s~%s +msg0645=%s:%s'%s ; p_network.c line 292: -msg0646=%c%s~%s +msg0646=%c%s'%s ; p_network.c line 333: msg0647=%s%c%s%c ; p_network.c line 335: @@ -1306,33 +1306,33 @@ ; p_network.c line 338: msg0649=%s%s%c ; p_network.c line 342: -msg0650=%s%c%s~%s%c +msg0650=%s%c%s'%s%c ; p_network.c line 344: -msg0651=%s%s~%s%c +msg0651=%s%s'%s%c ; p_network.c line 377: -msg0652=%s %s~%s +msg0652=%s %s'%s ; p_network.c line 423: msg0653=%s :%s ; p_network.c line 443: msg0654=%s %s %s ; p_network.c line 445: -msg0655=%s %s~%s %s +msg0655=%s %s'%s %s ; p_network.c line 485: msg0656=0123456789 ; p_network.c line 490: msg0657=%s%s%c ; p_network.c line 492: -msg0658=%s%s~%s%c +msg0658=%s%s'%s%c ; p_network.c line 495: msg0659=%s%s%c ; p_network.c line 504: msg0660=INVITE ; p_network.c line 511: -msg0661=%s :#%s~%s +msg0661=%s :#%s'%s ; p_network.c line 535: msg0662=%s %s %s ; p_network.c line 537: -msg0663=%s %s~%s %s +msg0663=%s %s'%s %s ; p_peer.c line 132: msg0664=LINK %d: Prima connessione attraverso SSL. Certificato salvato ; p_peer.c line 137: @@ -1784,7 +1784,7 @@ ; p_uchannel.c line 476: msg0888=CHANNELS ; p_uchannel.c line 601: -msg0889=#int~ +msg0889=#int' ; p_uchannel.c line 606: msg0890=:%s 353 %s = %s%s : ; p_uchannel.c line 635: Only in psybnc-2.3.2-5+netprefix/: psybnc diff -bur psybnc/src/p_client.c psybnc-2.3.2-5+netprefix/src/p_client.c --- psybnc/src/p_client.c 2005-02-14 20:11:28.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/src/p_client.c 2005-03-26 20:56:46.573959600 +0100 @@ -2537,9 +2537,9 @@ if(user(usern)->parent!=0) { if(strchr(user(usern)->chantypes,*ircto)!=NULL) - ssnprintf(user(usern)->insock,":%s!%s@%s %s #%s~%s :%s",user(usern)->nick,user(usern)->login,user(usern)->host,irccommand,user(usern)->network,ircto,irccontent); + ssnprintf(user(usern)->insock,":%s!%s@%s %s #%s'%s :%s",user(usern)->nick,user(usern)->login,user(usern)->host,irccommand,user(usern)->network,ircto,irccontent); else - ssnprintf(user(usern)->insock,":%s~%s!%s@%s %s %s :<- <%s> %s",user(usern)->network,ircto,user(usern)->login,user(usern)->host,irccommand,user(usern)->nick,user(usern)->nick,irccontent); + ssnprintf(user(usern)->insock,":%s'%s!%s@%s %s %s :<- <%s> %s",user(usern)->network,ircto,user(usern)->login,user(usern)->host,irccommand,user(usern)->nick,user(usern)->nick,irccontent); } else { if(strchr(user(usern)->chantypes,*ircto)!=NULL) ssnprintf(user(usern)->insock,":%s!%s@%s %s %s :%s",user(usern)->nick,user(usern)->login,user(usern)->host,irccommand,ircto,irccontent); diff -bur psybnc/src/p_dcc.c psybnc-2.3.2-5+netprefix/src/p_dcc.c --- psybnc/src/p_dcc.c 2005-02-14 20:11:28.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/src/p_dcc.c 2005-03-26 20:56:46.574959448 +0100 @@ -285,7 +285,7 @@ netc[0]=0; pcontext; if (user(usern)->parent!=0) - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); else memset(netc,0x0,sizeof(netc)); lkm=user(usern)->dcc; @@ -427,7 +427,7 @@ if(user(usern)->instate!=STD_CONN) return 0x0; #endif if (user(usern)->parent!=0) - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); else memset(netc,0x0,sizeof(netc)); if (th->outstate==0) { @@ -651,7 +651,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,currentsocket); if(pdcc==NULL) return 0x0; @@ -693,7 +693,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,currentsocket); if(pdcc==NULL) return 0x0; @@ -716,7 +716,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,currentsocket); if(pdcc!=NULL) @@ -766,7 +766,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,mastersocket); if(pdcc==NULL) return 0x0; @@ -795,7 +795,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,currentsocket); if(pdcc==NULL) return 0x0; @@ -814,7 +814,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,currentsocket); if(pdcc==NULL) return 0x0; @@ -837,7 +837,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } addrp=(unsigned long *)pt; ackdcc=ntohl(*addrp); @@ -874,7 +874,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,mastersocket); if(pdcc==NULL) return 0x0; @@ -918,7 +918,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,currentsocket); if(pdcc==NULL) return 0x0; @@ -950,7 +950,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,currentsocket); if(pdcc==NULL) return 0x0; @@ -974,7 +974,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,currentsocket); if(pdcc==NULL) return 0x0; @@ -1011,7 +1011,7 @@ netc[0]=0; if(user(usern)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } pdcc=getpsocketpdcc(usern,currentsocket); if(pdcc==NULL) return 0x0; @@ -1075,7 +1075,7 @@ if(user(usern)->parent!=0) { userp=user(usern)->parent; - ap_snprintf(netc,sizeof(netc),"%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(usern)->network); } switch(type) { diff -bur psybnc/src/p_intnet.c psybnc-2.3.2-5+netprefix/src/p_intnet.c --- psybnc/src/p_intnet.c 2005-02-14 20:11:28.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/src/p_intnet.c 2005-03-26 20:56:46.576959144 +0100 @@ -772,11 +772,11 @@ { if(getchannelnick(chan,client->nick)!=NULL) { - ssnprintf(user(usern)->insock,":%s!%s@%s JOIN :#int~%s",client->nick,client->ident,client->host,chan->name); + ssnprintf(user(usern)->insock,":%s!%s@%s JOIN :#int'%s",client->nick,client->ident,client->host,chan->name); sendnames(usern+10000,chan); if(chan->topic[0]!=0) { - ssnprintf(user(usern)->insock,":%s 332 %s #int~%s :%s",me,client->nick,chan->name,chan->topic); + ssnprintf(user(usern)->insock,":%s 332 %s #int'%s :%s",me,client->nick,chan->name,chan->topic); } if(chan->modes[0]!=0) { @@ -1684,7 +1684,7 @@ if(client==client2) ssnprintf(user(usern)->insock,":%s-psybnc.net 302 %s :%s=+%s!%s",me,user(usern)->nick,client->nick,client->ident,client->host); else - ssnprintf(user(usern)->insock,":%s-psybnc.net 302 %s :int~%s=+%s!%s",me,user(usern)->nick,client->nick,client->ident,client->host); + ssnprintf(user(usern)->insock,":%s-psybnc.net 302 %s :int'%s=+%s!%s",me,user(usern)->nick,client->nick,client->ident,client->host); } } @@ -1711,7 +1711,7 @@ if(client==client2) ssnprintf(user(usern)->insock,":%s-psybnc.net 303 %s :%s",me,user(usern)->nick,client->nick); else - ssnprintf(user(usern)->insock,":%s-psybnc.net 303 %s :int~%s",me,user(usern)->nick,client->nick); + ssnprintf(user(usern)->insock,":%s-psybnc.net 303 %s :int'%s",me,user(usern)->nick,client->nick); } } diff -bur psybnc/src/p_log.c psybnc-2.3.2-5+netprefix/src/p_log.c --- psybnc/src/p_log.c 2005-02-14 20:11:28.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/src/p_log.c 2005-03-26 20:56:46.576959144 +0100 @@ -140,7 +140,7 @@ ssnprintf(user(usern)->insock,lngtxt(576),user(usern)->nick); while(fgets(buf,sizeof(buf),log)) { pt=buf; - if(*pt=='~') pt++; /* stripping none-network msgs */ + if(*pt=='\'') pt++; /* stripping none-network msgs */ ssnprintf(user(usern)->insock,lngtxt(577),user(userp)->nick,pt); } ssnprintf(user(usern)->insock,lngtxt(578),user(userp)->nick); diff -bur psybnc/src/p_network.c psybnc-2.3.2-5+netprefix/src/p_network.c --- psybnc/src/p_network.c 2005-02-14 20:11:28.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/src/p_network.c 2005-03-26 20:56:46.577958992 +0100 @@ -127,14 +127,14 @@ th=usernode; strmncpy(tmpircbuf,ircbuf,sizeof(tmpircbuf)); pt3=strstr(tmpircbuf,"NICK "); - pt=strchr(tmpircbuf,'~'); + pt=strchr(tmpircbuf,'\''); if (pt!=NULL) { pt1=pt; pt1--; if (*pt1=='*' || *pt1=='!') { /* if its a userflag, try next item */ pt1=pt;pt1++; - pt=strchr(pt1,'~'); + pt=strchr(pt1,'\''); if (pt==NULL) return usern; } pt1=tmpircbuf+1; @@ -213,7 +213,7 @@ { pcontext; if(strmncasecmp(user(usern)->nick,ircto)==0 && strmncasecmp(myparentnick,ircto)==0) - ap_snprintf(ircbuf,sizeof(ircbuf),":%s NICK :%s~%s",netircfrom,netname,ircto); + ap_snprintf(ircbuf,sizeof(ircbuf),":%s NICK :%s'%s",netircfrom,netname,ircto); else ircbuf[0]=0; return 0x0; @@ -222,21 +222,21 @@ int netjoin(int usern, char *netname, char *myparentnick) { pcontext; - ap_snprintf(ircbuf,sizeof(ircbuf),":%s JOIN :#%s~%s",netircfrom,netname,ircto); + ap_snprintf(ircbuf,sizeof(ircbuf),":%s JOIN :#%s'%s",netircfrom,netname,ircto); return 0x0; } int netpart(int usern, char *netname, char *myparentnick) { pcontext; - ap_snprintf(ircbuf,sizeof(ircbuf),":%s PART #%s~%s :%s",netircfrom,netname,ircto,irccontent); + ap_snprintf(ircbuf,sizeof(ircbuf),":%s PART #%s'%s :%s",netircfrom,netname,ircto,irccontent); return 0x0; } int nettopic(int usern, char *netname, char *myparentnick) { pcontext; - ap_snprintf(ircbuf,sizeof(ircbuf),":%s TOPIC #%s~%s :%s",netircfrom,netname,ircto,irccontent); + ap_snprintf(ircbuf,sizeof(ircbuf),":%s TOPIC #%s'%s :%s",netircfrom,netname,ircto,irccontent); return 0x0; } @@ -252,7 +252,7 @@ { pcontext; if(strchr("#!+&",ircto[0])!=NULL) - ap_snprintf(ircbuf,sizeof(ircbuf),":%s %s #%s~%s :%s",netircfrom,irccommand,netname,ircto,irccontent); + ap_snprintf(ircbuf,sizeof(ircbuf),":%s %s #%s'%s :%s",netircfrom,irccommand,netname,ircto,irccontent); /* hand the ircbuf unchanged, if we query ourself */ return 0x0; } @@ -277,9 +277,9 @@ { *eo=0; if(strmncasecmp(user(usern)->nick,knick)==0) - ap_snprintf(tmpircbuf,sizeof(tmpircbuf),":%s KICK #%s~%s %s~%s :%s",netircfrom,netname,kchan,netname,knick,irccontent); + ap_snprintf(tmpircbuf,sizeof(tmpircbuf),":%s KICK #%s'%s %s'%s :%s",netircfrom,netname,kchan,netname,knick,irccontent); else - ap_snprintf(tmpircbuf,sizeof(tmpircbuf),":%s KICK #%s~%s %s :%s",netircfrom,netname,kchan,knick,irccontent); + ap_snprintf(tmpircbuf,sizeof(tmpircbuf),":%s KICK #%s'%s %s :%s",netircfrom,netname,kchan,knick,irccontent); strmncpy(ircbuf,tmpircbuf,sizeof(ircbuf)); } } @@ -316,7 +316,7 @@ *pt1=0; pt1++; /* the channel */ - ap_snprintf(tmpircbuf,sizeof(tmpircbuf),"%s #%s~%s",ircbuf,netname,pt1); + ap_snprintf(tmpircbuf,sizeof(tmpircbuf),"%s #%s'%s",ircbuf,netname,pt1); strmncpy(ircbuf,tmpircbuf,sizeof(ircbuf)); } pt=ircbuf; @@ -423,7 +423,7 @@ } strcat(tmpircbuf2,"#"); strcat(tmpircbuf2,netname); - strcat(tmpircbuf2,"~"); + strcat(tmpircbuf2,"'"); strcat(tmpircbuf2,pt); strcat(tmpircbuf2," "); } @@ -491,7 +491,7 @@ { ap_snprintf(ircbuf,sizeof(ircbuf),":%s %s %s :%s",netircfrom,irccommand,myparentnick,irccontent); } else { - ap_snprintf(ircbuf,sizeof(ircbuf),":%s %s %s :%s~%s",netircfrom,irccommand,myparentnick,netname,irccontent); + ap_snprintf(ircbuf,sizeof(ircbuf),":%s %s %s :%s'%s",netircfrom,irccommand,myparentnick,netname,irccontent); } } } @@ -531,7 +531,7 @@ pt+=nlen; pt++; if(strchr(chantypes,*pt)!=NULL) /* channel */ - ap_snprintf(tmpircbuf,sizeof(tmpircbuf),"%s %s #%s~%s",ircbuf,myparentnick,netname,pt); + ap_snprintf(tmpircbuf,sizeof(tmpircbuf),"%s %s #%s'%s",ircbuf,myparentnick,netname,pt); else /* nick */ { if(*pt==':') @@ -544,7 +544,7 @@ pt+=strlen(checkcmd); ap_snprintf(tmpircbuf,sizeof(tmpircbuf),"%s %s %s %s",ircbuf,myparentnick,myparentnick,pt); } else - ap_snprintf(tmpircbuf,sizeof(tmpircbuf),"%s %s %s~%s",ircbuf,myparentnick,netname,pt); + ap_snprintf(tmpircbuf,sizeof(tmpircbuf),"%s %s %s'%s",ircbuf,myparentnick,netname,pt); } } strmncpy(ircbuf,tmpircbuf,sizeof(ircbuf)); @@ -598,7 +598,7 @@ *inmodes=0; inmodes++; pmode=inmodes; - ap_snprintf(dest,sizeof(dest),"#%s~%s",netname,pt); + ap_snprintf(dest,sizeof(dest),"#%s'%s",netname,pt); inparams=strchr(inmodes,' '); if(inparams) { @@ -663,7 +663,7 @@ if(strmncasecmp(inparams,user(usern)->nick)==0 && strmncasecmp(inparams,myparentnick)==0) { strcat(params,netname); - strcat(params,"~"); + strcat(params,"'"); strcat(params,inparams); strcat(params," "); } else { @@ -774,7 +774,7 @@ else strmncpy(netircfrom,ircfrom,sizeof(netircfrom)); } else { - ap_snprintf(netircfrom,sizeof(netircfrom),"%s~%s",netname,ircfrom); + ap_snprintf(netircfrom,sizeof(netircfrom),"%s'%s",netname,ircfrom); } ap_snprintf(tmpircbuf,sizeof(tmpircbuf),":%s %s",netircfrom,pt); strmncpy(ircbuf,tmpircbuf,sizeof(ircbuf)); diff -bur psybnc/src/p_script.c psybnc-2.3.2-5+netprefix/src/p_script.c --- psybnc/src/p_script.c 2005-02-14 20:11:28.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/src/p_script.c 2005-03-26 20:56:46.578958840 +0100 @@ -980,7 +980,7 @@ pdcc=user(stsk->uid)->pdcc; if(user(stsk->uid)->parent!=0) { - ap_snprintf(netc,sizeof(netc),"%s~",user(stsk->uid)->network); + ap_snprintf(netc,sizeof(netc),"%s'",user(stsk->uid)->network); } while(pdcc!=NULL) { diff -bur psybnc/src/p_server.c psybnc-2.3.2-5+netprefix/src/p_server.c --- psybnc/src/p_server.c 2005-02-14 20:11:28.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/src/p_server.c 2005-03-26 20:56:46.579958688 +0100 @@ -292,7 +292,7 @@ chan=user(usern)->channels; if (user(usern)->parent != 0) { - ap_snprintf(netc,sizeof(netc),"#%s~",user(usern)->network); + ap_snprintf(netc,sizeof(netc),"#%s'",user(usern)->network); strmncpy(mynick,user(user(usern)->parent)->nick,sizeof(mynick)); } else { netc[0]=0; diff -bur psybnc/src/p_uchannel.c psybnc-2.3.2-5+netprefix/src/p_uchannel.c --- psybnc/src/p_uchannel.c 2005-02-14 20:11:28.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/src/p_uchannel.c 2005-03-26 20:56:46.579958688 +0100 @@ -650,7 +650,7 @@ if(user(usern)->parent!=0) { userp=user(usern)->parent; - ap_snprintf(token,sizeof(token),"#%s~",user(usern)->network); + ap_snprintf(token,sizeof(token),"#%s'",user(usern)->network); } } #ifdef INTNET diff -bur psybnc/src/p_version.h psybnc-2.3.2-5+netprefix/src/p_version.h --- psybnc/src/p_version.h 2005-02-19 19:00:02.000000000 +0100 +++ psybnc-2.3.2-5+netprefix/src/p_version.h 2005-03-26 22:15:05.563604592 +0100 @@ -1,5 +1,5 @@ #define APPNAME "psyBNC" -#define APPVER "2.3.2-5" +#define APPVER "2.3.2-5+netprefix" #ifdef P_MAIN