1.1 --- a/libe2access/host/e2access.c Thu Feb 17 19:42:31 2022 +0100
1.2 +++ b/libe2access/host/e2access.c Thu Feb 17 22:12:53 2022 +0100
1.3 @@ -230,7 +230,7 @@
1.4 {
1.5 /* Only a non-existent file in an existing directory is permitted. */
1.6
1.7 - if (!_image_isdir(fs, ino_target) || !path_is_leafname(target_remaining))
1.8 + if (!image_isdir_by_inode(fs, ino_target) || !path_is_leafname(target_remaining))
1.9 {
1.10 fprintf(stderr, "Target not found: %s\n", target);
1.11 return 1;
1.12 @@ -241,7 +241,7 @@
1.13 }
1.14 else
1.15 {
1.16 - target_is_file = _image_isfile(fs, ino_target);
1.17 + target_is_file = image_isfile_by_inode(fs, ino_target);
1.18 target_is_new = 0;
1.19 }
1.20
1.21 @@ -255,7 +255,7 @@
1.22 return 1;
1.23 }
1.24 }
1.25 - else if (!_image_isdir(fs, ino_target))
1.26 + else if (!image_isdir_by_inode(fs, ino_target))
1.27 {
1.28 fprintf(stderr, "Target is not a directory: %s\n", target);
1.29 return 1;
1.30 @@ -397,7 +397,7 @@
1.31
1.32 for (i = 0; i < argc - 1; i++)
1.33 {
1.34 - if (!image_isfile(fs, argv[i]))
1.35 + if (!image_isfile_by_path(fs, argv[i]))
1.36 {
1.37 fprintf(stderr, "Source is not a file: %s\n", argv[i]);
1.38 return 1;
1.39 @@ -509,7 +509,7 @@
1.40
1.41 /* Detect missing objects. */
1.42
1.43 - if ((!*path) || !image_exists(fs, path))
1.44 + if ((!*path) || image_find_by_path(fs, path, &ino))
1.45 {
1.46 fprintf(stderr, "Not found: %s\n", path);
1.47 return 1;
1.48 @@ -519,7 +519,7 @@
1.49
1.50 if (dir_only)
1.51 {
1.52 - if (!image_isdir(fs, path))
1.53 + if (!image_isdir_by_inode(fs, ino))
1.54 {
1.55 fprintf(stderr, "Not a directory: %s\n", path);
1.56 return 1;
1.57 @@ -527,7 +527,7 @@
1.58
1.59 /* Test for an empty directory. */
1.60
1.61 - if (image_dir_empty_by_path(fs, path, &ino))
1.62 + if (image_dir_empty_by_inode(fs, ino))
1.63 {
1.64 fprintf(stderr, "Directory not empty: %s\n", path);
1.65 return 1;
1.66 @@ -536,7 +536,7 @@
1.67
1.68 /* Otherwise, insist on a non-directory. */
1.69
1.70 - else if (image_isdir_by_path(fs, path, &ino))
1.71 + else if (image_isdir_by_inode(fs, ino))
1.72 {
1.73 fprintf(stderr, "Cannot remove a directory: %s\n", path);
1.74 return 1;