pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-09 11:13:12 +02:00
Code Activity

added /upgrade command, added ETA for DCC files

Browse Source
This commit is contained in:
Sebastien Helleu
2005-12-06 18:20:59 +00:00
parent 6c7a71976b
commit 0ef010d211
74 changed files with 13360 additions and 6562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Makefile.am
+2
View File
@@ -37,5 +37,7 @@ lib_weechat_main_a_SOURCES = weechat.c \
log.h \
fifo.c \
fifo.h \
session.c \
session.h \
utf8.c \
utf8.h
src/common/command.c
+103 -10
View File
@@ -24,6 +24,7 @@
#include "config.h"
#endif
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
@@ -31,6 +32,7 @@
#include "command.h"
#include "weelist.h"
#include "weeconfig.h"
#include "session.h"
#include "../irc/irc.h"
#include "../gui/gui.h"
#include "../plugins/plugins.h"
@@ -77,8 +79,7 @@ t_weechat_command weechat_commands[] =
{ "history", N_("show buffer command history"),
N_("[clear | value]"),
N_("clear: clear history\n"
"value: number of history entries to show"
),
"value: number of history entries to show"),
0, 1, weechat_cmd_history, NULL },
{ "ignore", N_("ignore IRC messages and/or hosts"),
N_("[mask [[type | command] [channel [server]]]]"),
@@ -143,6 +144,10 @@ t_weechat_command weechat_commands[] =
"For each argument, '*' means all.\n"
"Without argument, /unignore command lists all defined ignore."),
0, 4, weechat_cmd_unignore, NULL },
{ "upgrade", N_("upgrade WeeChat without disconnecting from servers"),
"",
"",
0, 0, weechat_cmd_upgrade, NULL },
{ "uptime", N_("show WeeChat uptime"),
N_("[-o]"),
N_("-o: send uptime on current channel as an IRC message"),
@@ -760,7 +765,7 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
command_with_colors2 = (command_with_colors) ?
(char *)gui_color_decode ((unsigned char *)command_with_colors, 1) : NULL;
if (CHANNEL(buffer)->type == CHAT_PRIVATE)
if (CHANNEL(buffer)->type == CHANNEL_TYPE_PRIVATE)
{
gui_printf_type (CHANNEL(buffer)->buffer,
MSG_TYPE_NICK,
@@ -937,11 +942,17 @@ weechat_cmd_buffer_display_info (t_gui_buffer *buffer)
if (buffer->dcc)
gui_printf (NULL, "%sDCC\n",
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL));
else if (BUFFER_IS_SERVER (buffer))
gui_printf (NULL, _("%sServer: %s%s\n"),
GUI_COLOR(COLOR_WIN_CHAT),
GUI_COLOR(COLOR_WIN_CHAT_SERVER),
SERVER(buffer)->name);
else if (BUFFER_IS_SERVER(buffer))
{
if (SERVER(buffer))
gui_printf (NULL, _("%sServer: %s%s\n"),
GUI_COLOR(COLOR_WIN_CHAT),
GUI_COLOR(COLOR_WIN_CHAT_SERVER),
SERVER(buffer)->name);
else
gui_printf (NULL, _("%snot connected\n"),
GUI_COLOR(COLOR_WIN_CHAT));
}
else if (BUFFER_IS_CHANNEL (buffer))
gui_printf (NULL, _("%sChannel: %s%s %s(server: %s%s%s)\n"),
GUI_COLOR(COLOR_WIN_CHAT),
@@ -961,7 +972,8 @@ weechat_cmd_buffer_display_info (t_gui_buffer *buffer)
SERVER(buffer)->name,
GUI_COLOR(COLOR_WIN_CHAT));
else
gui_printf (NULL, _("not connected\n"));
gui_printf (NULL, _("%sunknown\n"),
GUI_COLOR(COLOR_WIN_CHAT));
}
/*
@@ -1384,7 +1396,7 @@ weechat_cmd_debug (int argc, char **argv)
if (ascii_strcasecmp (argv[0], "dump") == 0)
{
wee_dump (0);
weechat_dump (0);
}
else if (ascii_strcasecmp (argv[0], "windows") == 0)
{
@@ -2794,6 +2806,87 @@ weechat_cmd_unignore (int argc, char **argv)
return 0;
}
/*
* weechat_cmd_upgrade: upgrade WeeChat
*/
int
weechat_cmd_upgrade (int argc, char **argv)
{
t_irc_server *ptr_server;
int filename_length;
char *filename;
char *exec_args[5] = { NULL, "-a", "--session", NULL, NULL };
/* make gcc happy */
(void) argc;
(void) argv;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
if (ptr_server->child_pid != 0)
{
irc_display_prefix (NULL, gui_current_window->buffer, PREFIX_ERROR);
gui_printf_nolog (NULL,
_("%s can't upgrade: connection to at least "
"one server is pending"),
WEECHAT_ERROR);
return -1;
}
}
filename_length = strlen (weechat_home) + strlen (WEECHAT_SESSION_NAME) + 2;
filename = (char *) malloc (filename_length * sizeof (char));
if (!filename)
return -2;
snprintf (filename, filename_length, "%s%s" WEECHAT_SESSION_NAME,
weechat_home, DIR_SEPARATOR);
irc_display_prefix (NULL, NULL, PREFIX_INFO);
gui_printf_nolog (NULL, _("Upgrading WeeChat...\n"));
if (!session_save (filename))
{
free (filename);
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf_nolog (NULL,
_("%s unable to save session in file\n"),
WEECHAT_ERROR);
return -1;
}
exec_args[0] = strdup (weechat_argv0);
exec_args[3] = strdup (filename);
/* unload plugins, save config, then upgrade */
#ifdef PLUGINS
plugin_end ();
#endif
(void) config_write (NULL);
gui_end ();
execvp (exec_args[0], exec_args);
/* this code should not be reached if execvp is ok */
#ifdef PLUGINS
plugin_init (1);
#endif
fprintf (stderr, _("%s exec failed (program: \"%s\"), exiting WeeChat\n"),
WEECHAT_ERROR,
exec_args[0]);
free (exec_args[0]);
free (exec_args[3]);
free (filename);
weechat_shutdown (EXIT_FAILURE, 0);
/* never executed */
return -1;
}
/*
* weechat_cmd_uptime: display WeeChat uptime
*/
src/common/command.h
+1
View File
@@ -81,6 +81,7 @@ extern int weechat_cmd_server (int, char **);
extern int weechat_cmd_set (char *);
extern int weechat_cmd_unalias (char *);
extern int weechat_cmd_unignore (int, char **);
extern int weechat_cmd_upgrade (int, char **);
extern int weechat_cmd_uptime (int, char **);
extern int weechat_cmd_window (int, char **);
src/common/completion.c
+5 -5
View File
@@ -250,7 +250,7 @@ completion_build_list (t_completion *completion, void *channel)
"*");
if (channel)
{
if (((t_irc_channel *)channel)->type == CHAT_CHANNEL)
if (((t_irc_channel *)channel)->type == CHANNEL_TYPE_CHANNEL)
{
for (ptr_nick = ((t_irc_channel *)channel)->nicks; ptr_nick;
ptr_nick = ptr_nick->next_nick)
@@ -260,7 +260,7 @@ completion_build_list (t_completion *completion, void *channel)
ptr_nick->nick);
}
}
if (((t_irc_channel *)channel)->type == CHAT_PRIVATE)
if (((t_irc_channel *)channel)->type == CHANNEL_TYPE_PRIVATE)
{
weelist_add (&completion->completion_list,
&completion->last_completion,
@@ -302,7 +302,7 @@ completion_build_list (t_completion *completion, void *channel)
weelist_add(&completion->completion_list,
&completion->last_completion,
"*");
if (((t_irc_channel *)channel)->type == CHAT_CHANNEL)
if (((t_irc_channel *)channel)->type == CHANNEL_TYPE_CHANNEL)
weelist_add(&completion->completion_list,
&completion->last_completion,
((t_irc_channel *)channel)->name);
@@ -822,7 +822,7 @@ completion_find_context (t_completion *completion, void *channel, char *buffer,
}
if (!completion->completion_list && channel &&
(((t_irc_channel *)channel)->type == CHAT_PRIVATE)
(((t_irc_channel *)channel)->type == CHANNEL_TYPE_PRIVATE)
&& (completion->context == COMPLETION_NICK))
{
/* nick completion in private (only other nick and self) */
@@ -1017,7 +1017,7 @@ completion_nick (t_completion *completion, t_irc_channel *channel)
if (!channel)
return;
if (((t_irc_channel *)channel)->type == CHAT_PRIVATE)
if (((t_irc_channel *)channel)->type == CHANNEL_TYPE_PRIVATE)
{
completion_command_arg (completion, channel, 1);
return;
src/common/fifo.c
+9 -8
View File
@@ -70,8 +70,9 @@ fifo_create ()
gui_printf (NULL,
_("%s unable to create FIFO pipe for remote control (%s)\n"),
WEECHAT_ERROR, weechat_fifo_filename);
wee_log_printf (_("%s unable to create FIFO pipe for remote control (%s)\n"),
WEECHAT_ERROR, weechat_fifo_filename);
weechat_log_printf (_("%s unable to create FIFO pipe for "
"remote control (%s)\n"),
WEECHAT_ERROR, weechat_fifo_filename);
return;
}
@@ -81,12 +82,12 @@ fifo_create ()
gui_printf (NULL,
_("%s unable to open FIFO pipe (%s) for reading\n"),
WEECHAT_ERROR, weechat_fifo_filename);
wee_log_printf (_("%s unable to open FIFO pipe (%s) for reading\n"),
WEECHAT_ERROR, weechat_fifo_filename);
weechat_log_printf (_("%s unable to open FIFO pipe (%s) for reading\n"),
WEECHAT_ERROR, weechat_fifo_filename);
return;
}
wee_log_printf (_("FIFO pipe is open\n"));
weechat_log_printf (_("FIFO pipe is open\n"));
}
}
@@ -249,8 +250,8 @@ fifo_read ()
gui_printf (NULL,
_("%s error reading FIFO pipe, closing it\n"),
WEECHAT_ERROR);
wee_log_printf (_("%s error reading FIFO pipe, closing it\n"),
WEECHAT_ERROR);
weechat_log_printf (_("%s error reading FIFO pipe, closing it\n"),
WEECHAT_ERROR);
fifo_remove ();
}
else
@@ -291,5 +292,5 @@ fifo_remove ()
weechat_fifo_filename = NULL;
}
wee_log_printf (_("FIFO pipe is closed\n"));
weechat_log_printf (_("FIFO pipe is closed\n"));
}
src/common/history.c
+50 -42
View File
@@ -66,19 +66,63 @@ history_hide_password (char *string)
}
/*
* history_add: add a text/command to history
* history_buffer_add: add a text/command to buffer's history
*/
void
history_add (void *buffer, char *string)
history_buffer_add (void *buffer, char *string)
{
t_history *new_history, *ptr_history;
if ( !((t_gui_buffer *)(buffer))->history
|| ( ((t_gui_buffer *)(buffer))->history
&& ascii_strcasecmp (((t_gui_buffer *)(buffer))->history->text, string) != 0))
{
new_history = (t_history *)malloc (sizeof (t_history));
if (new_history)
{
new_history->text = strdup (string);
if (cfg_log_hide_nickserv_pwd)
history_hide_password (new_history->text);
if (((t_gui_buffer *)(buffer))->history)
((t_gui_buffer *)(buffer))->history->prev_history = new_history;
else
((t_gui_buffer *)(buffer))->last_history = new_history;
new_history->next_history = ((t_gui_buffer *)(buffer))->history;
new_history->prev_history = NULL;
((t_gui_buffer *)buffer)->history = new_history;
((t_gui_buffer *)buffer)->num_history++;
/* remove one command if necessary */
if ((cfg_history_max_commands > 0)
&& (((t_gui_buffer *)(buffer))->num_history > cfg_history_max_commands))
{
ptr_history = ((t_gui_buffer *)buffer)->last_history->prev_history;
((t_gui_buffer *)buffer)->last_history->prev_history->next_history = NULL;
if (((t_gui_buffer *)buffer)->last_history->text)
free (((t_gui_buffer *)buffer)->last_history->text);
free (((t_gui_buffer *)buffer)->last_history);
((t_gui_buffer *)buffer)->last_history = ptr_history;
((t_gui_buffer *)(buffer))->num_history++;
}
}
}
}
/*
* history_global_add: add a text/command to buffer's history
*/
void
history_global_add (char *string)
{
t_history *new_history, *ptr_history;
if ( !history_global
|| ( history_global
&& ascii_strcasecmp (history_global->text, string) != 0))
if (!history_global
|| (history_global
&& ascii_strcasecmp (history_global->text, string) != 0))
{
/* add history to global history */
new_history = (t_history *)malloc (sizeof (t_history));
if (new_history)
{
@@ -109,42 +153,6 @@ history_add (void *buffer, char *string)
}
}
}
if ( !((t_gui_buffer *)(buffer))->history
|| ( ((t_gui_buffer *)(buffer))->history
&& ascii_strcasecmp (((t_gui_buffer *)(buffer))->history->text, string) != 0))
{
/* add history to local history */
new_history = (t_history *)malloc (sizeof (t_history));
if (new_history)
{
new_history->text = strdup (string);
if (cfg_log_hide_nickserv_pwd)
history_hide_password (new_history->text);
if (((t_gui_buffer *)(buffer))->history)
((t_gui_buffer *)(buffer))->history->prev_history = new_history;
else
((t_gui_buffer *)(buffer))->last_history = new_history;
new_history->next_history = ((t_gui_buffer *)(buffer))->history;
new_history->prev_history = NULL;
((t_gui_buffer *)buffer)->history = new_history;
((t_gui_buffer *)(buffer))->num_history++;
/* remove one command if necessary */
if ((cfg_history_max_commands > 0)
&& (((t_gui_buffer *)(buffer))->num_history > cfg_history_max_commands))
{
ptr_history = ((t_gui_buffer *)buffer)->last_history->prev_history;
((t_gui_buffer *)buffer)->last_history->prev_history->next_history = NULL;
if (((t_gui_buffer *)buffer)->last_history->text)
free (((t_gui_buffer *)buffer)->last_history->text);
free (((t_gui_buffer *)buffer)->last_history);
((t_gui_buffer *)buffer)->last_history = ptr_history;
((t_gui_buffer *)(buffer))->num_history++;
}
}
}
}
/*
src/common/history.h
+2 -1
View File
@@ -34,7 +34,8 @@ extern t_history *history_global;
extern t_history *history_global_last;
extern t_history *history_global_ptr;
extern void history_add (void *, char *);
extern void history_buffer_add (void *, char *);
extern void history_global_add (char *);
extern void history_global_free ();
extern void history_buffer_free (void *);
src/common/log.c
+2 -2
View File
@@ -120,7 +120,7 @@ log_start (t_gui_buffer *buffer)
buffer->log_filename = (char *) malloc (length);
if (!buffer->log_filename)
{
wee_log_printf (_("Not enough memory to write log file for a buffer\n"));
weechat_log_printf (_("Not enough memory to write log file for a buffer\n"));
return;
}
if (cfg_log_path[0] == '~')
@@ -148,7 +148,7 @@ log_start (t_gui_buffer *buffer)
buffer->log_file = fopen (buffer->log_filename, "a");
if (!buffer->log_file)
{
wee_log_printf (_("Unable to write log file for a buffer\n"));
weechat_log_printf (_("Unable to write log file for a buffer\n"));
free (buffer->log_filename);
return;
}
src/common/session.c
+1509
View File
File diff suppressed because it is too large Load Diff
src/common/session.h
+169
View File
@@ -0,0 +1,169 @@
/*
* Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
* See README for License detail, AUTHORS for developers list.
*
* 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
*/
#ifndef __WEECHAT_SESSION_H
#define __WEECHAT_SESSION_H 1
#define WEECHAT_SESSION_NAME "weechat_session.bin"
#define SESSION_SIGNATURE "== WeeChat Upgrade file v1.0 - binary, do not edit! =="
/* For developers: please add new values ONLY AT THE END of enums */
enum t_session_type
{
SESSION_TYPE_INT = 0,
SESSION_TYPE_STR,
SESSION_TYPE_BUF
};
enum t_session_object
{
SESSION_OBJ_END = 0,
SESSION_OBJ_SERVER,
SESSION_OBJ_CHANNEL,
SESSION_OBJ_NICK,
SESSION_OBJ_DCC,
SESSION_OBJ_HISTORY,
SESSION_OBJ_BUFFER,
SESSION_OBJ_LINE,
};
enum t_session_server
{
SESSION_SERV_END = 0,
SESSION_SERV_NAME,
SESSION_SERV_AUTOCONNECT,
SESSION_SERV_AUTORECONNECT,
SESSION_SERV_AUTORECONNECT_DELAY,
SESSION_SERV_COMMAND_LINE,
SESSION_SERV_ADDRESS,
SESSION_SERV_PORT,
SESSION_SERV_IPV6,
SESSION_SERV_SSL,
SESSION_SERV_PASSWORD,
SESSION_SERV_NICK1,
SESSION_SERV_NICK2,
SESSION_SERV_NICK3,
SESSION_SERV_USERNAME,
SESSION_SERV_REALNAME,
SESSION_SERV_COMMAND,
SESSION_SERV_COMMAND_DELAY,
SESSION_SERV_AUTOJOIN,
SESSION_SERV_AUTOREJOIN,
SESSION_SERV_NOTIFY_LEVELS,
SESSION_SERV_CHILD_PID,
SESSION_SERV_CHILD_READ,
SESSION_SERV_CHILD_WRITE,
SESSION_SERV_SOCK,
SESSION_SERV_IS_CONNECTED,
SESSION_SERV_SSL_CONNECTED,
SESSION_SERV_GNUTLS_SESS,
SESSION_SERV_UNTERMINATED_MESSAGE,
SESSION_SERV_NICK,
SESSION_SERV_RECONNECT_START,
SESSION_SERV_RECONNECT_JOIN,
SESSION_SERV_IS_AWAY,
SESSION_SERV_AWAY_TIME,
SESSION_SERV_LAG,
SESSION_SERV_LAG_CHECK_TIME,
SESSION_SERV_LAG_NEXT_CHECK
};
enum t_session_channel
{
SESSION_CHAN_END = 0,
SESSION_CHAN_TYPE,
SESSION_CHAN_NAME,
SESSION_CHAN_TOPIC,
SESSION_CHAN_MODES,
SESSION_CHAN_LIMIT,
SESSION_CHAN_KEY,
SESSION_CHAN_NICKS_COUNT,
SESSION_CHAN_CHECKING_AWAY
};
enum t_session_nick
{
SESSION_NICK_END = 0,
SESSION_NICK_NICK,
SESSION_NICK_FLAGS,
SESSION_NICK_COLOR
};
enum t_session_dcc
{
SESSION_DCC_END = 0,
SESSION_DCC_SERVER,
SESSION_DCC_CHANNEL,
SESSION_DCC_TYPE,
SESSION_DCC_STATUS,
SESSION_DCC_START_TIME,
SESSION_DCC_START_TRANSFER,
SESSION_DCC_ADDR,
SESSION_DCC_PORT,
SESSION_DCC_NICK,
SESSION_DCC_SOCK,
SESSION_DCC_UNTERMINATED_MESSAGE,
SESSION_DCC_FILE,
SESSION_DCC_FILENAME,
SESSION_DCC_LOCAL_FILENAME,
SESSION_DCC_FILENAME_SUFFIX,
SESSION_DCC_SIZE,
SESSION_DCC_POS,
SESSION_DCC_ACK,
SESSION_DCC_START_RESUME,
SESSION_DCC_LAST_CHECK_TIME,
SESSION_DCC_LAST_CHECK_POS,
SESSION_DCC_LAST_ACTIVITY,
SESSION_DCC_BYTES_PER_SEC,
SESSION_DCC_ETA
};
enum t_session_history
{
SESSION_HIST_END = 0,
SESSION_HIST_TEXT
};
enum t_session_buffer
{
SESSION_BUFF_END = 0,
SESSION_BUFF_SERVER,
SESSION_BUFF_CHANNEL,
SESSION_BUFF_DCC
};
enum t_session_line
{
SESSION_LINE_END = 0,
SESSION_LINE_LENGTH,
SESSION_LINE_LENGTH_ALIGN,
SESSION_LINE_LOG_WRITE,
SESSION_LINE_WITH_MESSAGE,
SESSION_LINE_WITH_HIGHLIGHT,
SESSION_LINE_DATA,
SESSION_LINE_OFS_AFTER_DATE
};
int session_save (char *filename);
int session_load (char *filename);
#endif /* session.h */
src/common/weechat.c
+205 -148
View File
@@ -65,6 +65,7 @@
#include "command.h"
#include "fifo.h"
#include "utf8.h"
#include "session.h"
#include "../irc/irc.h"
#include "../gui/gui.h"
@@ -73,6 +74,8 @@
#endif
char *weechat_argv0 = NULL; /* WeeChat binary file name (argv[0]) */
char *weechat_session = NULL; /* WeeChat session file (for /upgrade command) */
time_t weechat_start_time; /* WeeChat start time (used by /uptime command) */
int quit_weechat; /* = 1 if quit request from user... why ? :'( */
int sigsegv = 0; /* SIGSEGV received? */
@@ -163,11 +166,11 @@ ascii_strncasecmp (char *string1, char *string2, int max)
}
/*
* wee_log_printf: displays a message in WeeChat log (~/.weechat/weechat.log)
* weechat_log_printf: displays a message in WeeChat log (~/.weechat/weechat.log)
*/
void
wee_log_printf (char *message, ...)
weechat_log_printf (char *message, ...)
{
static char buffer[4096];
char *ptr_buffer;
@@ -214,7 +217,7 @@ weechat_convert_encoding (char *from_code, char *to_code, char *string)
{
char *outbuf;
#ifdef HAVE_ICONV
#ifdef HAVE_ICONV
iconv_t cd;
char *inbuf;
ICONV_CONST char *ptr_inbuf;
@@ -249,12 +252,12 @@ weechat_convert_encoding (char *from_code, char *to_code, char *string)
}
else
outbuf = strdup (string);
#else
#else
/* make gcc happy */
(void) from_code;
(void) to_code;
outbuf = strdup (string);
#endif /* HAVE_ICONV */
#endif /* HAVE_ICONV */
return outbuf;
}
@@ -263,7 +266,8 @@ weechat_convert_encoding (char *from_code, char *to_code, char *string)
* get_timeval_diff: calculates difference between two times (return in milliseconds)
*/
long get_timeval_diff(struct timeval *tv1, struct timeval *tv2)
long
get_timeval_diff (struct timeval *tv1, struct timeval *tv2)
{
long diff_sec, diff_usec;
@@ -279,10 +283,40 @@ long get_timeval_diff(struct timeval *tv1, struct timeval *tv2)
}
/*
* wee_display_config_options: display config options
* weechat_display_usage: display WeeChat usage
*/
void wee_display_config_options ()
void
weechat_display_usage (char *exec_name)
{
printf ("\n");
printf (_("%s (c) Copyright 2003-2005, compiled on %s %s\n"
"Developed by FlashCode <flashcode@flashtux.org> - %s"),
PACKAGE_STRING, __DATE__, __TIME__, WEECHAT_WEBSITE);
printf ("\n\n");
printf (_("Usage: %s [options ...]\n" \
" or: %s [irc[6][s]://[nickname[:password]@]irc.example.org[:port][/channel][,channel[...]]"),
exec_name, exec_name);
printf ("\n\n");
printf (_(" -a, --no-connect disable auto-connect to servers at startup\n"
" -c, --config display config file options\n"
" -f, --key-functions display WeeChat internal functions for keys\n"
" -h, --help this help\n"
" -i, --irc-commands display IRC commands\n"
" -k, --keys display WeeChat default keys\n"
" -l, --license display WeeChat license\n"
" -p, --no-plugin don't load any plugin at startup\n"
" -v, --version display WeeChat version\n"
" -w, --weechat-commands display WeeChat commands\n"));
printf("\n");
}
/*
* weechat_display_config_options: display config options
*/
void
weechat_display_config_options ()
{
int i, j, k;
@@ -353,10 +387,11 @@ void wee_display_config_options ()
}
/*
* wee_display_commands: display WeeChat and/or IRC commands
* weechat_display_commands: display WeeChat and/or IRC commands
*/
void wee_display_commands (int weechat_cmd, int irc_cmd)
void
weechat_display_commands (int weechat_cmd, int irc_cmd)
{
int i;
@@ -406,10 +441,11 @@ void wee_display_commands (int weechat_cmd, int irc_cmd)
}
/*
* wee_display_key_functions: display WeeChat key functions
* weechat_display_key_functions: display WeeChat key functions
*/
void wee_display_key_functions ()
void
weechat_display_key_functions ()
{
int i;
@@ -426,11 +462,11 @@ void wee_display_key_functions ()
}
/*
* wee_display_keys: display WeeChat default keys
* weechat_display_keys: display WeeChat default keys
*/
void
wee_display_keys ()
weechat_display_keys ()
{
t_gui_key *ptr_key;
char *expanded_name;
@@ -449,15 +485,17 @@ wee_display_keys ()
}
/*
* wee_parse_args: parse command line args
* weechat_parse_args: parse command line args
*/
void
wee_parse_args (int argc, char *argv[])
weechat_parse_args (int argc, char *argv[])
{
int i;
t_irc_server server_tmp;
weechat_argv0 = strdup (argv[0]);
weechat_session = NULL;
server_cmd_line = 0;
auto_connect = 1;
auto_load_plugins = 1;
@@ -470,54 +508,65 @@ wee_parse_args (int argc, char *argv[])
else if ((strcmp (argv[i], "-c") == 0)
|| (strcmp (argv[i], "--config") == 0))
{
wee_display_config_options ();
wee_shutdown (EXIT_SUCCESS, 0);
weechat_display_config_options ();
weechat_shutdown (EXIT_SUCCESS, 0);
}
else if ((strcmp (argv[i], "-f") == 0)
|| (strcmp (argv[i], "--key-functions") == 0))
{
wee_display_key_functions ();
wee_shutdown (EXIT_SUCCESS, 0);
weechat_display_key_functions ();
weechat_shutdown (EXIT_SUCCESS, 0);
}
else if ((strcmp (argv[i], "-h") == 0)
|| (strcmp (argv[i], "--help") == 0))
{
printf ("\n" WEE_USAGE1, argv[0], argv[0]);
printf ("%s", WEE_USAGE2);
wee_shutdown (EXIT_SUCCESS, 0);
weechat_display_usage (argv[0]);
weechat_shutdown (EXIT_SUCCESS, 0);
}
else if ((strcmp (argv[i], "-i") == 0)
|| (strcmp (argv[i], "--irc-commands") == 0))
{
wee_display_commands (0, 1);
wee_shutdown (EXIT_SUCCESS, 0);
weechat_display_commands (0, 1);
weechat_shutdown (EXIT_SUCCESS, 0);
}
else if ((strcmp (argv[i], "-k") == 0)
|| (strcmp (argv[i], "--keys") == 0))
{
wee_display_keys ();
wee_shutdown (EXIT_SUCCESS, 0);
weechat_display_keys ();
weechat_shutdown (EXIT_SUCCESS, 0);
}
else if ((strcmp (argv[i], "-l") == 0)
|| (strcmp (argv[i], "--license") == 0))
{
printf ("\n%s%s", WEE_LICENSE);
wee_shutdown (EXIT_SUCCESS, 0);
weechat_shutdown (EXIT_SUCCESS, 0);
}
else if ((strcmp (argv[i], "-p") == 0)
|| (strcmp (argv[i], "--no-plugin") == 0))
auto_load_plugins = 0;
else if (strcmp (argv[i], "--session") == 0)
{
if (i + 1 < argc)
weechat_session = strdup (argv[++i]);
else
{
fprintf (stderr,
_("%s missing argument for --session option\n"),
WEECHAT_ERROR);
weechat_shutdown (EXIT_FAILURE, 0);
}
}
else if ((strcmp (argv[i], "-v") == 0)
|| (strcmp (argv[i], "--version") == 0))
{
printf (PACKAGE_VERSION "\n");
wee_shutdown (EXIT_SUCCESS, 0);
weechat_shutdown (EXIT_SUCCESS, 0);
}
else if ((strcmp (argv[i], "-w") == 0)
|| (strcmp (argv[i], "--weechat-commands") == 0))
{
wee_display_commands (1, 0);
wee_shutdown (EXIT_SUCCESS, 0);
weechat_display_commands (1, 0);
weechat_shutdown (EXIT_SUCCESS, 0);
}
else if ((ascii_strncasecmp (argv[i], "irc", 3) == 0))
{
@@ -552,13 +601,13 @@ wee_parse_args (int argc, char *argv[])
}
/*
* wee_create_dir: create a directory
* return: 1 if ok (or directory already exists)
* 0 if error
* weechat_create_dir: create a directory
* return: 1 if ok (or directory already exists)
* 0 if error
*/
int
wee_create_dir (char *directory)
weechat_create_dir (char *directory)
{
if (mkdir (directory, 0755) < 0)
{
@@ -574,26 +623,21 @@ wee_create_dir (char *directory)
}
/*
* wee_create_home_dirs: create (if not found):
* - WeeChat home directory ("~/.weechat")
* - "perl" directory (and "autoload")
* - "ruby" directory (and "autoload")
* - "python" directory (and "autoload")
* weechat_create_home_dirs: create WeeChat directories (if not found)
*/
void
wee_create_home_dirs ()
weechat_create_home_dirs ()
{
char *ptr_home, *dir_name;
int dir_length;
/* TODO: rewrite this code for Windows version */
ptr_home = getenv ("HOME");
if (!ptr_home)
{
fprintf (stderr, _("%s unable to get HOME directory\n"),
WEECHAT_ERROR);
wee_shutdown (EXIT_FAILURE, 0);
weechat_shutdown (EXIT_FAILURE, 0);
}
dir_length = strlen (ptr_home) + 10;
weechat_home =
@@ -602,17 +646,17 @@ wee_create_home_dirs ()
{
fprintf (stderr, _("%s not enough memory for home directory\n"),
WEECHAT_ERROR);
wee_shutdown (EXIT_FAILURE, 0);
weechat_shutdown (EXIT_FAILURE, 0);
}
snprintf (weechat_home, dir_length, "%s%s.weechat", ptr_home,
DIR_SEPARATOR);
/* create home directory "~/.weechat" ; error is fatal */
if (!wee_create_dir (weechat_home))
if (!weechat_create_dir (weechat_home))
{
fprintf (stderr, _("%s unable to create ~/.weechat directory\n"),
WEECHAT_ERROR);
wee_shutdown (EXIT_FAILURE, 0);
weechat_shutdown (EXIT_FAILURE, 0);
}
dir_length = strlen (weechat_home) + 64;
@@ -621,7 +665,7 @@ wee_create_home_dirs ()
/* create "~/.weechat/logs" */
snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
"logs");
if (!wee_create_dir (dir_name))
if (!weechat_create_dir (dir_name))
{
fprintf (stderr, _("%s unable to create ~/.weechat/logs directory\n"),
WEECHAT_WARNING);
@@ -632,11 +676,11 @@ wee_create_home_dirs ()
}
/*
* wee_init_vars: initialize some variables
* weechat_init_vars: initialize some variables
*/
void
wee_init_vars ()
weechat_init_vars ()
{
/* start time, used by /uptime command */
weechat_start_time = time (NULL);
@@ -654,11 +698,11 @@ wee_init_vars ()
}
/*
* wee_init_log: initialize log file
* weechat_init_log: initialize log file
*/
void
wee_init_log ()
weechat_init_log ()
{
int filename_length;
char *filename;
@@ -674,6 +718,29 @@ wee_init_log ()
free (filename);
}
/*
* weechat_config_read: read WeeChat config file
*/
void
weechat_config_read ()
{
switch (config_read ())
{
case 0: /* read ok */
break;
case -1: /* config file not found */
if (config_create_default () < 0)
exit (EXIT_FAILURE);
if (config_read () != 0)
exit (EXIT_FAILURE);
break;
default: /* other error (fatal) */
server_free_all ();
exit (EXIT_FAILURE);
}
}
/*
* weechat_welcome_message: display WeeChat welcome message - yeah!
*/
@@ -720,29 +787,19 @@ weechat_welcome_message ()
"%s-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n",
GUI_COLOR(COLOR_WIN_CHAT_NICK));
wee_log_printf ("%s (%s %s %s)\n",
PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__);
weechat_log_printf ("%s (%s %s %s)\n",
PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__);
}
/*
* wee_gui_shutdown: shutdown WeeChat GUI
* weechat_shutdown: shutdown WeeChat
*/
void
wee_gui_shutdown ()
{
dcc_end ();
server_free_all ();
gui_end ();
}
/*
* wee_shutdown: shutdown WeeChat
*/
void
wee_shutdown (int return_code, int crash)
weechat_shutdown (int return_code, int crash)
{
if (weechat_argv0)
free (weechat_argv0);
fifo_remove ();
if (weechat_home)
free (weechat_home);
@@ -764,15 +821,16 @@ wee_shutdown (int return_code, int crash)
}
/*
* wee_dump writes dump to WeeChat log file
* weechat_dump writes dump to WeeChat log file
*/
void
wee_dump (int crash)
weechat_dump (int crash)
{
t_irc_server *ptr_server;
t_irc_channel *ptr_channel;
t_irc_nick *ptr_nick;
t_irc_dcc *ptr_dcc;
t_gui_window *ptr_window;
t_gui_buffer *ptr_buffer;
@@ -783,92 +841,100 @@ wee_dump (int crash)
if (crash)
{
sigsegv = 1;
wee_log_printf ("Very bad, WeeChat is crashing (SIGSEGV received)...\n");
weechat_log_printf ("Very bad, WeeChat is crashing (SIGSEGV received)...\n");
}
wee_log_printf ("\n");
weechat_log_printf ("\n");
if (crash)
{
wee_log_printf ("****** WeeChat CRASH DUMP ******\n");
wee_log_printf ("****** Please send this file to WeeChat developers ******\n");
wee_log_printf ("****** and explain when this crash happened ******\n");
weechat_log_printf ("****** WeeChat CRASH DUMP ******\n");
weechat_log_printf ("****** Please send this file to WeeChat developers ******\n");
weechat_log_printf ("****** and explain when this crash happened ******\n");
}
else
{
wee_log_printf ("****** WeeChat dump request ******\n");
weechat_log_printf ("****** WeeChat dump request ******\n");
}
for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
{
wee_log_printf ("\n");
weechat_log_printf ("\n");
server_print_log (ptr_server);
for (ptr_channel = ptr_server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
wee_log_printf ("\n");
weechat_log_printf ("\n");
channel_print_log (ptr_channel);
for (ptr_nick = ptr_channel->nicks; ptr_nick;
ptr_nick = ptr_nick->next_nick)
{
wee_log_printf ("\n");
weechat_log_printf ("\n");
nick_print_log (ptr_nick);
}
}
}
wee_log_printf ("\n");
wee_log_printf ("[windows/buffers]\n");
wee_log_printf (" => windows:\n");
weechat_log_printf ("\n");
for (ptr_dcc = dcc_list; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
{
dcc_print_log (ptr_dcc);
}
weechat_log_printf ("\n");
weechat_log_printf ("[windows/buffers]\n");
weechat_log_printf (" => windows:\n");
for (ptr_window = gui_windows; ptr_window; ptr_window = ptr_window->next_window)
{
wee_log_printf (" 0x%X\n", ptr_window);
weechat_log_printf (" 0x%X\n", ptr_window);
}
wee_log_printf (" => buffers:\n");
weechat_log_printf (" => buffers:\n");
for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
{
wee_log_printf (" 0x%X\n", ptr_buffer);
weechat_log_printf (" 0x%X\n", ptr_buffer);
}
wee_log_printf (" => current window = 0x%X\n", gui_current_window);
weechat_log_printf (" => current window = 0x%X\n", gui_current_window);
for (ptr_window = gui_windows; ptr_window; ptr_window = ptr_window->next_window)
{
wee_log_printf ("\n");
weechat_log_printf ("\n");
gui_window_print_log (ptr_window);
}
for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
{
wee_log_printf ("\n");
weechat_log_printf ("\n");
gui_buffer_print_log (ptr_buffer);
}
wee_log_printf ("\n");
weechat_log_printf ("\n");
ignore_print_log ();
wee_log_printf ("\n");
wee_log_printf ("****** End of dump ******\n");
wee_log_printf ("\n");
weechat_log_printf ("\n");
weechat_log_printf ("****** End of dump ******\n");
weechat_log_printf ("\n");
}
/*
* my_sigsegv: SIGSEGV handler: save crash log to ~/.weechat/weechat.log and exit
* weechat_sigsegv: SIGSEGV handler: save crash log to ~/.weechat/weechat.log and exit
*/
void
my_sigsegv ()
weechat_sigsegv ()
{
wee_dump (1);
wee_gui_shutdown ();
weechat_dump (1);
dcc_end ();
server_free_all ();
gui_end ();
fprintf (stderr, "\n");
fprintf (stderr, "*** Very bad! WeeChat has crashed (SIGSEGV received)\n");
fprintf (stderr, "*** Full crash dump was saved to ~/.weechat/weechat.log file\n");
fprintf (stderr, "*** Please send this file to WeeChat developers.\n");
fprintf (stderr, "*** (be careful, private info may be in this file since\n");
fprintf (stderr, "*** part of chats are displayed, so remove lines if needed)\n\n");
wee_shutdown (EXIT_FAILURE, 1);
weechat_shutdown (EXIT_FAILURE, 1);
}
/*
@@ -878,63 +944,54 @@ my_sigsegv ()
int
main (int argc, char *argv[])
{
#ifdef ENABLE_NLS
setlocale (LC_ALL, ""); /* initialize gettext */
#ifdef ENABLE_NLS
setlocale (LC_ALL, ""); /* initialize gettext */
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
#endif
#ifdef HAVE_LANGINFO_CODESET
local_charset = strdup (nl_langinfo (CODESET));
#endif
signal (SIGINT, SIG_IGN); /* ignore SIGINT signal */
signal (SIGQUIT, SIG_IGN); /* ignore SIGQUIT signal */
signal (SIGPIPE, SIG_IGN); /* ignore SIGPIPE signal */
signal (SIGSEGV, my_sigsegv); /* crash dump when SIGSEGV is received */
gui_pre_init (&argc, &argv); /* pre-initiliaze interface */
wee_init_vars (); /* initialize some variables */
gui_key_init (); /* init keyboard (default key bindings) */
wee_parse_args (argc, argv); /* parse command line args */
wee_create_home_dirs (); /* create WeeChat directories */
wee_init_log (); /* init log file */
command_index_build (); /* build commands index for completion */
switch (config_read ()) /* read configuration */
{
case 0: /* config file OK */
break;
case -1: /* config file not found */
if (config_create_default () < 0)
return EXIT_FAILURE;
if (config_read () != 0)
return EXIT_FAILURE;
break;
default: /* other error (fatal) */
server_free_all ();
return EXIT_FAILURE;
}
utf8_init (); /* init UTF-8 in WeeChat */
gui_init (); /* init WeeChat interface */
weechat_welcome_message (); /* display WeeChat welcome message */
#ifdef PLUGINS
plugin_init (auto_load_plugins);/* init plugin interface(s) */
#endif
/* auto-connect to servers */
server_auto_connect (auto_connect, server_cmd_line);
fifo_create (); /* create FIFO pipe for remote control */
gui_main_loop (); /* WeeChat main loop */
#ifdef HAVE_LANGINFO_CODESET
local_charset = strdup (nl_langinfo (CODESET));
#endif
signal (SIGINT, SIG_IGN); /* ignore SIGINT signal */
signal (SIGQUIT, SIG_IGN); /* ignore SIGQUIT signal */
signal (SIGPIPE, SIG_IGN); /* ignore SIGPIPE signal */
signal (SIGSEGV, weechat_sigsegv); /* crash dump when SIGSEGV received */
gui_pre_init (&argc, &argv); /* pre-initiliaze interface */
weechat_init_vars (); /* initialize some variables */
gui_key_init (); /* init keyb. (default key bindings)*/
weechat_parse_args (argc, argv); /* parse command line args */
weechat_create_home_dirs (); /* create WeeChat directories */
weechat_init_log (); /* init log file */
command_index_build (); /* build cmd index for completion */
weechat_config_read (); /* read configuration */
utf8_init (); /* init UTF-8 in WeeChat */
gui_init (); /* init WeeChat interface */
weechat_welcome_message (); /* display WeeChat welcome message */
#ifdef PLUGINS
plugin_init (auto_load_plugins); /* init plugin interface(s) */
#endif
server_auto_connect (auto_connect, /* auto-connect to servers */
server_cmd_line);
fifo_create (); /* FIFO pipe for remote control */
if (weechat_session)
session_load (weechat_session); /* load previous session if asked */
gui_main_loop (); /* WeeChat main loop */
#ifdef PLUGINS
plugin_end (); /* end plugin interface(s) */
plugin_end (); /* end plugin interface(s) */
#endif
server_disconnect_all (); /* disconnect from all servers */
(void) config_write (NULL); /* save config file */
command_index_free (); /* free commands index */
wee_gui_shutdown (); /* shut down WeeChat GUI */
wee_shutdown (EXIT_SUCCESS, 0); /* quit WeeChat (oh no, why?) */
server_disconnect_all (); /* disconnect from all servers */
(void) config_write (NULL); /* save config file */
command_index_free (); /* free commands index */
dcc_end (); /* remove all DCC */
server_free_all (); /* free all servers */
gui_end (); /* shut down WeeChat GUI */
weechat_shutdown (EXIT_SUCCESS, 0); /* quit WeeChat (oh no, why?) */
return EXIT_SUCCESS; /* make gcc happy (never executed) */
return EXIT_SUCCESS; /* make gcc happy (never executed) */
}
src/common/weechat.h
+4 -21
View File
@@ -82,24 +82,6 @@
"along with this program; if not, write to the Free Software\n" \
"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n\n"
#define WEE_USAGE1 \
PACKAGE_STRING " (c) Copyright 2003-2005, compiled on " __DATE__ " " __TIME__ \
"\nDeveloped by FlashCode <flashcode@flashtux.org> - " WEECHAT_WEBSITE "\n\n" \
"Usage: %s [options ...]\n" \
" or: %s [irc[6][s]://[nickname[:password]@]irc.example.org[:port][/channel][,channel[...]]\n\n"
#define WEE_USAGE2 \
" -a, --no-connect disable auto-connect to servers at startup\n" \
" -c, --config display config file options\n" \
" -f, --key-functions display WeeChat internal functions for keys\n" \
" -h, --help this help\n" \
" -i, --irc-commands display IRC commands\n" \
" -k, --keys display WeeChat default keys\n" \
" -l, --license display WeeChat license\n" \
" -p, --no-plugin don't load any plugin at startup\n" \
" -v, --version display WeeChat version\n" \
" -w, --weechat-commands display WeeChat commands\n\n"
/* directory separator, depending on OS */
#ifdef _WIN32
@@ -112,6 +94,7 @@
/* global variables and functions */
extern char *weechat_argv0;
extern time_t weechat_start_time;
extern int quit_weechat;
extern char *weechat_home;
@@ -123,10 +106,10 @@ extern gnutls_certificate_credentials gnutls_xcred;
extern int ascii_strcasecmp (char *, char *);
extern int ascii_strncasecmp (char *, char *, int);
extern void wee_log_printf (char *, ...);
extern void wee_dump (int);
extern void weechat_log_printf (char *, ...);
extern void weechat_dump (int);
extern char *weechat_convert_encoding (char *, char *, char *);
extern long get_timeval_diff (struct timeval *, struct timeval *);
extern void wee_shutdown (int, int);
extern void weechat_shutdown (int, int);
#endif /* weechat.h */
src/common/weeconfig.c
+4 -6
View File
@@ -1612,10 +1612,8 @@ config_read ()
int server_found;
char line[1024], *ptr_line, *pos, *pos2;
filename_length = strlen (weechat_home) +
strlen (WEECHAT_CONFIG_NAME) + 2;
filename =
(char *) malloc (filename_length * sizeof (char));
filename_length = strlen (weechat_home) + strlen (WEECHAT_CONFIG_NAME) + 2;
filename = (char *) malloc (filename_length * sizeof (char));
if (!filename)
return -2;
snprintf (filename, filename_length, "%s%s" WEECHAT_CONFIG_NAME,
@@ -1914,7 +1912,7 @@ config_create_default ()
}
printf (_("%s: creating default config file...\n"), PACKAGE_NAME);
wee_log_printf (_("Creating default config file\n"));
weechat_log_printf (_("Creating default config file\n"));
current_time = time (NULL);
fprintf (file, _("#\n# %s configuration file, created by "
@@ -2115,7 +2113,7 @@ config_write (char *config_name)
return -1;
}
wee_log_printf (_("Saving config to disk\n"));
weechat_log_printf (_("Saving config to disk\n"));
current_time = time (NULL);
fprintf (file, _("#\n# %s configuration file, created by "