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

Simplified read_password_file function using g_file_get_contents()

Browse source
This commit is contained in:
Jari Matilainen 2016-10-26 15:12:44 +02:00
commit 0ef1dceec0
1 changed files with 4 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/irc/core/irc-servers-setup.c
View file

@ -36,37 +36,21 @@ static void read_password_file(char *str, char **password)
{ {
char **values = g_strsplit(str, ":", -1); char **values = g_strsplit(str, ":", -1);
char *path; char *path;
GIOChannel *handle;
GString *buf;
GError *err = NULL; GError *err = NULL;
gsize tpos;
path = g_strdup(values[1]); path = g_strdup(values[1]);
if (!g_str_has_prefix(path, "/")) if (!g_str_has_prefix(path, "/"))
path = g_strdup_printf("%s/%s", get_irssi_dir(), path); path = g_strdup_printf("%s/%s", get_irssi_dir(), path);
handle = g_io_channel_new_file(path, "r", &err);
g_free(path);
g_strfreev(values);
if (handle == NULL) { if (!g_file_get_contents(path, password, NULL, &err)) {
/* file not found */
g_warning("Could not read sasl password from file: %s", (err ? err->message : "No GError set")); g_warning("Could not read sasl password from file: %s", (err ? err->message : "No GError set"));
g_error_free(err);
*password = g_strdup(""); *password = g_strdup("");
return;
}
g_io_channel_set_encoding(handle, NULL, NULL);
buf = g_string_sized_new(64);
if (g_io_channel_read_line_string(handle, buf, &tpos, NULL) == G_IO_STATUS_NORMAL) {
buf->str[tpos] = '\0';
*password = g_strdup(buf->str);
} }
else else
*password = g_strdup(""); *password = g_strchomp(*password);
g_string_free(buf, TRUE); g_free(path);
g_io_channel_unref(handle); g_error_free(err);
} }
/* Fill information to connection from server setup record */ /* Fill information to connection from server setup record */