aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

use gio functions for file copy

Browse Source
This commit is contained in:
Philip Flohr 2018-05-07 19:41:47 +02:00 committed by Dmitry Podgorny
parent 2795dc487c
commit e4ddced420
3 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/common.c
View File

@ -46,6 +46,7 @@
#include <curl/curl.h>
#include <curl/easy.h>
#include <glib.h>
#include <gio/gio.h>
#ifdef HAVE_NCURSESW_NCURSES_H
#include <ncursesw/ncurses.h>
@ -105,28 +106,22 @@ mkdir_recursive(const char *dir)
}
gboolean
copy_file(const char *const sourcepath, const char *const targetpath)
copy_file(const char *const sourcepath, const char *const targetpath, const gboolean overwrite_existing)
{
int ch;
FILE *source = fopen(sourcepath, "rb");
if (source == NULL) {
return FALSE;
GFile *source = g_file_new_for_path(sourcepath);
GFile *dest = g_file_new_for_path(targetpath);
GError *error = NULL;
gboolean success = false;
if (overwrite_existing)
{
success = g_file_copy (source, dest, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error);
}
else
{
success = g_file_copy (source, dest, G_FILE_COPY_NONE, NULL, NULL, NULL, &error);
}
FILE *target = fopen(targetpath, "wb");
if (target == NULL) {
fclose(source);
return FALSE;
}
while((ch = fgetc(source)) != EOF) {
fputc(ch, target);
}
fclose(source);
fclose(target);
return TRUE;
return success;
}
char*

2
src/common.h
View File

@ -82,7 +82,7 @@ typedef enum {
gboolean create_dir(char *name);
gboolean mkdir_recursive(const char *dir);
gboolean copy_file(const char *const src, const char *const target);
gboolean copy_file(const char *const src, const char *const target, const gboolean overwrite_existing);
char* str_replace(const char *string, const char *substr, const char *replacement);
int str_contains(const char str[], int size, char ch);
gboolean strtoi_range(char *str, int *saveptr, int min, int max, char **err_msg);

3
src/plugins/plugins.c
View File

@ -184,13 +184,12 @@ plugins_install(const char *const plugin_name, const char *const filename, GStri
return FALSE;
}
gboolean result = copy_file(filename, target_path->str);
gboolean result = copy_file(filename, target_path->str, false);
g_string_free(target_path, TRUE);
if (result) {
result = plugins_load(plugin_name);
}
return result;
}