Skip to content
Snippets Groups Projects
Unverified Commit 25007269 authored by Pablo Correa Gomez's avatar Pablo Correa Gomez
Browse files

timedated: use a more descriptive name for localtime2

parent 1ecd8c40
Branches main
No related tags found
No related merge requests found
......@@ -109,28 +109,28 @@ static gboolean
set_localtime_file (const gchar *identifier,
GError **error)
{
g_autofree gchar *filebuf = NULL, *localtime_filename = NULL, *localtime2_filename = NULL;
g_autoptr(GFile) localtime2_file = NULL;
g_autofree gchar *filebuf = NULL, *localtime_filename = NULL, *identifier_filename = NULL;
g_autoptr(GFile) identifier_file = NULL;
gsize length = 0;
g_return_val_if_fail (error != NULL, FALSE);
localtime_filename = g_file_get_path (localtime_file);
localtime2_filename = g_strdup_printf (ZONEINFODIR "/%s", identifier);
localtime2_file = g_file_new_for_path (localtime2_filename);
identifier_filename = g_strdup_printf (ZONEINFODIR "/%s", identifier);
identifier_file = g_file_new_for_path (identifier_filename);
if (g_file_test(localtime_filename, G_FILE_TEST_IS_SYMLINK)) {
if (!g_file_delete (localtime_file, NULL, error)) {
g_prefix_error (error, "Unable to delete file to make new symlink %s:", localtime_filename);
return FALSE;
}
if (!g_file_make_symbolic_link (localtime_file, localtime2_filename, NULL, error)) {
g_prefix_error (error, "Unable to create symlink %s -> %s:", localtime_filename, localtime2_filename);
if (!g_file_make_symbolic_link (localtime_file, identifier_filename, NULL, error)) {
g_prefix_error (error, "Unable to create symlink %s -> %s:", localtime_filename, identifier_filename);
return FALSE;
}
} else if (g_file_test(localtime_filename, G_FILE_TEST_IS_REGULAR)) {
if (!g_file_load_contents (localtime2_file, NULL, &filebuf, &length, NULL, error)) {
g_prefix_error (error, "Unable to read '%s':", localtime2_filename);
if (!g_file_load_contents (identifier_file, NULL, &filebuf, &length, NULL, error)) {
g_prefix_error (error, "Unable to read '%s':", identifier_filename);
return FALSE;
}
if (!g_file_replace_contents (localtime_file, filebuf, length, NULL, FALSE, 0, NULL, NULL, error)) {
......@@ -142,8 +142,8 @@ set_localtime_file (const gchar *identifier,
}
} else {
// File doesn't exist yet -> make a new symlink
if (!g_file_make_symbolic_link (localtime_file, localtime2_filename, NULL, error)) {
g_prefix_error (error, "Unable to create symlink %s -> %s:", localtime_filename, localtime2_filename);
if (!g_file_make_symbolic_link (localtime_file, identifier_filename, NULL, error)) {
g_prefix_error (error, "Unable to create symlink %s -> %s:", localtime_filename, identifier_filename);
return FALSE;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment