* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: m_cap.c 676 2006-02-03 20:05:09Z gxti $
*/
#include "stdinc.h"
-#include "tools.h"
#include "class.h"
#include "client.h"
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "msg.h"
if(data)
{
- strlcpy(buf, data, sizeof(buf));
+ rb_strlcpy(buf, data, sizeof(buf));
p = buf;
}
char *p;
int buflen = 0;
int curlen, mlen;
- int i;
+ size_t i;
- mlen = ircsprintf(buf, ":%s CAP %s %s",
+ mlen = rb_sprintf(buf, ":%s CAP %s %s",
me.name,
EmptyString(source_p->name) ? "*" : source_p->name,
subcmd);
}
}
- curlen = ircsprintf(p, "%s ", clicap_list[i].name);
+ curlen = rb_sprintf(p, "%s ", clicap_list[i].name);
p += curlen;
buflen += curlen;
}
if(IsRegistered(source_p))
return;
- source_p->flags2 &= ~FLAGS2_CLICAP;
+ source_p->flags &= ~FLAGS_CLICAP;
- if(source_p->name[0] && source_p->user)
+ if(source_p->name[0] && source_p->flags & FLAGS_SENTUSER)
{
char buf[USERLEN+1];
- strlcpy(buf, source_p->username, sizeof(buf));
+ rb_strlcpy(buf, source_p->username, sizeof(buf));
register_local_user(source_p, source_p, buf);
}
}
cap_ls(struct Client *source_p, const char *arg)
{
if(!IsRegistered(source_p))
- source_p->flags2 |= FLAGS2_CLICAP;
+ source_p->flags |= FLAGS_CLICAP;
/* list of what we support */
clicap_generate(source_p, "LS", 0, 0);
int finished = 0, negate;
if(!IsRegistered(source_p))
- source_p->flags2 |= FLAGS2_CLICAP;
+ source_p->flags |= FLAGS_CLICAP;
if(EmptyString(arg))
return;
- buflen = ircsnprintf(buf, sizeof(buf), ":%s CAP %s ACK",
+ buflen = rb_snprintf(buf, sizeof(buf), ":%s CAP %s ACK",
me.name, EmptyString(source_p->name) ? "*" : source_p->name);
pbuf[0][0] = '\0';
sizeof(struct clicap_cmd), (bqcmp) clicap_cmd_search)))
{
sendto_one(source_p, form_str(ERR_INVALIDCAPCMD),
- me.name, source_p->name, parv[1]);
+ me.name, EmptyString(source_p->name) ? "*" : source_p->name,
+ parv[1]);
return 0;
}