diff options
Diffstat (limited to 'src/base/archive.c')
| -rw-r--r-- | src/base/archive.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/base/archive.c b/src/base/archive.c index 6aa6254..30956a0 100644 --- a/src/base/archive.c +++ b/src/base/archive.c @@ -1,10 +1,10 @@ - #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <zip.h> +#include "main.h" #include "archive.h" #define ARCHIVE_BUFFER_SIZE 4096 @@ -22,30 +22,27 @@ char *archive_extract_file(char *archive, char *filename) int len; int err; - sprintf(name, "/tmp/tuxanci%d-%s", getpid(), filename); + sprintf(name, "/tmp/tuxanci.%d-%s", getpid(), filename); - //printf("ARCHIVE %s %s %s\n", archive, filename, name); + /*printf("ARCHIVE %s %s %s\n", archive, filename, name);*/ zipArchive = zip_open(archive, 0, &err); - if( zipArchive == NULL ) - { - fprintf(stderr, "Archive not open !\n"); + if (zipArchive == NULL) { + fprintf(stderr, _("[Error] Unable to open archive [%s]\n"), archive); return NULL; } zipFile = zip_fopen(zipArchive, filename, ZIP_FL_UNCHANGED); - if( zipFile == NULL ) - { - fprintf(stderr, "File from archive not open !\n"); + if (zipFile == NULL) { + fprintf(stderr, _("[Error] Unable to extract the file [%s] from archive [%s]\n"), filename, archive); zip_close(zipArchive); return NULL; } - if( (file = fopen(name, "wb") ) == NULL) - { - fprintf(stderr, "No do not create temp file %s\n", name); + if ((file = fopen(name, "wb")) == NULL) { + fprintf(stderr, _("[Error] Unable to create temporary file [%s]\n"), name); zip_fclose(zipFile); zip_close(zipArchive); return NULL; @@ -53,13 +50,12 @@ char *archive_extract_file(char *archive, char *filename) do { len = zip_fread(zipFile, buf, ARCHIVE_BUFFER_SIZE); - //printf("len = %d\n", len); + /*printf("len = %d\n", len);*/ - if( len > 0 ) - { + if (len > 0) { fwrite(buf, len, 1, file); } - } while( len > 0 ); + } while (len > 0); fclose(file); zip_fclose(zipFile); |