bx
/
catgirl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use first word of params in input commands 

Prevents anything weird from happening when tab-completing, which
inserts a space.
weechat-hashes
Curtis McEnroe 2019-02-23 12:44:20 -05:00
parent c06a457461
commit 35705c9eeb
No known key found for this signature in database
GPG Key ID: CEA2F97ADCFCD77C
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
input.c
View File

@ -41,7 +41,8 @@ static void privmsg(struct Tag tag, bool action, const char *mesg) {
typedef void Handler(struct Tag tag, char *params); typedef void Handler(struct Tag tag, char *params);
static void inputJoin(struct Tag tag, char *params) { static void inputJoin(struct Tag tag, char *params) {
ircFmt("JOIN :%s\r\n", params ? params : tag.name); char *chan = strsep(&params, " ");
ircFmt("JOIN :%s\r\n", chan ? chan : tag.name);
} }
static void inputMe(struct Tag tag, char *params) { static void inputMe(struct Tag tag, char *params) {
@ -49,8 +50,9 @@ static void inputMe(struct Tag tag, char *params) {
} }
static void inputNick(struct Tag tag, char *params) { static void inputNick(struct Tag tag, char *params) {
if (params) { char *nick = strsep(&params, " ");
ircFmt("NICK :%s\r\n", params); if (nick) {
ircFmt("NICK :%s\r\n", nick);
} else { } else {
uiLog(tag, UIHot, L"/nick requires a nickname"); uiLog(tag, UIHot, L"/nick requires a nickname");
} }
@ -90,8 +92,9 @@ static void inputWho(struct Tag tag, char *params) {
} }
static void inputWhois(struct Tag tag, char *params) { static void inputWhois(struct Tag tag, char *params) {
if (params) { char *nick = strsep(&params, " ");
ircFmt("WHOIS :%s\r\n", params); if (nick) {
ircFmt("WHOIS :%s\r\n", nick);
} else { } else {
uiLog(tag, UIHot, L"/whois requires a nick"); uiLog(tag, UIHot, L"/whois requires a nick");
} }
@ -142,20 +145,22 @@ static void inputURL(struct Tag tag, char *params) {
} }
static void inputWindow(struct Tag tag, char *params) { static void inputWindow(struct Tag tag, char *params) {
if (!params) { char *word = strsep(&params, " ");
if (!word) {
uiLog(tag, UIHot, L"/window requires a name or number"); uiLog(tag, UIHot, L"/window requires a name or number");
return; return;
} }
bool relative = (params[0] == '+' || params[0] == '-'); bool relative = (word[0] == '+' || word[0] == '-');
int num = strtol(params, &params, 0); char *trail;
if (!params[0]) { int num = strtol(word, &trail, 0);
if (!trail[0]) {
uiShowNum(num, relative); uiShowNum(num, relative);
} else { } else {
struct Tag name = tagFind(params); struct Tag name = tagFind(word);
if (name.id != TagNone.id) { if (name.id != TagNone.id) {
uiShowTag(name); uiShowTag(name);
} else { } else {
uiFmt(tag, UIHot, "No window for %s", params); uiFmt(tag, UIHot, "No window for %s", word);
} }
} }
} }