fsck.c: Improve log messages.

[paraslash.git] / osl.c

diff --git a/osl.c b/osl.c
index 7b4f91f59470089182b21b62d57a0bad5e324e54..41318976963e92fbe8fec2618aa10775734dc59a 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -179,7 +179,7 @@ int for_each_file_in_dir(const char *dirname,
        int cwd_fd, ret2, ret = para_opendir(dirname, &dir, &cwd_fd);
 
        if (ret < 0)
        int cwd_fd, ret2, ret = para_opendir(dirname, &dir, &cwd_fd);
 
        if (ret < 0)

-               return ret == -E_CHDIR_PERM? 1 : ret;
+               return ret == -ERRNO_TO_PARA_ERROR(EACCES)? 1 : ret;

        /* scan cwd recursively */
        while ((entry = readdir(dir))) {
                mode_t m;
        /* scan cwd recursively */
        while ((entry = readdir(dir))) {
                mode_t m;


@@ -1575,7 +1575,7 @@ int osl_del_row(struct osl_table *t, struct osl_row *row)
                        mark_mapped_object_invalid(t, r->num, i);
                        continue;
                }
                        mark_mapped_object_invalid(t, r->num, i);
                        continue;
                }

-               if (st == OSL_NO_STORAGE)
+               if (st == OSL_NO_STORAGE && !(cd->storage_flags & OSL_DONT_FREE))

                        free(r->volatile_objects[col->volatile_num].data);
        }
        if (t->num_mapped_columns) {
                        free(r->volatile_objects[col->volatile_num].data);
        }
        if (t->num_mapped_columns) {


@@ -2013,8 +2013,17 @@ int osl_get_nth_row(const struct osl_table *t, unsigned col_num,
 {
        struct osl_column *col;
        struct rb_node *node;
 {
        struct osl_column *col;
        struct rb_node *node;

-       int ret = check_rbtree_col(t, col_num, &col);
+       unsigned num_rows;
+       int ret;

 
 

+       if (n == 0)
+               return -E_RB_KEY_NOT_FOUND;
+       ret = osl_get_num_rows(t, &num_rows);
+       if (ret < 0)
+               return ret;
+       if (n > num_rows)
+               return -E_RB_KEY_NOT_FOUND;
+       ret = check_rbtree_col(t, col_num, &col);

        if (ret < 0)
                return ret;
        node = rb_nth(col->rbtree.rb_node, n);
        if (ret < 0)
                return ret;
        node = rb_nth(col->rbtree.rb_node, n);