zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-22 18:12:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 2b4e549d44 into 1178f753cf

Browse source
This commit is contained in:
ailin-nemui 2018-03-07 12:16:26 +00:00 • committed by GitHub
commit b6a915c027
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/core/settings.c
View file

@ -47,7 +47,8 @@ static int timeout_tag;
static int config_last_modifycounter; static int config_last_modifycounter;
static time_t config_last_mtime; static time_t config_last_mtime;
static long config_last_size; static long config_last_size;
static unsigned int config_last_checksum; static guint8 *config_last_checksum;
static gsize config_last_checksum_length;
static SETTINGS_REC *settings_get(const char *key, SettingType type) static SETTINGS_REC *settings_get(const char *key, SettingType type)
{ {
@ -661,24 +662,45 @@ void sig_term(int n)
raise(SIGTERM); raise(SIGTERM);
} }
/* Yes, this is my own stupid checksum generator, some "real" algorithm static int file_checksum(const char *fname, const guint8 *old_checksum, gsize old_checksum_length,
would be nice but would just take more space without much real benefit */ guint8 **checksum_out, gsize *checksum_length_out)
static unsigned int file_checksum(const char *fname)
{ {
char buf[512]; GChecksum *c;
int f, ret, n; unsigned char buf[512];
unsigned int checksum = 0; guint8 *checksum;
gsize checksum_length;
int f, ret;
static GChecksumType checksum_type = G_CHECKSUM_SHA1;
if ((c = g_checksum_new(checksum_type)) == NULL) {
return FALSE;
}
f = open(fname, O_RDONLY); f = open(fname, O_RDONLY);
if (f == -1) return 0; if (f == -1)
return FALSE;
n = 0;
while ((ret = read(f, buf, sizeof(buf))) > 0) { while ((ret = read(f, buf, sizeof(buf))) > 0) {
while (ret-- > 0) g_checksum_update(c, buf, ret);
checksum += buf[ret] << ((n++ & 3)*8);
} }
close(f); close(f);
return checksum;
checksum_length = g_checksum_type_get_length(checksum_type);
checksum = g_new0(guint8, checksum_length);
g_checksum_get_digest(c, checksum, &checksum_length);
g_checksum_free(c);
if (checksum_out != NULL && checksum_length_out != NULL) {
g_free(*checksum_out);
*checksum_out = checksum;
*checksum_length_out = checksum_length;
}
if (old_checksum != NULL) {
return old_checksum_length == checksum_length &&
memcmp(checksum, old_checksum, checksum_length) == 0;
}
return TRUE;
} }
static void irssi_config_save_state(const char *fname) static void irssi_config_save_state(const char *fname)
@ -693,7 +715,7 @@ static void irssi_config_save_state(const char *fname)
/* save modify time, file size and checksum */ /* save modify time, file size and checksum */
config_last_mtime = statbuf.st_mtime; config_last_mtime = statbuf.st_mtime;
config_last_size = statbuf.st_size; config_last_size = statbuf.st_size;
config_last_checksum = file_checksum(fname); file_checksum(fname, NULL, 0, &config_last_checksum, &config_last_checksum_length);
} }
int irssi_config_is_changed(const char *fname) int irssi_config_is_changed(const char *fname)
@ -707,8 +729,8 @@ int irssi_config_is_changed(const char *fname)
return FALSE; return FALSE;
return config_last_mtime != statbuf.st_mtime && return config_last_mtime != statbuf.st_mtime &&
(config_last_size != statbuf.st_size || (config_last_size != statbuf.st_size ||
config_last_checksum != file_checksum(fname)); file_checksum(fname, config_last_checksum, config_last_checksum_length, NULL, NULL));
} }
static CONFIG_REC *parse_configfile(const char *fname) static CONFIG_REC *parse_configfile(const char *fname)
@ -906,4 +928,10 @@ void settings_deinit(void)
g_hash_table_destroy(settings); g_hash_table_destroy(settings);
if (mainconfig != NULL) config_close(mainconfig); if (mainconfig != NULL) config_close(mainconfig);
if (config_last_checksum != NULL) {
g_free(config_last_checksum);
config_last_checksum = NULL;
config_last_checksum_length = 0;
}
} }