libburnia
/
libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Simplify function to recursively add a directory.

release-1.5.4.branch
Vreixo Formoso 14 years ago
parent
a86d6219ba
commit
a076ae9df2
5 changed files with 98 additions and 126 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/builder.c
  2. 3
      src/error.h
  3. 4
      src/filesrc.c
  4. 20
      src/image.h
  5. 190
      src/tree.c

7
src/builder.c
View File

@ -10,7 +10,6 @@
#include "error.h"
#include "node.h"
#include "fsource.h"
#include "image.h"
#include <stdlib.h>
#include <string.h>
@ -96,10 +95,8 @@ int default_create_node(IsoNodeBuilder *builder, IsoImage *image,
return ISO_NULL_POINTER;
}
name = iso_file_source_get_name(src);
/* get info about source */
if (image->recOpts.follow_symlinks) {
if (iso_tree_get_follow_symlinks(image)) {
result = iso_file_source_stat(src, &info);
} else {
result = iso_file_source_lstat(src, &info);
@ -108,7 +105,9 @@ int default_create_node(IsoNodeBuilder *builder, IsoImage *image,
return result;
}
name = iso_file_source_get_name(src);
new = NULL;
switch (info.st_mode & S_IFMT) {
case S_IFREG:
{

3
src/error.h
View File

@ -21,6 +21,9 @@
#define ISO_INTERRUPTED -5
#define ISO_WRONG_ARG_VALUE -6
/* canceled by user */
#define ISO_ABORT -7
#define ISO_WRITE_ERROR -10
#define ISO_THREAD_ERROR -11

4
src/filesrc.c
View File

@ -272,8 +272,8 @@ int filesrc_writer_write_data(IsoImageWriter *writer)
* 0's to image
*/
char *name = iso_stream_get_name(file->stream);
iso_msg_sorry(t->image->id, LIBISO_FILE_CANT_WRITE,
"File \"%s\" can't be opened. Filling with 0s.", name);
iso_msg_sorry(t->image->id, LIBISO_FILE_CANT_WRITE, "File \"%s\" "
"can't be opened (error %d). Filling with 0s.", name, res);
free(name);
memset(buffer, 0, BLOCK_SIZE);
for (b = 0; b < nblocks; ++b) {

20
src/image.h
View File

@ -68,23 +68,19 @@ struct Iso_Image_Rec_Opts
*/
enum iso_replace_mode replace;
/* TODO
enum iso_replace_mode (*confirm_replace)(IsoFileSource *src, IsoNode *node);
*/
/**
* When this is not NULL, it is a pointer to a function that will
* be called just before a file will be added, or when an error occurs.
* You can overwrite some of the above options by returning suitable
* values.
* be called just before a file will be added. You can control where
* the file will be in fact added or ignored.
*
* @param action
* 1 file will be added
* 2 file will be skipped
* < 0 error adding file (return 3 to stop, 1 to continue)
* @param flag
* 0 no problem
* 1 file with same name already exists
* @return
* 1 add/continue, 2 skip, 3 stop
* 1 add, 0 ignore, < 0 cancel
*/
int (*report)(IsoFileSource *src, int action, int flag);
int (*report)(IsoFileSource *src);
};
struct Iso_Image

190
src/tree.c
View File

@ -468,16 +468,10 @@ int check_hidden(IsoImage *image, const char *name)
}
static
int check_special(IsoImage *image, IsoFileSource *file)
int check_special(IsoImage *image, mode_t mode)
{
if (image->recOpts.ignore_special != 0) {
struct stat info;
int ret;
ret = iso_file_source_lstat(file, &info);
if (ret < 0) {
return 0; /* TODO what to do here */
}
switch(info.st_mode & S_IFMT) {
switch(mode & S_IFMT) {
case S_IFBLK:
return image->recOpts.ignore_special & 0x08 ? 1 : 0;
case S_IFCHR:
@ -501,140 +495,120 @@ int check_special(IsoImage *image, IsoFileSource *file)
*/
int iso_add_dir_src_rec(IsoImage *image, IsoDir *parent, IsoFileSource *dir)
{
int result;
int action; /* 1 add, 2 skip, 3 stop, < 0 error */
int ret;
IsoNodeBuilder *builder;
IsoFileSource *file;
IsoNode **pos;
struct stat info;
char *name, *path;
IsoNode *new;
enum iso_replace_mode replace;
result = iso_file_source_open(dir);
if (result < 0) {
ret = iso_file_source_open(dir);
if (ret < 0) {
char *path = iso_file_source_get_path(dir);
iso_msg_debug(image->id, "Can't open dir %s", path);
free(path);
return result;
return ret;
}
builder = image->builder;
action = 1;
while ( (result = iso_file_source_readdir(dir, &file)) == 1) {
int flag;
char *name, *path;
IsoNode *new;
/* iterate over all directory children */
while (1) {
int skip = 0;
ret = iso_file_source_readdir(dir, &file);
if (ret <= 0) {
if (ret < 0) {
/* error reading dir */
iso_msg_sorry(image->id, LIBISO_CANT_READ_FILE,
"Error reading dir");
}
break;
}
name = iso_file_source_get_name(file);
path = iso_file_source_get_path(file);
name = strrchr(path, '/') + 1;
if (image->recOpts.follow_symlinks) {
ret = iso_file_source_stat(file, &info);
} else {
ret = iso_file_source_lstat(file, &info);
}
if (ret < 0) {
goto dir_rec_continue;
}
if (check_excludes(image, path)) {
iso_msg_debug(image->id, "Skipping excluded file %s", path);
action = 2;
skip = 1;
} else if (check_hidden(image, name)) {
iso_msg_debug(image->id, "Skipping hidden file %s", path);
action = 2;
} else if (check_special(image, file)) {
skip = 1;
} else if (check_special(image, info.st_mode)) {
iso_msg_debug(image->id, "Skipping special file %s", path);
action = 2;
} else {
iso_msg_debug(image->id, "Adding file %s", path);
action = 1;
skip = 1;
}
free(path);
/* find place where to insert */
flag = 0;
if (iso_dir_exists(parent, name, &pos)) {
flag = 1;
if (action == 1 && image->recOpts.replace == ISO_REPLACE_NEVER) {
action = 2;
}
if (skip) {
goto dir_rec_continue;
}
/* name no more needed */
free(name);
/* ask user if callback has been set */
if (image->recOpts.report) {
action = image->recOpts.report(file, action, flag);
}
replace = image->recOpts.replace;
if (action == 2) {
/* find place where to insert */
ret = iso_dir_exists(parent, name, &pos);
/* TODO
* if (ret && replace == ISO_REPLACE_ASK) {
* replace = /....
* }
*/
/* chek if we must insert or not */
/* TODO check for other replace behavior */
if (ret && (replace == ISO_REPLACE_NEVER)) {
/* skip file */
iso_file_source_unref(file);
continue;
} else if (action == 3) {
/* stop */
iso_file_source_unref(file);
break;
goto dir_rec_continue;
}
/* ok, file will be added */
result = builder->create_node(builder, image, file, &new);
if (result < 0) {
char *path = iso_file_source_get_path(file);
iso_msg_note(image->id, LIBISO_FILE_IGNORED,
"Error %d when adding file %s", result, path);
free(path);
if (image->recOpts.report) {
action = image->recOpts.report(file, result, flag);
} else {
action = image->recOpts.stop_on_error ? 3 : 1;
}
/* free file */
iso_file_source_unref(file);
if (action == 3) {
result = 1; /* prevent error to be passing up */
break;
} else {
/* TODO check that action is 1!!! */
continue;
/* if we are here we must insert. Give user a chance for cancel */
if (image->recOpts.report) {
int r = image->recOpts.report(file);
if (r <= 0) {
ret = (r < 0 ? ISO_ABORT : ISO_SUCCESS);
goto dir_rec_continue;
}
}
ret = builder->create_node(builder, image, file, &new);
if (ret < 0) {
iso_msg_note(image->id, LIBISO_FILE_IGNORED,
"Error %d when adding file %s", ret, path);
goto dir_rec_continue;
} else {
iso_msg_debug(image->id, "Adding file %s", path);
}
/* ok, node has correctly created, we need to add it */
iso_dir_insert(parent, new, pos, flag ? ISO_REPLACE_ALWAYS :
ISO_REPLACE_NEVER);
iso_dir_insert(parent, new, pos, replace);
/* finally, if the node is a directory we need to recurse */
if (new->type == LIBISO_DIR) {
result = iso_add_dir_src_rec(image, (IsoDir*)new, file);
iso_file_source_unref(file);
if (result < 0) {
/* error */
if (image->recOpts.stop_on_error) {
action = 3; /* stop */
result = 1; /* prevent error to be passing up */
break;
}
} else if (result == 0) {
/* stop */
action = 3;
break;
}
} else {
iso_file_source_unref(file);
if (new->type == LIBISO_DIR && S_ISDIR(info.st_mode)) {
ret = iso_add_dir_src_rec(image, (IsoDir*)new, file);
}
}
if (result < 0) {
/* error reading dir, should never occur */
iso_msg_sorry(image->id, LIBISO_CANT_READ_FILE, "Error reading dir");
action = result;
}
dir_rec_continue:;
free(path);
iso_file_source_unref(file);
/* TODO check for error severity to decide what to do */
if (ret == ISO_ABORT || (ret < 0 && image->recOpts.stop_on_error)) {
break;
}
} /* while */
result = iso_file_source_close(dir);
if (result < 0) {
return result;
}
if (action < 0) {
return action; /* error */
} else if (action == 3) {
return 0; /* stop */
} else {
return 1; /* continue */
}
iso_file_source_close(dir);
return ret;
}
int iso_tree_add_dir_rec(IsoImage *image, IsoDir *parent, const char *dir)

Write Preview
Loading…
Cancel
Save