9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

m_cap: refactor clicap_generate to use multiline

Browse source
This commit is contained in:
Doug Freed 2020-11-06 22:30:45 +00:00
parent 6f88bf5c30
commit 56c8530469
1 changed files with 31 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
modules/m_cap.c
View file

@ -152,31 +152,29 @@ clicap_find(const char *data, int *negate, int *finished)
static void static void
clicap_generate(struct Client *source_p, const char *subcmd, int flags) clicap_generate(struct Client *source_p, const char *subcmd, int flags)
{ {
static char buf_prefix[DATALEN + 1];
static char buf_list[DATALEN + 1];
const char *str_cont = "* :"; const char *str_cont = "* :";
const char *str_final = ":"; const char *str_final = ":";
int len_prefix;
int max_list;
struct CapabilityEntry *entry; struct CapabilityEntry *entry;
rb_dictionary_iter iter; rb_dictionary_iter iter;
bool multiline_ret;
enum multiline_item_result multiline_item_ret;
buf_prefix[0] = '\0'; multiline_ret = send_multiline_init(source_p, " ", ":%s CAP %s %s %s",
len_prefix = rb_snprintf_try_append(buf_prefix, sizeof(buf_prefix),
":%s CAP %s %s",
me.name, me.name,
EmptyString(source_p->name) ? "*" : source_p->name, EmptyString(source_p->name) ? "*" : source_p->name,
subcmd); subcmd,
(source_p->flags & FLAGS_CLICAP_DATA) ? str_cont : str_final);
/* shortcut, nothing to do */ /* shortcut, nothing to do */
if (flags == -1 || len_prefix < 0) { if (flags == -1 || !multiline_ret) {
sendto_one(source_p, "%s%s", buf_prefix, str_final); sendto_one(source_p, ":%s CAP %s %s %s",
me.name,
EmptyString(source_p->name) ? "*" : source_p->name,
subcmd,
str_final);
return; return;
} }
buf_list[0] = '\0';
max_list = sizeof(buf_prefix) - len_prefix - strlen(str_cont);
for (int pass = 0; pass < 2; pass++) for (int pass = 0; pass < 2; pass++)
RB_DICTIONARY_FOREACH(entry, &iter, cli_capindex->cap_dict) { RB_DICTIONARY_FOREACH(entry, &iter, cli_capindex->cap_dict) {
struct ClientCapability *clicap = entry->ownerdata; struct ClientCapability *clicap = entry->ownerdata;
@ -205,34 +203,32 @@ clicap_generate(struct Client *source_p, const char *subcmd, int flags)
if (!clicap_visible(source_p, entry)) if (!clicap_visible(source_p, entry))
continue; continue;
if (!flags && (source_p->flags & FLAGS_CLICAP_DATA) && clicap != NULL && clicap->data != NULL) if (source_p->flags & FLAGS_CLICAP_DATA) {
if (!flags && clicap != NULL && clicap->data != NULL)
data = clicap->data(source_p); data = clicap->data(source_p);
for (int attempts = 0; attempts < 2; attempts++) { multiline_item_ret = send_multiline_item(source_p, "%s%s%s",
if (rb_snprintf_try_append(buf_list, max_list, "%s%s%s%s",
buf_list[0] == '\0' ? "" : " ", /* space between caps */
entry->cap, entry->cap,
data != NULL ? "=" : "", /* '=' between cap and data */ data != NULL ? "=" : "",
data != NULL ? data : "") < 0 data != NULL ? data : "");
&& buf_list[0] != '\0') {
if (!(source_p->flags & FLAGS_CLICAP_DATA)) { if (multiline_item_ret == MULTILINE_FAILURE)
/* the client doesn't support multiple lines */ return;
continue;
}
/* doesn't fit in the buffer, output what we have */
sendto_one(source_p, "%s%s%s", buf_prefix, str_cont, buf_list);
/* reset the buffer and go around the loop one more time */
buf_list[0] = '\0';
} else { } else {
break; multiline_item_ret = send_multiline_item(source_p, "%s", entry->cap);
if (multiline_item_ret != MULTILINE_SUCCESS) {
send_multiline_reset();
return;
} }
} }
} }
sendto_one(source_p, "%s%s%s", buf_prefix, str_final, buf_list); send_multiline_fini(source_p, ":%s CAP %s %s %s",
me.name,
EmptyString(source_p->name) ? "*" : source_p->name,
subcmd,
str_final);
} }
static void static void