-/* vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: */
-
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2008 Michael Rasmussen and the Claws Mail Team
+ * Copyright (C) 1999-2016 Michael Rasmussen and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
# include "archiver.h"
# include "utils.h"
# include "mainwindow.h"
-# include "folder.h"
+# include "folder.h"
#endif
#include <sys/types.h>
gdate = g_date_new();
parts = g_strsplit(date, "-", 3);
- if (! is_iso_string(parts))
- return NULL;
if (!parts)
return NULL;
+ if (! is_iso_string(parts))
+ return NULL;
for (i = 0; i < 3; i++) {
int t = atoi(parts[i]);
switch (i) {
debug_print("Cut-off date: %s\n", before);
if ((date = iso2GDate(before)) == NULL) {
- g_warning("Bad date format: %s\n", before);
+ g_warning("Bad date format: %s", before);
return FALSE;
}
}
if (! g_date_valid(file_t)) {
- g_warning("Invalid msg date\n");
+ g_warning("Invalid msg date");
return FALSE;
}
}
static gchar* strip_leading_dot_slash(gchar* path) {
- gchar* stripped = path;
- gchar* result = NULL;
+ if (path && strlen(path) > 1 && path[0] == '.' && path[1] == '/')
+ return g_strdup(&(path[2]));
- if (stripped && stripped[0] == '.') {
- ++stripped;
- if (stripped && stripped[0] == '/')
- ++stripped;
- result = g_strdup(stripped);
- }
- else
- result = g_strdup(path);
- return result;
+ return g_strdup(path);
}
static gchar* get_full_path(struct file_info* file) {
#endif
void archive_add_file(gchar* path) {
- struct file_info* file = archive_new_file_info();
+ struct file_info* file;
gchar* filename = NULL;
g_return_if_fail(path != NULL);
#endif
filename = g_strrstr_len(path, strlen(path), "/");
if (! filename)
- g_warning("%s\n", path);
+ g_warning("no filename in path '%s'", path);
g_return_if_fail(filename != NULL);
filename++;
+ file = archive_new_file_info();
file->name = g_strdup(filename);
file->path = strip_leading_dot_slash(dirname(path));
archive_add_to_list(file);
in = archive_read_new();
if ((res = archive_read_support_format_tar(in)) == ARCHIVE_OK) {
if ((res = archive_read_support_compression_gzip(in)) == ARCHIVE_OK) {
+#if ARCHIVE_VERSION_NUMBER < 3000000
if ((res = archive_read_open_file(
+#else
+ if ((res = archive_read_open_filename(
+#endif
in, archive_name, READ_BLOCK_SIZE)) != ARCHIVE_OK) {
- buf = g_strdup_printf(
- "%s: %s\n", archive_name, archive_error_string(in));
- g_warning("%s\n", buf);
- g_free(buf);
+ g_warning("%s: %s", archive_name, archive_error_string(in));
result = archive_error_string(in);
}
else {
out, flags)) == ARCHIVE_OK) {
res = archive_read_next_header(in, &entry);
while (res == ARCHIVE_OK) {
- fprintf(stdout, "%s\n", archive_entry_pathname(entry));
res = archive_write_header(out, entry);
if (res != ARCHIVE_OK) {
- buf = g_strdup_printf("%s\n",
- archive_error_string(out));
- g_warning("%s\n", buf);
- g_free(buf);
+ g_warning("%s", archive_error_string(out));
/* skip this file an continue */
res = ARCHIVE_OK;
}
else {
res = archive_copy_data(in, out);
if (res != ARCHIVE_OK) {
- buf = g_strdup_printf("%s\n",
- archive_error_string(in));
- g_warning("%s\n", buf);
- g_free(buf);
+ g_warning("%s", archive_error_string(in));
/* skip this file an continue */
res = ARCHIVE_OK;
}
if (res == ARCHIVE_EOF)
res = ARCHIVE_OK;
if (res != ARCHIVE_OK) {
- buf = g_strdup_printf("%s\n", archive_error_string(in));
- if (*buf == '\n') {
- g_free(buf);
- buf = g_strdup_printf("%s: Unknown error\n", archive_name);
- }
- g_warning("%s\n", buf);
- g_free(buf);
- result = archive_error_string(in);
+ gchar *e = archive_error_string(in);
+ g_warning("%s: %s", archive_name, e? e: "unknown error");
+ result = e;
}
}
else
result = archive_error_string(out);
archive_read_close(in);
}
+#if ARCHIVE_VERSION_NUMBER < 3000000
archive_read_finish(in);
+#else
+ archive_read_free(in);
+#endif
}
else
result = archive_error_string(in);
debug_print("File: %s\n", archive_name);
arch = archive_write_new();
switch (method) {
- case ZIP:
+ case GZIP:
+#if ARCHIVE_VERSION_NUMBER < 3000000
if (archive_write_set_compression_gzip(arch) != ARCHIVE_OK)
+#else
+ if (archive_write_add_filter_gzip(arch) != ARCHIVE_OK)
+#endif
return archive_error_string(arch);
break;
case BZIP2:
+#if ARCHIVE_VERSION_NUMBER < 3000000
if (archive_write_set_compression_bzip2(arch) != ARCHIVE_OK)
+#else
+ if (archive_write_add_filter_bzip2(arch) != ARCHIVE_OK)
+#endif
return archive_error_string(arch);
break;
-#if NEW_ARCHIVE_API
case COMPRESS:
+#if ARCHIVE_VERSION_NUMBER < 3000000
if (archive_write_set_compression_compress(arch) != ARCHIVE_OK)
+#else
+ if (archive_write_add_filter_compress(arch) != ARCHIVE_OK)
+#endif
return archive_error_string(arch);
break;
+#if ARCHIVE_VERSION_NUMBER >= 2006990
+ case LZMA:
+#if ARCHIVE_VERSION_NUMBER < 3000000
+ if (archive_write_set_compression_lzma(arch) != ARCHIVE_OK)
+#else
+ if (archive_write_add_filter_lzma(arch) != ARCHIVE_OK)
+#endif
+ return archive_error_string(arch);
+ break;
+ case XZ:
+#if ARCHIVE_VERSION_NUMBER < 3000000
+ if (archive_write_set_compression_xz(arch) != ARCHIVE_OK)
+#else
+ if (archive_write_add_filter_xz(arch) != ARCHIVE_OK)
+#endif
+ return archive_error_string(arch);
+ break;
+#endif
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+ case LZIP:
+ if (archive_write_add_filter_lzip(arch) != ARCHIVE_OK)
+ return archive_error_string(arch);
+ break;
+#endif
+#if ARCHIVE_VERSION_NUMBER >= 3001000
+ case LRZIP:
+ if (archive_write_add_filter_lrzip(arch) != ARCHIVE_OK)
+ return archive_error_string(arch);
+ break;
+ case LZOP:
+ if (archive_write_add_filter_lzop(arch) != ARCHIVE_OK)
+ return archive_error_string(arch);
+ break;
+ case GRZIP:
+ if (archive_write_add_filter_grzip(arch) != ARCHIVE_OK)
+ return archive_error_string(arch);
+ break;
+#endif
+#if ARCHIVE_VERSION_NUMBER >= 3001900
+ case LZ4:
+ if (archive_write_add_filter_lz4(arch) != ARCHIVE_OK)
+ return archive_error_string(arch);
+ break;
#endif
case NO_COMPRESS:
+#if ARCHIVE_VERSION_NUMBER < 3000000
if (archive_write_set_compression_none(arch) != ARCHIVE_OK)
+#else
+ if (archive_write_add_filter_none(arch) != ARCHIVE_OK)
+#endif
return archive_error_string(arch);
break;
}
case NO_FORMAT:
return "Missing archive format";
}
+#if ARCHIVE_VERSION_NUMBER < 3000000
if (archive_write_open_file(arch, archive_name) != ARCHIVE_OK)
+#else
+ if (archive_write_open_filename(arch, archive_name) != ARCHIVE_OK)
+#endif
return archive_error_string(arch);
while (files && ! stop_action) {
filename = get_full_path(file);
/* libarchive will crash if instructed to add archive to it self */
if (g_utf8_collate(archive_name, filename) == 0) {
- buf = NULL;
- buf = g_strdup_printf(
- "%s: Not dumping to %s", archive_name, filename);
- g_warning("%s\n", buf);
+ g_warning("%s: not dumping to '%s'", archive_name, filename);
#ifndef _TEST
- debug_print("%s\n", buf);
+ debug_print("%s: not dumping to '%s'\n", archive_name, filename);
#endif
- g_free(buf);
}
else {
#ifndef _TEST
g_free(msg);
#endif
entry = archive_entry_new();
- lstat(filename, &st);
if ((fd = open(filename, O_RDONLY)) == -1) {
perror("open file");
}
else {
+ lstat(filename, &st);
archive_entry_copy_stat(entry, &st);
archive_entry_set_pathname(entry, filename);
if (S_ISLNK(st.st_mode)) {
stop_action = FALSE;
#endif
archive_write_close(arch);
+#if ARCHIVE_VERSION_NUMBER < 3000000
archive_write_finish(arch);
+#else
+ archive_write_free(arch);
+#endif
return NULL;
}
#ifdef _TEST
void archive_scan_folder(const char* dir) {
- struct stat st;
+ GStatBuf st;
DIR* root;
struct dirent* ent;
gchar cwd[PATH_MAX];
projects / claws.git / blobdiff