Sat, 27 Aug 2016 18:16:01 -0500
connection: Add purple_connection_take_error()
This patch adds a purple_connection_take_error() function, which
is functionally equivalent to purple_connection_g_error(), except
that it takes ownership of the passed GError.
This is useful to simplify error handling so that the GError doesn't
have to be freed, or, in the future potentially copied, if it's no
longer needed where it's generated. It can also allow for GErrors
being generated without storing them in a variable. This would be
reasonably common if/when all PurpleConnection errors are passed
in via GError.
/** * Send commands to Purple via ~/.purple/control * * Originally by Eric Warmenhoven <eric@warmenhoven.org> * Compile fixes/mini hacks Alex Bennee <alex@bennee.com> * and Brian Tarricone <bjt23@users.sourceforge.net> */ /* system includes */ #include <stdlib.h> #include <stdio.h> #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <string.h> #include <ctype.h> #include "internal.h" #include "account.h" #include "config.h" #include "core.h" #include "conversation.h" #include "debug.h" #include "eventloop.h" #include "util.h" #include "version.h" #define FILECTL_PLUGIN_ID "core-filectl" static int check; static time_t mtime; static void init_file(void); static gboolean check_file(void); /* parse char * as if were word array */ char *getarg(char *, int, int); /* go through file and run any commands */ void run_commands() { GStatBuf finfo; char filename[MAXPATHLEN]; char buffer[1024]; char *command, *arg1, *arg2; FILE *file; snprintf(filename, MAXPATHLEN, "%s" G_DIR_SEPARATOR_S "control", purple_user_dir()); file = g_fopen(filename, "r+"); while (fgets(buffer, sizeof(buffer), file)) { /* Read the next command */ if (buffer[strlen(buffer) - 1] == '\n') buffer[strlen(buffer) - 1] = 0; purple_debug_misc("filectl", "read: %s\n", buffer); command = getarg(buffer, 0, 0); if (!g_ascii_strncasecmp(command, "login", 6)) { PurpleAccount *account; arg1 = getarg(buffer, 1, 0); arg2 = getarg(buffer, 2, 1); account = purple_accounts_find(arg1, arg2); if (account != NULL) /* username found */ purple_account_connect(account); free(arg1); free(arg2); } else if (!g_ascii_strncasecmp(command, "logout", 7)) { PurpleAccount *account; arg1 = getarg(buffer, 1, 1); arg2 = getarg(buffer, 2, 1); account = purple_accounts_find(arg1, arg2); if (account != NULL) { purple_account_disconnect(account); } else if (arg1 == NULL) purple_connections_disconnect_all(); free(arg1); free(arg2); /* purple_find_conversation() is gone in 2.0.0. */ #if 0 } else if (!g_ascii_strncasecmp(command, "send", 4)) { PurpleConversation *conv; arg1 = getarg(buffer, 1, 0); arg2 = getarg(buffer, 2, 1); conv = purple_find_conversation(PURPLE_CONV_TYPE_ANY, arg1); if (conv != NULL) { /* purple_conversation_write(conv, arg2, WFLAG_SEND, NULL, time(NULL), -1); purple_serv_send_im(conv->gc, arg1, arg2, 0); */ } free(arg1); free(arg2); #endif } else if (!g_ascii_strncasecmp(command, "away", 4)) { arg1 = getarg(buffer, 1, 1); /* serv_set_away_all(arg1); */ free(arg1); } else if (!g_ascii_strncasecmp(command, "hide", 4)) { purple_blist_set_visible(FALSE); } else if (!g_ascii_strncasecmp(command, "unhide", 6)) { purple_blist_set_visible(TRUE); } else if (!g_ascii_strncasecmp(command, "back", 4)) { /* do_im_back(); */ } else if (!g_ascii_strncasecmp(command, "quit", 4)) { purple_core_quit(); } free(command); } fclose(file); if (g_stat(filename, &finfo) != 0) return; mtime = finfo.st_mtime; } /** * Check to see if the size of the file is > 0. if so, run commands. */ void init_file() { /* most of this was taken from Bash v2.04 by the FSF */ GStatBuf finfo; char filename[MAXPATHLEN]; snprintf(filename, MAXPATHLEN, "%s" G_DIR_SEPARATOR_S "control", purple_user_dir()); if ((g_stat(filename, &finfo) == 0) && (finfo.st_size > 0)) run_commands(); } /** * Check to see if we need to run commands from the file. */ gboolean check_file() { /* most of this was taken from Bash v2.04 by the FSF */ GStatBuf finfo; char filename[MAXPATHLEN]; snprintf(filename, MAXPATHLEN, "%s" G_DIR_SEPARATOR_S "control", purple_user_dir()); if ((g_stat(filename, &finfo) == 0) && (finfo.st_size > 0)) { if (mtime != finfo.st_mtime) { purple_debug_info("filectl", "control changed, checking\n"); run_commands(); } } return TRUE; } char * getarg(char *line, int which, int remain) { char *arr; char *val; int count = -1; int i; int state = 0; for (i = 0; i < strlen(line) && count < which; i++) { switch (state) { case 0: /* in whitespace, expecting word */ if (isalnum(line[i])) { count++; state = 1; } break; case 1: /* inside word, waiting for whitespace */ if (isspace(line[i])) { state = 0; } break; } } arr = strdup(&line[i - 1]); if (remain) return arr; for (i = 0; i < strlen(arr) && isalnum(arr[i]); i++); arr[i] = 0; val = strdup(arr); arr[i] = ' '; free(arr); return val; } /* * EXPORTED FUNCTIONS */ static PurplePluginInfo * plugin_query(GError **error) { const gchar * const authors[] = { "Eric Warmenhoven <eric@warmenhoven.org>", NULL }; return purple_plugin_info_new( "id", FILECTL_PLUGIN_ID, "name", N_("File Control"), "version", DISPLAY_VERSION, "category", N_("Utility"), "summary", N_("Allows control by entering commands in a file."), "description", N_("Allows control by entering commands in a file."), "authors", authors, "website", PURPLE_WEBSITE, "abi-version", PURPLE_ABI_VERSION, NULL ); } static gboolean plugin_load(PurplePlugin *plugin, GError **error) { init_file(); check = purple_timeout_add_seconds(5, (GSourceFunc)check_file, NULL); return TRUE; } static gboolean plugin_unload(PurplePlugin *plugin, GError **error) { purple_timeout_remove(check); return TRUE; } PURPLE_PLUGIN_INIT(filectl, plugin_query, plugin_load, plugin_unload);