# HG changeset patch # User Myhailo Danylenko # Date 1257707377 -7200 # Node ID 72ffcc3c584e958758677c346a61abdac679ffb4 Initial commit diff -r 000000000000 -r 72ffcc3c584e .gitignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.gitignore Sun Nov 08 21:09:37 2009 +0200 @@ -0,0 +1,25 @@ +# ignore generated by libtool files (no more necessary) +*.a +*.o +*.lo +*.la +*.so +*.lai +*.so.* +# ignore backup files +*~ +# ignore docs: they are not important and apiref is generated on the fly +*.html +# ignore generated makefile +Makefile +# ignore cmake files +*.cmake +CMake* +CPack* +# ignore generated header +config.h +# ignore resulting bundles +*.deb +*.tar.bz2 +# ignore build dir +build diff -r 000000000000 -r 72ffcc3c584e CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CMakeLists.txt Sun Nov 08 21:09:37 2009 +0200 @@ -0,0 +1,68 @@ +## Copyright 2009 Myhailo Danylenko +# This file is part of mcabber module writing howto examples. +# +# Examples are free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +cmake_minimum_required(VERSION 2.6) +project(cmd C) + +## Target definitions +add_library(cmd MODULE cmd.c) + +## User settable options +set(MCABBER_INCLUDE_DIR "${cmd_SOURCE_DIR}/../include" + CACHE FILEPATH "Path to mcabber headers") + +## Packaging information +set(CPACK_PACKAGE_NAME libmcabber-cmd) +set(CPACK_PACKAGE_VERSION "0.0.1") +set(CPACK_PACKAGE_VENDOR "IsBear") +set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko ") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber example modularized cmd implementation") +set(CPACK_RESOURCE_FILE_LICENSE ${cmd_SOURCE_DIR}/COPYING) +set(CPACK_SOURCE_GENERATOR TBZ2) +set(CPACK_GENERATOR DEB CACHE TEXT "Binary package generator, eg DEB, RPM, TGZ, NSIS...") +set(CPACK_DEBIAN_PACKAGE_SECTION libs) +find_program(DPKG_EXECUTABLE dpkg) +if(DPKG_EXECUTABLE) + execute_process(COMMAND ${DPKG_EXECUTABLE} --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) +else() + set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386 CACHE TEXT "Architecture of package") +endif() +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}") +set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so") +include(CPack) + +## Check for build dependencies +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB REQUIRED glib-2.0) +pkg_check_modules(GMODULE REQUIRED gmodule-2.0) +pkg_check_modules(LM REQUIRED loudmouth-1.0) + +## Compiler setup +include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} + ${GMODULE_INCLUDE_DIRS} + ${LM_INCLUDE_DIRS}) +target_link_libraries(cmd ${GLIB_LIBRARIES} + ${GMODULE_LIBRARIES}) +include_directories(${cmd_SOURCE_DIR} + ${cmd_BINARY_DIR} + ${MCABBER_INCLUDE_DIR}) + +## Installation +install(TARGETS cmd DESTINATION lib/mcabber) +install(FILES cmd.rc COPYING DESTINATION share/doc/${CPACK_PACKAGE_NAME}) +install(DIRECTORY help DESTINATION share/mcabber) + +## The End ## vim: se ts=4: ## diff -r 000000000000 -r 72ffcc3c584e COPYING --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/COPYING Sun Nov 08 21:09:37 2009 +0200 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -r 000000000000 -r 72ffcc3c584e cmd.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cmd.c Sun Nov 08 21:09:37 2009 +0200 @@ -0,0 +1,266 @@ +/* + * cmd.c -- Send shell command output as messages + * + * Copyrigth (C) 2009 Myhailo Danylenko + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include +#include +#include +#include +#include + +#include "commands.h" +#include "logprint.h" +#include "utils.h" +#include "settings.h" +#include "hbuf.h" +#include "xmpp.h" +#include "roster.h" + +typedef struct { + gchar *jid; + GString *input; + guint source; + GIOChannel *channel; +} cmd_cb_t; + +static GSList *cmd_channels = NULL; + +static gboolean cmd_reader (GIOChannel *channel, GIOCondition condition, gpointer data) +{ + cmd_cb_t *cb = (cmd_cb_t *) data; + + if (condition & (G_IO_IN|G_IO_PRI)) { + GIOStatus chstat; + static gchar buf[HBB_BLOCKSIZE]; + gsize endpos; + + chstat = g_io_channel_read_chars (channel, buf, HBB_BLOCKSIZE, &endpos, NULL); + + if (chstat == G_IO_STATUS_ERROR || chstat == G_IO_STATUS_EOF) { + cb->source = 0; + return FALSE; // XXX + } + + if (endpos) { + GString *input = cb->input; + gsize bread = 0; + gsize written = 0; + GError *err = NULL; + gchar *utf8 = NULL; + + g_string_append_len (input, buf, endpos); + + if (!lm_connection_is_authenticated (lconnection)) { + scr_LogPrint (LPRINT_LOGNORM, "cmd: Connection is not ready, delaying data"); + return TRUE; + } + + // usual g_locale_to_utf8 seem to be unable to detect locale charset + // maybe, proper solution will be to call setlocale on module loading, + // but mcabber already does this, and I do not want to mess with it + utf8 = g_convert (input->str, input->len, LocaleCharSet, "UTF-8", &bread, &written, &err); + + if (err && err->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE && bread) { + err = NULL; + written = 0; + utf8 = g_convert (input->str, bread, LocaleCharSet, "UTF-8", &bread, &written, &err); + } + + if (written) { + gsize sent = 0; + + while (sent < written) { + gint crypted; + gpointer xep184 = NULL; + gsize len = 0; + gchar *bbuf = NULL; + + if (written - sent > HBB_BLOCKSIZE) { + gchar *c = utf8 + sent + HBB_BLOCKSIZE; + c = g_utf8_find_prev_char (utf8 + sent, c); + + if (!c) { + scr_LogPrint (LPRINT_LOGNORM, "cmd: Cannot determine utf8 character end! End of data chunk will be discarded!"); + break; + } + + len = c - utf8 - sent; + bbuf = g_strndup (utf8 + sent, len); + } + + // XXX add command/sequence number as title? + xmpp_send_msg (cb->jid, len ? bbuf : (utf8 + sent), ROSTER_TYPE_USER, NULL, FALSE /* ? */, &crypted, 0, &xep184); + + if (crypted == -1) { + + scr_LogPrint (LPRINT_LOGNORM, "cmd: Encryption error. Message not sent."); + + if (!len) + break; + + g_free (bbuf); + + continue; + } + + hk_message_out (cb->jid, NULL, 0, len ? bbuf : (utf8 + sent), crypted, xep184); + + if (!len) + break; + + g_free (bbuf); + + sent += len; + } + + g_free (utf8); + + g_string_erase (input, 0, bread); + + } else { + + scr_LogPrint (LPRINT_LOGNORM, "cmd: Character conversion error: %s", err->message); + cb->source = 0; + return FALSE; + } + } + + } else if (condition & (G_IO_ERR|G_IO_NVAL|G_IO_HUP)) { + cb->source = 0; + return FALSE; // XXX + } + + return TRUE; +} + +static void cmd_destroy_data (gpointer data) +{ + cmd_cb_t *cb = (cmd_cb_t *) data; + + cmd_channels = g_slist_remove (cmd_channels, data); + + // May conflict - will be called during source removal? +// if (cb->source) +// g_source_remove (cb->source); + if (cb->channel) + g_io_channel_unref (cb->channel); + g_free (cb->jid); + g_free (cb); +} + +static void do_cmd (char *arg) +{ + int fd[2]; + const char *jid = CURRENT_JID; + + if (!*arg) + return; + + if (!jid) { + scr_LogPrint (LPRINT_LOGNORM, "Unsuitable buddy selected"); + return; + } + + if (pipe (fd)) { + scr_LogPrint (LPRINT_LOGNORM, "Cannot create pipe: %s", strerror (errno)); + return; + } + + { + int res = fork (); + + if (!res) { + + close (fd[0]); + dup2 (fd[1], STDOUT_FILENO); + if (settings_opt_get_int ("cmd_redirect_stderr")) + dup2 (fd[1], STDERR_FILENO); + else + close (STDERR_FILENO); + close (STDIN_FILENO); + close (fd[1]); + + { + const char *shell = settings_opt_get ("cmd_shell"); + if (!shell) + shell = getenv ("SHELL"); + if (!shell) + shell = "sh"; + execl (shell, shell, "-c", arg, NULL); + } + } + + if (res == -1) { + scr_LogPrint (LPRINT_NORMAL, "Cannot fork child: %s", strerror (errno)); + close (fd[0]); + close (fd[1]); + return; + } + + close (fd[1]); + + GIOChannel *channel = g_io_channel_unix_new (fd[0]); + + g_io_channel_set_flags (channel, G_IO_FLAG_NONBLOCK, NULL); + g_io_channel_set_encoding (channel, NULL, NULL); + g_io_channel_set_close_on_unref (channel, TRUE); + g_io_channel_set_buffered (channel, FALSE); + + { + cmd_cb_t *cb = g_new (cmd_cb_t, 1); + + cb->jid = g_strdup (jid); + cb->input = g_string_new (NULL); + cb->channel = channel; + cb->source = g_io_add_watch_full (channel, 0, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, + cmd_reader, (gpointer) cb, cmd_destroy_data); + + cmd_channels = g_slist_append (cmd_channels, cb); + } + } +} + +const gchar *g_module_check_init(GModule *module) +{ + cmd_add ("cmd", "", 0, 0, do_cmd, NULL); + + return NULL; +} + +void g_module_unload(GModule *module) +{ + GSList *sel; + + cmd_del ("cmd"); + + for (sel = cmd_channels; sel; sel = sel->next) { + cmd_cb_t *cb = (cmd_cb_t *) sel->data; + if (cb->source) + g_source_remove (cb->source); + if (cb->channel) + g_io_channel_unref (cb->channel); + g_free (cb->jid); + g_free (cb); + } + + g_slist_free (cmd_channels); +} + +/* vim: se ts=4 sw=4: */ diff -r 000000000000 -r 72ffcc3c584e cmd.rc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cmd.rc Sun Nov 08 21:09:37 2009 +0200 @@ -0,0 +1,11 @@ + +# Shell to use. Commandline to be executed is +# shell -c command +# Can be autodetected from environment variable SHELL. +#set cmd_shell = /bin/dash + +# Redirect stderr to stdout. If not, stderr will be discarded. +set cmd_redirect_stderr = 1 + +load cmd + diff -r 000000000000 -r 72ffcc3c584e config.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config.h Sun Nov 08 21:09:37 2009 +0200 @@ -0,0 +1,8 @@ + +#ifndef LOCAL_CONFIG_H +#define LOCAL_CONFIG_H + +#define MODULES_ENABLE 1 + +# endif + diff -r 000000000000 -r 72ffcc3c584e help/en/hlp_cmd.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/en/hlp_cmd.txt Sun Nov 08 21:09:37 2009 +0200 @@ -0,0 +1,6 @@ + + /CMD command + +Executes specified shell command and sends it's output to current buddy. +Shell may be specified explicitly with option cmd_shell or be autodetected from environment. +Usually stderr is discarded, but you can enable its redirection using option cmd_redirect_stderr.