Mercurial > hg
comparison mcabber/src/commands.c @ 1333:e30a9d907105
Minor coding style adjustments
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sat, 27 Oct 2007 11:10:18 +0200 |
parents | e00d97c9fce2 |
children | 305f7a609545 |
comparison
equal
deleted
inserted
replaced
1332:bde2dc51c06b | 1333:e30a9d907105 |
---|---|
131 cmd_add("info", "Show basic info on current buddy", 0, 0, &do_info); | 131 cmd_add("info", "Show basic info on current buddy", 0, 0, &do_info); |
132 cmd_add("move", "Move the current buddy to another group", COMPL_GROUPNAME, | 132 cmd_add("move", "Move the current buddy to another group", COMPL_GROUPNAME, |
133 0, &do_move); | 133 0, &do_move); |
134 cmd_add("msay", "Send a multi-lines message to the selected buddy", | 134 cmd_add("msay", "Send a multi-lines message to the selected buddy", |
135 COMPL_MULTILINE, 0, &do_msay); | 135 COMPL_MULTILINE, 0, &do_msay); |
136 cmd_add("otr", "Manage OTR settings", COMPL_OTR, COMPL_JID, &do_otr); | |
137 cmd_add("otrpolicy", "Manage OTR policies", COMPL_JID, COMPL_OTRPOLICY, | |
138 &do_otrpolicy); | |
136 cmd_add("pgp", "Manage PGP settings", COMPL_PGP, COMPL_JID, &do_pgp); | 139 cmd_add("pgp", "Manage PGP settings", COMPL_PGP, COMPL_JID, &do_pgp); |
137 cmd_add("otr", "Manage OTR settings", COMPL_OTR, COMPL_JID, &do_otr); | |
138 cmd_add("otrpolicy", "Manage OTR policies", COMPL_JID, COMPL_OTRPOLICY, &do_otrpolicy); | |
139 cmd_add("quit", "Exit the software", 0, 0, NULL); | 140 cmd_add("quit", "Exit the software", 0, 0, NULL); |
140 cmd_add("rawxml", "Send a raw XML string", 0, 0, &do_rawxml); | 141 cmd_add("rawxml", "Send a raw XML string", 0, 0, &do_rawxml); |
141 cmd_add("rename", "Rename the current buddy", 0, 0, &do_rename); | 142 cmd_add("rename", "Rename the current buddy", 0, 0, &do_rename); |
142 cmd_add("request", "Send a Jabber IQ request", COMPL_REQUEST, COMPL_JID, | 143 cmd_add("request", "Send a Jabber IQ request", COMPL_REQUEST, COMPL_JID, |
143 &do_request); | 144 &do_request); |
703 free_arg_lst(paramlst); | 704 free_arg_lst(paramlst); |
704 return; | 705 return; |
705 } | 706 } |
706 | 707 |
707 if (!strcasecmp(subcmd, "roster")) { | 708 if (!strcasecmp(subcmd, "roster")) { |
709 char *status, *wildcard, *color; | |
708 char **arglist = split_arg(arg, 3, 0); | 710 char **arglist = split_arg(arg, 3, 0); |
709 char *status = *arglist, *wildcard = to_utf8(arglist[1]), *color = arglist[2]; | 711 |
712 status = *arglist; | |
713 wildcard = to_utf8(arglist[1]); | |
714 color = arglist[2]; | |
715 | |
710 if (status && !strcmp(status, "clear")) { // Not a color command, clear all | 716 if (status && !strcmp(status, "clear")) { // Not a color command, clear all |
711 scr_RosterClearColor(); | 717 scr_RosterClearColor(); |
712 update_roster = TRUE; | 718 update_roster = TRUE; |
713 } else { | 719 } else { |
714 if (!status || !*status || !wildcard || !*wildcard || !color || !*color) { | 720 if (!status || !*status || !wildcard || !*wildcard || !color || !*color) { |
1078 retval = 1; | 1084 retval = 1; |
1079 goto send_message_to_return; | 1085 goto send_message_to_return; |
1080 } | 1086 } |
1081 | 1087 |
1082 // Hook | 1088 // Hook |
1083 if(!isroom) | 1089 if (!isroom) |
1084 hk_message_out(bare_jid, rp, 0, hmsg, crypted); | 1090 hk_message_out(bare_jid, rp, 0, hmsg, crypted); |
1085 | 1091 |
1086 send_message_to_return: | 1092 send_message_to_return: |
1087 if (hmsg != msg) g_free(hmsg); | 1093 if (hmsg != msg) g_free(hmsg); |
1088 if (rp) g_free(bare_jid); | 1094 if (rp) g_free(bare_jid); |
1115 { | 1121 { |
1116 //Try splitting it | 1122 //Try splitting it |
1117 char **parlist = split_arg(*arg, 2, 1); | 1123 char **parlist = split_arg(*arg, 2, 1); |
1118 const char *result = NULL; | 1124 const char *result = NULL; |
1119 //Is it any good parameter? | 1125 //Is it any good parameter? |
1120 if(parlist && *parlist) { | 1126 if (parlist && *parlist) { |
1121 if(!strcmp("-n", *parlist)) { | 1127 if (!strcmp("-n", *parlist)) { |
1122 result = TMSG_NORMAL; | 1128 result = TMSG_NORMAL; |
1123 } else if(!strcmp("-h", *parlist)) { | 1129 } else if (!strcmp("-h", *parlist)) { |
1124 result = TMSG_HEADLINE; | 1130 result = TMSG_HEADLINE; |
1125 } | 1131 } |
1126 if(result || (!strcmp("--", *parlist))) | 1132 if (result || (!strcmp("--", *parlist))) |
1127 *arg += strlen(*arg) - (parlist[1] ? strlen(parlist[1]) : 0); | 1133 *arg += strlen(*arg) - (parlist[1] ? strlen(parlist[1]) : 0); |
1128 } | 1134 } |
1129 //Anything found? -> skip it | 1135 //Anything found? -> skip it |
1130 free_arg_lst(parlist); | 1136 free_arg_lst(parlist); |
1131 return result; | 1137 return result; |
1151 scr_LogPrint(LPRINT_NORMAL, "This is not a user."); | 1157 scr_LogPrint(LPRINT_NORMAL, "This is not a user."); |
1152 return; | 1158 return; |
1153 } | 1159 } |
1154 | 1160 |
1155 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE); | 1161 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE); |
1156 if(parse_flags) | 1162 if (parse_flags) |
1157 msgtype = scan_mtype(&arg); | 1163 msgtype = scan_mtype(&arg); |
1158 arg = to_utf8(arg); | 1164 arg = to_utf8(arg); |
1159 send_message(arg, NULL, msgtype); | 1165 send_message(arg, NULL, msgtype); |
1160 g_free(arg); | 1166 g_free(arg); |
1161 } | 1167 } |
2394 | 2400 |
2395 snprintf(buffer, 4095, "Whois [%s]", nick); | 2401 snprintf(buffer, 4095, "Whois [%s]", nick); |
2396 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); | 2402 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
2397 snprintf(buffer, 4095, "Status : [%c] %s", imstatus2char[rstatus], | 2403 snprintf(buffer, 4095, "Status : [%c] %s", imstatus2char[rstatus], |
2398 rst_msg); | 2404 rst_msg); |
2399 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); | 2405 scr_WriteIncomingMessage(bjid, buffer, |
2406 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); | |
2400 | 2407 |
2401 if (rst_time) { | 2408 if (rst_time) { |
2402 char tbuf[128]; | 2409 char tbuf[128]; |
2403 | 2410 |
2404 strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", localtime(&rst_time)); | 2411 strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", localtime(&rst_time)); |
2412 scr_WriteIncomingMessage(bjid, buffer, | 2419 scr_WriteIncomingMessage(bjid, buffer, |
2413 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); | 2420 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
2414 } | 2421 } |
2415 | 2422 |
2416 snprintf(buffer, 4095, "Role : %s", strrole[role]); | 2423 snprintf(buffer, 4095, "Role : %s", strrole[role]); |
2417 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); | 2424 scr_WriteIncomingMessage(bjid, buffer, |
2425 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); | |
2418 snprintf(buffer, 4095, "Affiliat.: %s", straffil[affil]); | 2426 snprintf(buffer, 4095, "Affiliat.: %s", straffil[affil]); |
2419 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); | 2427 scr_WriteIncomingMessage(bjid, buffer, |
2428 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); | |
2420 snprintf(buffer, 4095, "Priority : %d", rprio); | 2429 snprintf(buffer, 4095, "Priority : %d", rprio); |
2421 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); | 2430 scr_WriteIncomingMessage(bjid, buffer, |
2431 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); | |
2422 | 2432 |
2423 scr_WriteIncomingMessage(bjid, "End of WHOIS", 0, HBB_PREFIX_INFO, 0); | 2433 scr_WriteIncomingMessage(bjid, "End of WHOIS", 0, HBB_PREFIX_INFO, 0); |
2424 | 2434 |
2425 g_free(buffer); | 2435 g_free(buffer); |
2426 g_free(nick); | 2436 g_free(nick); |
2473 if (!bm) | 2483 if (!bm) |
2474 return; | 2484 return; |
2475 | 2485 |
2476 sbuf = g_string_new(""); | 2486 sbuf = g_string_new(""); |
2477 | 2487 |
2478 scr_WriteIncomingMessage(NULL, "List of MUC bookmarks:", 0, HBB_PREFIX_INFO, 0); | 2488 scr_WriteIncomingMessage(NULL, "List of MUC bookmarks:", |
2489 0, HBB_PREFIX_INFO, 0); | |
2479 | 2490 |
2480 for (bmp = bm; bmp; bmp = g_slist_next(bmp)) { | 2491 for (bmp = bm; bmp; bmp = g_slist_next(bmp)) { |
2481 g_string_printf(sbuf, "<%s>", (char*)bmp->data); | 2492 g_string_printf(sbuf, "<%s>", (char*)bmp->data); |
2482 scr_WriteIncomingMessage(NULL, sbuf->str, | 2493 scr_WriteIncomingMessage(NULL, sbuf->str, |
2483 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); | 2494 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
2980 scr_LogPrint(LPRINT_NORMAL, "Unrecognized or missing parameter!"); | 2991 scr_LogPrint(LPRINT_NORMAL, "Unrecognized or missing parameter!"); |
2981 free_arg_lst(paramlst); | 2992 free_arg_lst(paramlst); |
2982 return; | 2993 return; |
2983 } | 2994 } |
2984 | 2995 |
2985 if(op == otr_k) | 2996 if (op == otr_k) |
2986 otr_key(); | 2997 otr_key(); |
2987 else { | 2998 else { |
2988 // Allow special jid "" or "." (current buddy) | 2999 // Allow special jid "" or "." (current buddy) |
2989 if (fjid && (!*fjid || !strcmp(fjid, "."))) | 3000 if (fjid && (!*fjid || !strcmp(fjid, "."))) |
2990 fjid = NULL; | 3001 fjid = NULL; |
3104 scr_LogPrint(LPRINT_NORMAL, "mcabber doesn't support _this_ policy!"); | 3115 scr_LogPrint(LPRINT_NORMAL, "mcabber doesn't support _this_ policy!"); |
3105 free_arg_lst(paramlst); | 3116 free_arg_lst(paramlst); |
3106 return; | 3117 return; |
3107 } | 3118 } |
3108 | 3119 |
3109 if(!strcasecmp(fjid, "default") || !strcasecmp(fjid, "*")){ | 3120 if (!strcasecmp(fjid, "default") || !strcasecmp(fjid, "*")) { |
3110 /*set default policy*/ | 3121 /*set default policy*/ |
3111 settings_otr_setpolicy(NULL, p); | 3122 settings_otr_setpolicy(NULL, p); |
3112 free_arg_lst(paramlst); | 3123 free_arg_lst(paramlst); |
3113 return; | 3124 return; |
3114 } | 3125 } |