aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #734 from trasz/master

Browse Source 
Don't compute log_dir_create_mode in three different places.
This commit is contained in:
LemonBoy 2017-07-30 10:06:38 +02:00 committed by GitHub
commit 663a8e7154
5 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -158,7 +158,7 @@ AC_ARG_ENABLE(true-color,
want_truecolor=no) want_truecolor=no)
AC_ARG_ENABLE(gregex, AC_ARG_ENABLE(gregex,
[ --disable-gregex Build without GRegex (fall back to regex.h)], [ --disable-gregex Build without GRegex (fall back to regex.h)],
if test x$enableval = xno ; then if test x$enableval = xno ; then
want_gregex=no want_gregex=no
else else

5
src/core/log.c
View File

@ -33,6 +33,8 @@
#define DEFAULT_LOG_FILE_CREATE_MODE 600 #define DEFAULT_LOG_FILE_CREATE_MODE 600
GSList *logs; GSList *logs;
int log_file_create_mode;
int log_dir_create_mode;
static const char *log_item_types[] = { static const char *log_item_types[] = {
"target", "target",
@ -42,8 +44,6 @@ static const char *log_item_types[] = {
}; };
static char *log_timestamp; static char *log_timestamp;
static int log_file_create_mode;
static int log_dir_create_mode;
static int rotate_tag; static int rotate_tag;
static int log_item_str2type(const char *type) static int log_item_str2type(const char *type)
@ -562,7 +562,6 @@ static void read_settings(void)
log_timestamp = g_strdup(settings_get_str("log_timestamp")); log_timestamp = g_strdup(settings_get_str("log_timestamp"));
log_file_create_mode = octal2dec(settings_get_int("log_create_mode")); log_file_create_mode = octal2dec(settings_get_int("log_create_mode"));
log_dir_create_mode = log_file_create_mode; log_dir_create_mode = log_file_create_mode;
if (log_file_create_mode & 0400) log_dir_create_mode |= 0100; if (log_file_create_mode & 0400) log_dir_create_mode |= 0100;
if (log_file_create_mode & 0040) log_dir_create_mode |= 0010; if (log_file_create_mode & 0040) log_dir_create_mode |= 0010;

2
src/core/log.h
View File

@ -35,6 +35,8 @@ struct _LOG_REC {
}; };
extern GSList *logs; extern GSList *logs;
extern int log_file_create_mode;
extern int log_dir_create_mode;
/* Create log record - you still need to call log_update() to actually add it /* Create log record - you still need to call log_update() to actually add it
into log list */ into log list */

18
src/core/rawlog.c
View File

@ -20,6 +20,7 @@
#include "module.h" #include "module.h"
#include "rawlog.h" #include "rawlog.h"
#include "log.h"
#include "modules.h" #include "modules.h"
#include "signals.h" #include "signals.h"
#include "commands.h" #include "commands.h"
@ -31,8 +32,6 @@
static int rawlog_lines; static int rawlog_lines;
static int signal_rawlog; static int signal_rawlog;
static int log_file_create_mode;
static int log_dir_create_mode;
RAWLOG_REC *rawlog_create(void) RAWLOG_REC *rawlog_create(void)
{ {
@ -131,8 +130,13 @@ void rawlog_open(RAWLOG_REC *rawlog, const char *fname)
log_file_create_mode); log_file_create_mode);
g_free(path); g_free(path);
if (rawlog->handle == -1) {
g_warning("rawlog open() failed: %s", strerror(errno));
return;
}
rawlog_dump(rawlog, rawlog->handle); rawlog_dump(rawlog, rawlog->handle);
rawlog->logging = rawlog->handle != -1; rawlog->logging = TRUE;
} }
void rawlog_close(RAWLOG_REC *rawlog) void rawlog_close(RAWLOG_REC *rawlog)
@ -140,7 +144,7 @@ void rawlog_close(RAWLOG_REC *rawlog)
if (rawlog->logging) { if (rawlog->logging) {
write_buffer_flush(); write_buffer_flush();
close(rawlog->handle); close(rawlog->handle);
rawlog->logging = 0; rawlog->logging = FALSE;
} }
} }
@ -174,12 +178,6 @@ void rawlog_set_size(int lines)
static void read_settings(void) static void read_settings(void)
{ {
rawlog_set_size(settings_get_int("rawlog_lines")); rawlog_set_size(settings_get_int("rawlog_lines"));
log_file_create_mode = octal2dec(settings_get_int("log_create_mode"));
log_dir_create_mode = log_file_create_mode;
if (log_file_create_mode & 0400) log_dir_create_mode |= 0100;
if (log_file_create_mode & 0040) log_dir_create_mode |= 0010;
if (log_file_create_mode & 0004) log_dir_create_mode |= 0001;
} }
static void cmd_rawlog(const char *data, SERVER_REC *server, void *item) static void cmd_rawlog(const char *data, SERVER_REC *server, void *item)

9
src/fe-common/core/fe-log.c
View File

@ -49,8 +49,6 @@ static THEME_REC *log_theme;
static int skip_next_printtext; static int skip_next_printtext;
static char *log_theme_name; static char *log_theme_name;
static int log_dir_create_mode;
static char **autolog_ignore_targets; static char **autolog_ignore_targets;
static char *log_colorizer_strip(const char *str) static char *log_colorizer_strip(const char *str)
@ -676,7 +674,6 @@ static void sig_theme_destroyed(THEME_REC *theme)
static void read_settings(void) static void read_settings(void)
{ {
int old_autolog = autolog_level; int old_autolog = autolog_level;
int log_file_create_mode;
g_free_not_null(autolog_path); g_free_not_null(autolog_path);
autolog_path = g_strdup(settings_get_str("autolog_path")); autolog_path = g_strdup(settings_get_str("autolog_path"));
@ -704,12 +701,6 @@ static void read_settings(void)
log_theme = log_theme_name == NULL ? NULL : log_theme = log_theme_name == NULL ? NULL :
theme_load(log_theme_name); theme_load(log_theme_name);
log_file_create_mode = octal2dec(settings_get_int("log_create_mode"));
log_dir_create_mode = log_file_create_mode;
if (log_file_create_mode & 0400) log_dir_create_mode |= 0100;
if (log_file_create_mode & 0040) log_dir_create_mode |= 0010;
if (log_file_create_mode & 0004) log_dir_create_mode |= 0001;
if (autolog_ignore_targets != NULL) if (autolog_ignore_targets != NULL)
g_strfreev(autolog_ignore_targets); g_strfreev(autolog_ignore_targets);