Bump version to v2.1

Found during testing, the issue was with lfs_migrate in combination with
wear leveling.

Normally, we can expect lfs_migrate to be able to respect the user-configured
block_cycles. It already has allocation information on which blocks are
used by both v1 and v2, so it should be safe to relocate blocks as
needed.

However, this fell apart when root was relocated. If lfs_migrate found a
root that needed migration, it would happily relocate the root. This
would normally be fine, except relocating the root has a side-effect of
needed to update the superblock. Which, during migration, is in a
delicate state of containing both v1's and v2's superblocks in the same
metadata pair. If the superblock ends up needing to compact, this would
clobber the v1 superblock and corrupt the filesystem during migration.

The best fix I could come up with is to specifically dissallow migrating the
root directory during migration. Fortunately this is behind the
LFS_MIGRATE macro, so the code cost for this check is not normally paid.

.gitignore

@@ -5,5 +5,5 @@
 
 # Testing things
 blocks/
-lfs2
+lfs
 test.c

.travis.yml

@@ -18,17 +18,29 @@ script:
   - make test QUIET=1
 
   # run tests with a few different configurations
-  - make test QUIET=1 CFLAGS+="-DLFS2_READ_SIZE=1      -DLFS2_CACHE_SIZE=4"
-  - make test QUIET=1 CFLAGS+="-DLFS2_READ_SIZE=512    -DLFS2_CACHE_SIZE=512 -DLFS2_BLOCK_CYCLES=16"
-  - make test QUIET=1 CFLAGS+="-DLFS2_BLOCK_COUNT=1023 -DLFS2_LOOKAHEAD_SIZE=256"
+  - make test QUIET=1 CFLAGS+="-DLFS_READ_SIZE=1      -DLFS_CACHE_SIZE=4"
+  - make test QUIET=1 CFLAGS+="-DLFS_READ_SIZE=512    -DLFS_CACHE_SIZE=512 -DLFS_BLOCK_CYCLES=16"
+  - make test QUIET=1 CFLAGS+="-DLFS_BLOCK_COUNT=1023 -DLFS_LOOKAHEAD_SIZE=256"
 
-  - make clean test QUIET=1 CFLAGS+="-DLFS2_INLINE_MAX=0"
-  - make clean test QUIET=1 CFLAGS+="-DLFS2_NO_INTRINSICS"
+  - make clean test QUIET=1 CFLAGS+="-DLFS_INLINE_MAX=0"
+  - make clean test QUIET=1 CFLAGS+="-DLFS_EMUBD_ERASE_VALUE=0xff"
+  - make clean test QUIET=1 CFLAGS+="-DLFS_NO_INTRINSICS"
+
+  # additional configurations that don't support all tests (this should be
+  # fixed but at the moment it is what it is)
+  - make test_files QUIET=1
+        CFLAGS+="-DLFS_READ_SIZE=1 -DLFS_BLOCK_SIZE=4096"
+  - make test_files QUIET=1
+        CFLAGS+="-DLFS_READ_SIZE=\(2*1024\) -DLFS_BLOCK_SIZE=\(64*1024\)"
+  - make test_files QUIET=1
+        CFLAGS+="-DLFS_READ_SIZE=\(8*1024\) -DLFS_BLOCK_SIZE=\(64*1024\)"
+  - make test_files QUIET=1
+        CFLAGS+="-DLFS_READ_SIZE=11 -DLFS_BLOCK_SIZE=704"
 
   # compile and find the code size with the smallest configuration
   - make clean size
-        OBJ="$(ls lfs2*.o | tr '\n' ' ')"
-        CFLAGS+="-DLFS2_NO_ASSERT -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR"
+        OBJ="$(ls lfs*.o | tr '\n' ' ')"
+        CFLAGS+="-DLFS_NO_ASSERT -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR"
         | tee sizes
 
   # update status if we succeeded, compare with master if possible
@@ -36,7 +48,7 @@ script:
     if [ "$TRAVIS_TEST_RESULT" -eq 0 ]
     then
         CURR=$(tail -n1 sizes | awk '{print $1}')
-        PREV=$(curl -u $GEKY_BOT_STATUSES https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
+        PREV=$(curl -u "$GEKY_BOT_STATUSES" https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
             | jq -re "select(.sha != \"$TRAVIS_COMMIT\")
                 | .statuses[] | select(.context == \"$STAGE/$NAME\").description
                 | capture(\"code size is (?<size>[0-9]+)\").size" \
@@ -66,7 +78,10 @@ jobs:
         - CC="arm-linux-gnueabi-gcc --static -mthumb"
         - EXEC="qemu-arm"
       install:
-        - sudo apt-get install gcc-arm-linux-gnueabi qemu-user
+        - sudo apt-get install
+              gcc-arm-linux-gnueabi
+              libc6-dev-armel-cross
+              qemu-user
         - arm-linux-gnueabi-gcc --version
         - qemu-arm -version
 
@@ -78,7 +93,10 @@ jobs:
         - CC="powerpc-linux-gnu-gcc --static"
         - EXEC="qemu-ppc"
       install:
-        - sudo apt-get install gcc-powerpc-linux-gnu qemu-user
+        - sudo apt-get install
+              gcc-powerpc-linux-gnu
+              libc6-dev-powerpc-cross
+              qemu-user
         - powerpc-linux-gnu-gcc --version
         - qemu-ppc -version
 
@@ -90,76 +108,182 @@ jobs:
         - CC="mips-linux-gnu-gcc --static"
         - EXEC="qemu-mips"
       install:
-        - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ xenial main universe"
-        - sudo apt-get -qq update
-        - sudo apt-get install gcc-mips-linux-gnu qemu-user
+        - sudo apt-get install
+              gcc-mips-linux-gnu
+              libc6-dev-mips-cross
+              qemu-user
         - mips-linux-gnu-gcc --version
         - qemu-mips -version
 
-      # Automatically update releases
+    # self-host with littlefs-fuse for fuzz test
+    - stage: test
+      env:
+        - STAGE=test
+        - NAME=littlefs-fuse
+      if: branch !~ -prefix$
+      install:
+        - sudo apt-get install libfuse-dev
+        - git clone --depth 1 https://github.com/geky/littlefs-fuse -b v2
+        - fusermount -V
+        - gcc --version
+      before_script:
+        # setup disk for littlefs-fuse
+        - rm -rf littlefs-fuse/littlefs/*
+        - cp -r $(git ls-tree --name-only HEAD) littlefs-fuse/littlefs
+
+        - mkdir mount
+        - sudo chmod a+rw /dev/loop0
+        - dd if=/dev/zero bs=512 count=4096 of=disk
+        - losetup /dev/loop0 disk
+      script:
+        # self-host test
+        - make -C littlefs-fuse
+
+        - littlefs-fuse/lfs --format /dev/loop0
+        - littlefs-fuse/lfs /dev/loop0 mount
+
+        - ls mount
+        - mkdir mount/littlefs
+        - cp -r $(git ls-tree --name-only HEAD) mount/littlefs
+        - cd mount/littlefs
+        - stat .
+        - ls -flh
+        - make -B test_dirs test_files QUIET=1
+
+    # self-host with littlefs-fuse for fuzz test
+    - stage: test
+      env:
+        - STAGE=test
+        - NAME=littlefs-migration
+      if: branch !~ -prefix$
+      install:
+        - sudo apt-get install libfuse-dev
+        - git clone --depth 1 https://github.com/geky/littlefs-fuse -b v2 v2
+        - git clone --depth 1 https://github.com/geky/littlefs-fuse -b v1 v1
+        - fusermount -V
+        - gcc --version
+      before_script:
+        # setup disk for littlefs-fuse
+        - rm -rf v2/littlefs/*
+        - cp -r $(git ls-tree --name-only HEAD) v2/littlefs
+
+        - mkdir mount
+        - sudo chmod a+rw /dev/loop0
+        - dd if=/dev/zero bs=512 count=4096 of=disk
+        - losetup /dev/loop0 disk
+      script:
+        # compile v1 and v2
+        - make -C v1
+        - make -C v2
+
+        # run self-host test with v1
+        - v1/lfs --format /dev/loop0
+        - v1/lfs /dev/loop0 mount
+
+        - ls mount
+        - mkdir mount/littlefs
+        - cp -r $(git ls-tree --name-only HEAD) mount/littlefs
+        - cd mount/littlefs
+        - stat .
+        - ls -flh
+        - make -B test_dirs test_files QUIET=1
+
+        # attempt to migrate
+        - cd ../..
+        - fusermount -u mount
+
+        - v2/lfs --migrate /dev/loop0
+        - v2/lfs /dev/loop0 mount
+
+        # run self-host test with v2 right where we left off
+        - ls mount
+        - cd mount/littlefs
+        - stat .
+        - ls -flh
+        - make -B test_dirs test_files QUIET=1
+
+    # Automatically create releases
     - stage: deploy
       env:
         - STAGE=deploy
         - NAME=deploy
       script:
-        # Find version defined in lfs2.h
-        - LFS2_VERSION=$(grep -ox '#define LFS2_VERSION .*' lfs2.h | cut -d ' ' -f3)
-        - LFS2_VERSION_MAJOR=$((0xffff & ($LFS2_VERSION >> 16)))
-        - LFS2_VERSION_MINOR=$((0xffff & ($LFS2_VERSION >>  0)))
-        # Grab latests patch from repo tags, default to 0, needs finagling to get past github's pagination api
-        - PREV_URL=https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs/tags/v$LFS2_VERSION_MAJOR.$LFS2_VERSION_MINOR.
-        - PREV_URL=$(curl -u "$GEKY_BOT_RELEASES" "$PREV_URL" -I
-                | sed -n '/^Link/{s/.*<\(.*\)>; rel="last"/\1/;p;q0};$q1'
-                || echo $PREV_URL)
-        - LFS2_VERSION_PATCH=$(curl -u "$GEKY_BOT_RELEASES" "$PREV_URL"
-                | jq 'map(.ref | match("\\bv.*\\..*\\.(.*)$";"g")
-                    .captures[].string | tonumber) | max + 1'
-                || echo 0)
-        # We have our new version
-        - LFS2_VERSION="v$LFS2_VERSION_MAJOR.$LFS2_VERSION_MINOR.$LFS2_VERSION_PATCH"
-        - echo "VERSION $LFS2_VERSION"
         - |
+          bash << 'SCRIPT'
+          set -ev
+          # Find version defined in lfs.h
+          LFS_VERSION=$(grep -ox '#define LFS_VERSION .*' lfs.h | cut -d ' ' -f3)
+          LFS_VERSION_MAJOR=$((0xffff & ($LFS_VERSION >> 16)))
+          LFS_VERSION_MINOR=$((0xffff & ($LFS_VERSION >>  0)))
+          # Grab latests patch from repo tags, default to 0, needs finagling
+          # to get past github's pagination api
+          PREV_URL=https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs/tags/v$LFS_VERSION_MAJOR.$LFS_VERSION_MINOR.
+          PREV_URL=$(curl -u "$GEKY_BOT_RELEASES" "$PREV_URL" -I \
+              | sed -n '/^Link/{s/.*<\(.*\)>; rel="last"/\1/;p;q0};$q1' \
+              || echo $PREV_URL)
+          LFS_VERSION_PATCH=$(curl -u "$GEKY_BOT_RELEASES" "$PREV_URL" \
+              | jq 'map(.ref | match("\\bv.*\\..*\\.(.*)$";"g")
+                  .captures[].string | tonumber) | max + 1' \
+              || echo 0)
+          # We have our new version
+          LFS_VERSION="v$LFS_VERSION_MAJOR.$LFS_VERSION_MINOR.$LFS_VERSION_PATCH"
+          echo "VERSION $LFS_VERSION"
           # Check that we're the most recent commit
           CURRENT_COMMIT=$(curl -f -u "$GEKY_BOT_RELEASES" \
-                https://api.github.com/repos/$TRAVIS_REPO_SLUG/commits/master \
-                | jq -re '.sha')
-          if [ "$TRAVIS_COMMIT" == "$CURRENT_COMMIT" ]
+              https://api.github.com/repos/$TRAVIS_REPO_SLUG/commits/master \
+              | jq -re '.sha')
+          [ "$TRAVIS_COMMIT" == "$CURRENT_COMMIT" ] || exit 0
+          # Create major branch
+          git branch v$LFS_VERSION_MAJOR HEAD
+          # Create major prefix branch
+          git config user.name "geky bot"
+          git config user.email "bot@geky.net"
+          git fetch https://github.com/$TRAVIS_REPO_SLUG.git \
+              --depth=50 v$LFS_VERSION_MAJOR-prefix || true
+          ./scripts/prefix.py lfs$LFS_VERSION_MAJOR
+          git branch v$LFS_VERSION_MAJOR-prefix $( \
+              git commit-tree $(git write-tree) \
+                  $(git rev-parse --verify -q FETCH_HEAD | sed -e 's/^/-p /') \
+                  -p HEAD \
+                  -m "Generated v$LFS_VERSION_MAJOR prefixes")
+          git reset --hard
+          # Update major version branches (vN and vN-prefix)
+          git push https://$GEKY_BOT_RELEASES@github.com/$TRAVIS_REPO_SLUG.git \
+              v$LFS_VERSION_MAJOR \
+              v$LFS_VERSION_MAJOR-prefix
+          # Create patch version tag (vN.N.N)
+          curl -f -u "$GEKY_BOT_RELEASES" -X POST \
+              https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs \
+              -d "{
+                  \"ref\": \"refs/tags/$LFS_VERSION\",
+                  \"sha\": \"$TRAVIS_COMMIT\"
+              }"
+          # Create minor release?
+          [[ "$LFS_VERSION" == *.0 ]] || exit 0
+          # Build release notes
+          PREV=$(git tag --sort=-v:refname -l "v*.0" | head -1)
+          if [ ! -z "$PREV" ]
           then
-            # Create a simple tag
-            curl -f -u "$GEKY_BOT_RELEASES" -X POST \
-                https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs \
-                -d "{
-                    \"ref\": \"refs/tags/$LFS2_VERSION\",
-                    \"sha\": \"$TRAVIS_COMMIT\"
-                }"
-            # Minor release?
-            if [[ "$LFS2_VERSION" == *.0 ]]
-            then
-              # Build release notes
-              PREV=$(git tag --sort=-v:refname -l "v*.0" | head -1)
-              if [ ! -z "$PREV" ]
-              then
-                  echo "PREV $PREV"
-                  CHANGES=$'### Changes\n\n'$( \
-                      git log --oneline $PREV.. --grep='^Merge' --invert-grep)
-                  printf "CHANGES\n%s\n\n" "$CHANGES"
-              fi
-              # Create the release
-              curl -f -u "$GEKY_BOT_RELEASES" -X POST \
-                  https://api.github.com/repos/$TRAVIS_REPO_SLUG/releases \
-                  -d "{
-                      \"tag_name\": \"$LFS2_VERSION\",
-                      \"name\": \"${LFS2_VERSION%.0}\",
-                      \"draft\": true,
-                      \"body\": $(jq -sR '.' <<< "$CHANGES")
-                  }"
-            fi
+              echo "PREV $PREV"
+              CHANGES=$'### Changes\n\n'$( \
+                  git log --oneline $PREV.. --grep='^Merge' --invert-grep)
+              printf "CHANGES\n%s\n\n" "$CHANGES"
           fi
+          # Create the release
+          curl -f -u "$GEKY_BOT_RELEASES" -X POST \
+              https://api.github.com/repos/$TRAVIS_REPO_SLUG/releases \
+              -d "{
+                  \"tag_name\": \"$LFS_VERSION\",
+                  \"name\": \"${LFS_VERSION%.0}\",
+                  \"draft\": true,
+                  \"body\": $(jq -sR '.' <<< "$CHANGES")
+              }" #"
+          SCRIPT
 
 # Manage statuses
 before_install:
   - |
-    curl -u $GEKY_BOT_STATUSES -X POST \
+    curl -u "$GEKY_BOT_STATUSES" -X POST \
         https://api.github.com/repos/$TRAVIS_REPO_SLUG/statuses/${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT} \
         -d "{
             \"context\": \"$STAGE/$NAME\",
@@ -170,7 +294,7 @@ before_install:
 
 after_failure:
   - |
-    curl -u $GEKY_BOT_STATUSES -X POST \
+    curl -u "$GEKY_BOT_STATUSES" -X POST \
         https://api.github.com/repos/$TRAVIS_REPO_SLUG/statuses/${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT} \
         -d "{
             \"context\": \"$STAGE/$NAME\",
@@ -181,7 +305,7 @@ after_failure:
 
 after_success:
   - |
-    curl -u $GEKY_BOT_STATUSES -X POST \
+    curl -u "$GEKY_BOT_STATUSES" -X POST \
         https://api.github.com/repos/$TRAVIS_REPO_SLUG/statuses/${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT} \
         -d "{
             \"context\": \"$STAGE/$NAME\",

Makefile

@@ -1,6 +1,6 @@
-TARGET = lfs2.a
+TARGET = lfs.a
 ifneq ($(wildcard test.c main.c),)
-override TARGET = lfs2
+override TARGET = lfs
 endif
 
 CC ?= gcc
@@ -24,9 +24,14 @@ endif
 ifdef WORD
 override CFLAGS += -m$(WORD)
 endif
+ifdef TRACE
+override CFLAGS += -DLFS_YES_TRACE
+endif
 override CFLAGS += -I.
 override CFLAGS += -std=c99 -Wall -pedantic
-override CFLAGS += -Wshadow -Wunused-parameter -Wjump-misses-init -Wsign-compare
+override CFLAGS += -Wextra -Wshadow -Wjump-misses-init
+# Remove missing-field-initializers because of GCC bug
+override CFLAGS += -Wno-missing-field-initializers
 
 
 all: $(TARGET)
@@ -37,21 +42,32 @@ size: $(OBJ)
 	$(SIZE) -t $^
 
 .SUFFIXES:
-test: test_format test_dirs test_files test_seek test_truncate \
-	test_entries test_interspersed test_alloc test_paths test_attrs \
-	test_move test_orphan test_corrupt
+test: \
+	test_format \
+	test_dirs \
+	test_files \
+	test_seek \
+	test_truncate \
+	test_entries \
+	test_interspersed \
+	test_alloc \
+	test_paths \
+	test_attrs \
+	test_move \
+	test_orphan \
+	test_corrupt
 	@rm test.c
 test_%: tests/test_%.sh
 
 ifdef QUIET
-	@./$< | sed -n '/^[-=]/p'
+	@./$< | sed -nu '/^[-=]/p'
 else
 	./$<
 endif
 
 -include $(DEP)
 
-lfs2: $(OBJ)
+lfs: $(OBJ)
 	$(CC) $(CFLAGS) $^ $(LFLAGS) -o $@
 
 %.a: $(OBJ)

README.md

@@ -1,6 +1,6 @@
-## The little filesystem
+## littlefs
 
-A little fail-safe filesystem designed for embedded systems.
+A little fail-safe filesystem designed for microcontrollers.
 
 ```
    | | |     .---._____
@@ -11,17 +11,19 @@ A little fail-safe filesystem designed for embedded systems.
    | | |
 ```
 
-**Bounded RAM/ROM** - The littlefs is designed to work with a limited amount
-of memory. Recursion is avoided and dynamic memory is limited to configurable
-buffers that can be provided statically.
+**Power-loss resilience** - littlefs is designed to handle random power
+failures. All file operations have strong copy-on-write guarantees and if
+power is lost the filesystem will fall back to the last known good state.
 
-**Power-loss resilient** - The littlefs is designed for systems that may have
-random power failures. The littlefs has strong copy-on-write guarantees and
-storage on disk is always kept in a valid state.
+**Dynamic wear leveling** - littlefs is designed with flash in mind, and
+provides wear leveling over dynamic blocks. Additionally, littlefs can
+detect bad blocks and work around them.
 
-**Wear leveling** - Since the most common form of embedded storage is erodible
-flash memories, littlefs provides a form of dynamic wear leveling for systems
-that can not fit a full flash translation layer.
+**Bounded RAM/ROM** - littlefs is designed to work with a small amount of
+memory. RAM usage is strictly bounded, which means RAM consumption does not
+change as the filesystem grows. The filesystem contains no unbounded
+recursion and dynamic memory is limited to configurable buffers that can be
+provided statically.
 
 ## Example
 
@@ -30,14 +32,14 @@ main runs. The program can be interrupted at any time without losing track
 of how many times it has been booted and without corrupting the filesystem:
 
 ``` c
-#include "lfs2.h"
+#include "lfs.h"
 
 // variables used by the filesystem
-lfs2_t lfs2;
-lfs2_file_t file;
+lfs_t lfs;
+lfs_file_t file;
 
 // configuration of the filesystem is provided by this struct
-const struct lfs2_config cfg = {
+const struct lfs_config cfg = {
     // block device operations
     .read  = user_provided_block_device_read,
     .prog  = user_provided_block_device_prog,
@@ -56,30 +58,30 @@ const struct lfs2_config cfg = {
 // entry point
 int main(void) {
     // mount the filesystem
-    int err = lfs2_mount(&lfs2, &cfg);
+    int err = lfs_mount(&lfs, &cfg);
 
     // reformat if we can't mount the filesystem
     // this should only happen on the first boot
     if (err) {
-        lfs2_format(&lfs2, &cfg);
-        lfs2_mount(&lfs2, &cfg);
+        lfs_format(&lfs, &cfg);
+        lfs_mount(&lfs, &cfg);
     }
 
     // read current count
     uint32_t boot_count = 0;
-    lfs2_file_open(&lfs2, &file, "boot_count", LFS2_O_RDWR | LFS2_O_CREAT);
-    lfs2_file_read(&lfs2, &file, &boot_count, sizeof(boot_count));
+    lfs_file_open(&lfs, &file, "boot_count", LFS_O_RDWR | LFS_O_CREAT);
+    lfs_file_read(&lfs, &file, &boot_count, sizeof(boot_count));
 
     // update boot count
     boot_count += 1;
-    lfs2_file_rewind(&lfs2, &file);
-    lfs2_file_write(&lfs2, &file, &boot_count, sizeof(boot_count));
+    lfs_file_rewind(&lfs, &file);
+    lfs_file_write(&lfs, &file, &boot_count, sizeof(boot_count));
 
     // remember the storage is not updated until the file is closed successfully
-    lfs2_file_close(&lfs2, &file);
+    lfs_file_close(&lfs, &file);
 
     // release any resources we were using
-    lfs2_unmount(&lfs2);
+    lfs_unmount(&lfs);
 
     // print the boot count
     printf("boot_count: %d\n", boot_count);
@@ -89,17 +91,17 @@ int main(void) {
 ## Usage
 
 Detailed documentation (or at least as much detail as is currently available)
-can be found in the comments in [lfs2.h](lfs2.h).
+can be found in the comments in [lfs.h](lfs.h).
 
-As you may have noticed, littlefs takes in a configuration structure that
-defines how the filesystem operates. The configuration struct provides the
-filesystem with the block device operations and dimensions, tweakable
-parameters that tradeoff memory usage for performance, and optional
-static buffers if the user wants to avoid dynamic memory.
+littlefs takes in a configuration structure that defines how the filesystem
+operates. The configuration struct provides the filesystem with the block
+device operations and dimensions, tweakable parameters that tradeoff memory
+usage for performance, and optional static buffers if the user wants to avoid
+dynamic memory.
 
-The state of the littlefs is stored in the `lfs2_t` type which is left up
+The state of the littlefs is stored in the `lfs_t` type which is left up
 to the user to allocate, allowing multiple filesystems to be in use
-simultaneously. With the `lfs2_t` and configuration struct, a user can
+simultaneously. With the `lfs_t` and configuration struct, a user can
 format a block device or mount the filesystem.
 
 Once mounted, the littlefs provides a full set of POSIX-like file and
@@ -107,17 +109,17 @@ directory functions, with the deviation that the allocation of filesystem
 structures must be provided by the user.
 
 All POSIX operations, such as remove and rename, are atomic, even in event
-of power-loss. Additionally, no file updates are actually committed to the
-filesystem until sync or close is called on the file.
+of power-loss. Additionally, no file updates are not actually committed to
+the filesystem until sync or close is called on the file.
 
 ## Other notes
 
-All littlefs have the potential to return a negative error code. The errors
-can be either one of those found in the `enum lfs2_error` in [lfs2.h](lfs2.h),
-or an error returned by the user's block device operations.
+All littlefs calls have the potential to return a negative error code. The
+errors can be either one of those found in the `enum lfs_error` in
+[lfs.h](lfs.h), or an error returned by the user's block device operations.
 
 In the configuration struct, the `prog` and `erase` function provided by the
-user may return a `LFS2_ERR_CORRUPT` error if the implementation already can
+user may return a `LFS_ERR_CORRUPT` error if the implementation already can
 detect corrupt blocks. However, the wear leveling does not depend on the return
 code of these functions, instead all data is read back and checked for
 integrity.
@@ -128,19 +130,65 @@ from memory, otherwise data integrity can not be guaranteed. If the `write`
 function does not perform caching, and therefore each `read` or `write` call
 hits the memory, the `sync` function can simply return 0.
 
-## Reference material
+## Design
 
-[DESIGN.md](DESIGN.md) - DESIGN.md contains a fully detailed dive into how
-littlefs actually works. I would encourage you to read it since the
-solutions and tradeoffs at work here are quite interesting.
+At a high level, littlefs is a block based filesystem that uses small logs to
+store metadata and larger copy-on-write (COW) structures to store file data.
 
-[SPEC.md](SPEC.md) - SPEC.md contains the on-disk specification of littlefs
-with all the nitty-gritty details. Can be useful for developing tooling.
+In littlefs, these ingredients form a sort of two-layered cake, with the small
+logs (called metadata pairs) providing fast updates to metadata anywhere on
+storage, while the COW structures store file data compactly and without any
+wear amplification cost.
+
+Both of these data structures are built out of blocks, which are fed by a
+common block allocator. By limiting the number of erases allowed on a block
+per allocation, the allocator provides dynamic wear leveling over the entire
+filesystem.
+
+```
+                    root
+                   .--------.--------.
+                   | A'| B'|         |
+                   |   |   |->       |
+                   |   |   |         |
+                   '--------'--------'
+                .----'   '--------------.
+       A       v                 B       v
+      .--------.--------.       .--------.--------.
+      | C'| D'|         |       | E'|new|         |
+      |   |   |->       |       |   | E'|->       |
+      |   |   |         |       |   |   |         |
+      '--------'--------'       '--------'--------'
+      .-'   '--.                  |   '------------------.
+     v          v              .-'                        v
+.--------.  .--------.        v                       .--------.
+|   C    |  |   D    |   .--------.       write       | new E  |
+|        |  |        |   |   E    |        ==>        |        |
+|        |  |        |   |        |                   |        |
+'--------'  '--------'   |        |                   '--------'
+                         '--------'                   .-'    |
+                         .-'    '-.    .-------------|------'
+                        v          v  v              v
+                   .--------.  .--------.       .--------.
+                   |   F    |  |   G    |       | new F  |
+                   |        |  |        |       |        |
+                   |        |  |        |       |        |
+                   '--------'  '--------'       '--------'
+```
+
+More details on how littlefs works can be found in [DESIGN.md](DESIGN.md) and
+[SPEC.md](SPEC.md).
+
+- [DESIGN.md](DESIGN.md) - A fully detailed dive into how littlefs works.
+  I would suggest reading it as the tradeoffs at work are quite interesting.
+
+- [SPEC.md](SPEC.md) - The on-disk specification of littlefs with all the
+  nitty-gritty details. May be useful for tooling development.
 
 ## Testing
 
 The littlefs comes with a test suite designed to run on a PC using the
-[emulated block device](emubd/lfs2_emubd.h) found in the emubd directory.
+[emulated block device](emubd/lfs_emubd.h) found in the emubd directory.
 The tests assume a Linux environment and can be started with make:
 
 ``` bash
@@ -149,9 +197,9 @@ make test
 
 ## License
 
-The littlefs is provided under the [BSD-3-Clause](https://spdx.org/licenses/BSD-3-Clause.html)
-license. See [LICENSE.md](LICENSE.md) for more information. Contributions to
-this project are accepted under the same license.
+The littlefs is provided under the [BSD-3-Clause] license. See
+[LICENSE.md](LICENSE.md) for more information. Contributions to this project
+are accepted under the same license.
 
 Individual files contain the following tag instead of the full license text.
 
@@ -162,32 +210,39 @@ License Identifiers that are here available: http://spdx.org/licenses/
 
 ## Related projects
 
-[Mbed OS](https://github.com/ARMmbed/mbed-os/tree/master/features/filesystem/littlefs) -
-The easiest way to get started with littlefs is to jump into [Mbed](https://os.mbed.com/),
-which already has block device drivers for most forms of embedded storage. The
-littlefs is available in Mbed OS as the [LittleFileSystem](https://os.mbed.com/docs/latest/reference/littlefilesystem.html)
-class.
+- [littlefs-fuse] - A [FUSE] wrapper for littlefs. The project allows you to
+  mount littlefs directly on a Linux machine. Can be useful for debugging
+  littlefs if you have an SD card handy.
 
-[littlefs-fuse](https://github.com/geky/littlefs-fuse) - A [FUSE](https://github.com/libfuse/libfuse)
-wrapper for littlefs. The project allows you to mount littlefs directly on a
-Linux machine. Can be useful for debugging littlefs if you have an SD card
-handy.
+- [littlefs-js] - A javascript wrapper for littlefs. I'm not sure why you would
+  want this, but it is handy for demos.  You can see it in action
+  [here][littlefs-js-demo].
 
-[littlefs-js](https://github.com/geky/littlefs-js) - A javascript wrapper for
-littlefs. I'm not sure why you would want this, but it is handy for demos.
-You can see it in action [here](http://littlefs.geky.net/demo.html).
+- [mklfs] - A command line tool built by the [Lua RTOS] guys for making
+  littlefs images from a host PC. Supports Windows, Mac OS, and Linux.
 
-[mklfs](https://github.com/whitecatboard/Lua-RTOS-ESP32/tree/master/components/mklfs/src) -
-A command line tool built by the [Lua RTOS](https://github.com/whitecatboard/Lua-RTOS-ESP32)
-guys for making littlefs images from a host PC. Supports Windows, Mac OS,
-and Linux.
+- [Mbed OS] - The easiest way to get started with littlefs is to jump into Mbed
+  which already has block device drivers for most forms of embedded storage.
+  littlefs is available in Mbed OS as the [LittleFileSystem] class.
 
-[SPIFFS](https://github.com/pellepl/spiffs) - Another excellent embedded
-filesystem for NOR flash. As a more traditional logging filesystem with full
-static wear-leveling, SPIFFS will likely outperform littlefs on small
-memories such as the internal flash on microcontrollers.
+- [SPIFFS] - Another excellent embedded filesystem for NOR flash. As a more
+  traditional logging filesystem with full static wear-leveling, SPIFFS will
+  likely outperform littlefs on small memories such as the internal flash on
+  microcontrollers.
 
-[Dhara](https://github.com/dlbeer/dhara) - An interesting NAND flash
-translation layer designed for small MCUs. It offers static wear-leveling and
-power-resilience with only a fixed O(|address|) pointer structure stored on
-each block and in RAM.
+- [Dhara] - An interesting NAND flash translation layer designed for small
+  MCUs. It offers static wear-leveling and power-resilience with only a fixed
+  _O(|address|)_ pointer structure stored on each block and in RAM.
+
+
+[BSD-3-Clause]: https://spdx.org/licenses/BSD-3-Clause.html
+[littlefs-fuse]: https://github.com/geky/littlefs-fuse
+[FUSE]: https://github.com/libfuse/libfuse
+[littlefs-js]: https://github.com/geky/littlefs-js
+[littlefs-js-demo]:http://littlefs.geky.net/demo.html
+[mklfs]: https://github.com/whitecatboard/Lua-RTOS-ESP32/tree/master/components/mklfs/src
+[Lua RTOS]: https://github.com/whitecatboard/Lua-RTOS-ESP32
+[Mbed OS]: https://github.com/armmbed/mbed-os
+[LittleFileSystem]: https://os.mbed.com/docs/mbed-os/v5.12/apis/littlefilesystem.html
+[SPIFFS]: https://github.com/pellepl/spiffs
+[Dhara]: https://github.com/dlbeer/dhara

emubd/lfs2_emubd.c

@@ -1,324 +0,0 @@
-/*
- * Block device emulated on standard files
- *
- * Copyright (c) 2017, Arm Limited. All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#include "emubd/lfs2_emubd.h"
-
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <assert.h>
-#include <stdbool.h>
-#include <inttypes.h>
-
-
-// Emulated block device utils
-static inline void lfs2_emubd_tole32(lfs2_emubd_t *emu) {
-    emu->cfg.read_size     = lfs2_tole32(emu->cfg.read_size);
-    emu->cfg.prog_size     = lfs2_tole32(emu->cfg.prog_size);
-    emu->cfg.block_size    = lfs2_tole32(emu->cfg.block_size);
-    emu->cfg.block_count   = lfs2_tole32(emu->cfg.block_count);
-
-    emu->stats.read_count  = lfs2_tole32(emu->stats.read_count);
-    emu->stats.prog_count  = lfs2_tole32(emu->stats.prog_count);
-    emu->stats.erase_count = lfs2_tole32(emu->stats.erase_count);
-
-    for (unsigned i = 0; i < sizeof(emu->history.blocks) /
-            sizeof(emu->history.blocks[0]); i++) {
-        emu->history.blocks[i] = lfs2_tole32(emu->history.blocks[i]);
-    }
-}
-
-static inline void lfs2_emubd_fromle32(lfs2_emubd_t *emu) {
-    emu->cfg.read_size     = lfs2_fromle32(emu->cfg.read_size);
-    emu->cfg.prog_size     = lfs2_fromle32(emu->cfg.prog_size);
-    emu->cfg.block_size    = lfs2_fromle32(emu->cfg.block_size);
-    emu->cfg.block_count   = lfs2_fromle32(emu->cfg.block_count);
-
-    emu->stats.read_count  = lfs2_fromle32(emu->stats.read_count);
-    emu->stats.prog_count  = lfs2_fromle32(emu->stats.prog_count);
-    emu->stats.erase_count = lfs2_fromle32(emu->stats.erase_count);
-
-    for (unsigned i = 0; i < sizeof(emu->history.blocks) /
-            sizeof(emu->history.blocks[0]); i++) {
-        emu->history.blocks[i] = lfs2_fromle32(emu->history.blocks[i]);
-    }
-}
-
-
-// Block device emulated on existing filesystem
-int lfs2_emubd_create(const struct lfs2_config *cfg, const char *path) {
-    lfs2_emubd_t *emu = cfg->context;
-    emu->cfg.read_size   = cfg->read_size;
-    emu->cfg.prog_size   = cfg->prog_size;
-    emu->cfg.block_size  = cfg->block_size;
-    emu->cfg.block_count = cfg->block_count;
-
-    // Allocate buffer for creating children files
-    size_t pathlen = strlen(path);
-    emu->path = malloc(pathlen + 1 + LFS2_NAME_MAX + 1);
-    if (!emu->path) {
-        return -ENOMEM;
-    }
-
-    strcpy(emu->path, path);
-    emu->path[pathlen] = '/';
-    emu->child = &emu->path[pathlen+1];
-    memset(emu->child, '\0', LFS2_NAME_MAX+1);
-
-    // Create directory if it doesn't exist
-    int err = mkdir(path, 0777);
-    if (err && errno != EEXIST) {
-        return -errno;
-    }
-
-    // Load stats to continue incrementing
-    snprintf(emu->child, LFS2_NAME_MAX, ".stats");
-    FILE *f = fopen(emu->path, "r");
-    if (!f) {
-        memset(&emu->stats, 0, sizeof(emu->stats));
-    } else {
-        size_t res = fread(&emu->stats, sizeof(emu->stats), 1, f);
-        lfs2_emubd_fromle32(emu);
-        if (res < 1) {
-            return -errno;
-        }
-
-        err = fclose(f);
-        if (err) {
-            return -errno;
-        }
-    }
-
-    // Load history
-    snprintf(emu->child, LFS2_NAME_MAX, ".history");
-    f = fopen(emu->path, "r");
-    if (!f) {
-        memset(&emu->history, 0, sizeof(emu->history));
-    } else {
-        size_t res = fread(&emu->history, sizeof(emu->history), 1, f);
-        lfs2_emubd_fromle32(emu);
-        if (res < 1) {
-            return -errno;
-        }
-
-        err = fclose(f);
-        if (err) {
-            return -errno;
-        }
-    }
-
-    return 0;
-}
-
-void lfs2_emubd_destroy(const struct lfs2_config *cfg) {
-    lfs2_emubd_sync(cfg);
-
-    lfs2_emubd_t *emu = cfg->context;
-    free(emu->path);
-}
-
-int lfs2_emubd_read(const struct lfs2_config *cfg, lfs2_block_t block,
-        lfs2_off_t off, void *buffer, lfs2_size_t size) {
-    lfs2_emubd_t *emu = cfg->context;
-    uint8_t *data = buffer;
-
-    // Check if read is valid
-    assert(off  % cfg->read_size == 0);
-    assert(size % cfg->read_size == 0);
-    assert(block < cfg->block_count);
-
-    // Zero out buffer for debugging
-    memset(data, 0, size);
-
-    // Read data
-    snprintf(emu->child, LFS2_NAME_MAX, "%" PRIx32, block);
-
-    FILE *f = fopen(emu->path, "rb");
-    if (!f && errno != ENOENT) {
-        return -errno;
-    }
-
-    if (f) {
-        int err = fseek(f, off, SEEK_SET);
-        if (err) {
-            return -errno;
-        }
-
-        size_t res = fread(data, 1, size, f);
-        if (res < size && !feof(f)) {
-            return -errno;
-        }
-
-        err = fclose(f);
-        if (err) {
-            return -errno;
-        }
-    }
-
-    emu->stats.read_count += 1;
-    return 0;
-}
-
-int lfs2_emubd_prog(const struct lfs2_config *cfg, lfs2_block_t block,
-        lfs2_off_t off, const void *buffer, lfs2_size_t size) {
-    lfs2_emubd_t *emu = cfg->context;
-    const uint8_t *data = buffer;
-
-    // Check if write is valid
-    assert(off  % cfg->prog_size == 0);
-    assert(size % cfg->prog_size == 0);
-    assert(block < cfg->block_count);
-
-    // Program data
-    snprintf(emu->child, LFS2_NAME_MAX, "%" PRIx32, block);
-
-    FILE *f = fopen(emu->path, "r+b");
-    if (!f) {
-        return (errno == EACCES) ? 0 : -errno;
-    }
-
-    // Check that file was erased
-    assert(f);
-
-    int err = fseek(f, off, SEEK_SET);
-    if (err) {
-        return -errno;
-    }
-
-    size_t res = fwrite(data, 1, size, f);
-    if (res < size) {
-        return -errno;
-    }
-
-    err = fseek(f, off, SEEK_SET);
-    if (err) {
-        return -errno;
-    }
-
-    uint8_t dat;
-    res = fread(&dat, 1, 1, f);
-    if (res < 1) {
-        return -errno;
-    }
-
-    err = fclose(f);
-    if (err) {
-        return -errno;
-    }
-
-    // update history and stats
-    if (block != emu->history.blocks[0]) {
-        memcpy(&emu->history.blocks[1], &emu->history.blocks[0],
-                sizeof(emu->history) - sizeof(emu->history.blocks[0]));
-        emu->history.blocks[0] = block;
-    }
-
-    emu->stats.prog_count += 1;
-    return 0;
-}
-
-int lfs2_emubd_erase(const struct lfs2_config *cfg, lfs2_block_t block) {
-    lfs2_emubd_t *emu = cfg->context;
-
-    // Check if erase is valid
-    assert(block < cfg->block_count);
-
-    // Erase the block
-    snprintf(emu->child, LFS2_NAME_MAX, "%" PRIx32, block);
-    struct stat st;
-    int err = stat(emu->path, &st);
-    if (err && errno != ENOENT) {
-        return -errno;
-    }
-
-    if (!err && S_ISREG(st.st_mode) && (S_IWUSR & st.st_mode)) {
-        err = unlink(emu->path);
-        if (err) {
-            return -errno;
-        }
-    }
-
-    if (err || (S_ISREG(st.st_mode) && (S_IWUSR & st.st_mode))) {
-        FILE *f = fopen(emu->path, "w");
-        if (!f) {
-            return -errno;
-        }
-
-        err = fclose(f);
-        if (err) {
-            return -errno;
-        }
-    }
-
-    emu->stats.erase_count += 1;
-    return 0;
-}
-
-int lfs2_emubd_sync(const struct lfs2_config *cfg) {
-    lfs2_emubd_t *emu = cfg->context;
-
-    // Just write out info/stats for later lookup
-    snprintf(emu->child, LFS2_NAME_MAX, ".config");
-    FILE *f = fopen(emu->path, "w");
-    if (!f) {
-        return -errno;
-    }
-
-    lfs2_emubd_tole32(emu);
-    size_t res = fwrite(&emu->cfg, sizeof(emu->cfg), 1, f);
-    lfs2_emubd_fromle32(emu);
-    if (res < 1) {
-        return -errno;
-    }
-
-    int err = fclose(f);
-    if (err) {
-        return -errno;
-    }
-
-    snprintf(emu->child, LFS2_NAME_MAX, ".stats");
-    f = fopen(emu->path, "w");
-    if (!f) {
-        return -errno;
-    }
-
-    lfs2_emubd_tole32(emu);
-    res = fwrite(&emu->stats, sizeof(emu->stats), 1, f);
-    lfs2_emubd_fromle32(emu);
-    if (res < 1) {
-        return -errno;
-    }
-
-    err = fclose(f);
-    if (err) {
-        return -errno;
-    }
-
-    snprintf(emu->child, LFS2_NAME_MAX, ".history");
-    f = fopen(emu->path, "w");
-    if (!f) {
-        return -errno;
-    }
-
-    lfs2_emubd_tole32(emu);
-    res = fwrite(&emu->history, sizeof(emu->history), 1, f);
-    lfs2_emubd_fromle32(emu);
-    if (res < 1) {
-        return -errno;
-    }
-
-    err = fclose(f);
-    if (err) {
-        return -errno;
-    }
-
-    return 0;
-}

emubd/lfs_emubd.c

@@ -0,0 +1,403 @@
+/*
+ * Block device emulated on standard files
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#include "emubd/lfs_emubd.h"
+
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <limits.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <assert.h>
+#include <stdbool.h>
+#include <inttypes.h>
+
+
+// Emulated block device utils
+static inline void lfs_emubd_tole32(lfs_emubd_t *emu) {
+    emu->cfg.read_size     = lfs_tole32(emu->cfg.read_size);
+    emu->cfg.prog_size     = lfs_tole32(emu->cfg.prog_size);
+    emu->cfg.block_size    = lfs_tole32(emu->cfg.block_size);
+    emu->cfg.block_count   = lfs_tole32(emu->cfg.block_count);
+
+    emu->stats.read_count  = lfs_tole32(emu->stats.read_count);
+    emu->stats.prog_count  = lfs_tole32(emu->stats.prog_count);
+    emu->stats.erase_count = lfs_tole32(emu->stats.erase_count);
+
+    for (unsigned i = 0; i < sizeof(emu->history.blocks) /
+            sizeof(emu->history.blocks[0]); i++) {
+        emu->history.blocks[i] = lfs_tole32(emu->history.blocks[i]);
+    }
+}
+
+static inline void lfs_emubd_fromle32(lfs_emubd_t *emu) {
+    emu->cfg.read_size     = lfs_fromle32(emu->cfg.read_size);
+    emu->cfg.prog_size     = lfs_fromle32(emu->cfg.prog_size);
+    emu->cfg.block_size    = lfs_fromle32(emu->cfg.block_size);
+    emu->cfg.block_count   = lfs_fromle32(emu->cfg.block_count);
+
+    emu->stats.read_count  = lfs_fromle32(emu->stats.read_count);
+    emu->stats.prog_count  = lfs_fromle32(emu->stats.prog_count);
+    emu->stats.erase_count = lfs_fromle32(emu->stats.erase_count);
+
+    for (unsigned i = 0; i < sizeof(emu->history.blocks) /
+            sizeof(emu->history.blocks[0]); i++) {
+        emu->history.blocks[i] = lfs_fromle32(emu->history.blocks[i]);
+    }
+}
+
+
+// Block device emulated on existing filesystem
+int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
+    LFS_TRACE("lfs_emubd_create(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, \"%s\")",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            path);
+    lfs_emubd_t *emu = cfg->context;
+    emu->cfg.read_size   = cfg->read_size;
+    emu->cfg.prog_size   = cfg->prog_size;
+    emu->cfg.block_size  = cfg->block_size;
+    emu->cfg.block_count = cfg->block_count;
+
+    // Allocate buffer for creating children files
+    size_t pathlen = strlen(path);
+    emu->path = malloc(pathlen + 1 + LFS_NAME_MAX + 1);
+    if (!emu->path) {
+        int err = -ENOMEM;
+        LFS_TRACE("lfs_emubd_create -> %"PRId32, err);
+        return err;
+    }
+
+    strcpy(emu->path, path);
+    emu->path[pathlen] = '/';
+    emu->child = &emu->path[pathlen+1];
+    memset(emu->child, '\0', LFS_NAME_MAX+1);
+
+    // Create directory if it doesn't exist
+    int err = mkdir(path, 0777);
+    if (err && errno != EEXIST) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_create -> %"PRId32, err);
+        return err;
+    }
+
+    // Load stats to continue incrementing
+    snprintf(emu->child, LFS_NAME_MAX, ".stats");
+    FILE *f = fopen(emu->path, "r");
+    if (!f) {
+        memset(&emu->stats, LFS_EMUBD_ERASE_VALUE, sizeof(emu->stats));
+    } else {
+        size_t res = fread(&emu->stats, sizeof(emu->stats), 1, f);
+        lfs_emubd_fromle32(emu);
+        if (res < 1) {
+            err = -errno;
+            LFS_TRACE("lfs_emubd_create -> %"PRId32, err);
+            return err;
+        }
+
+        err = fclose(f);
+        if (err) {
+            err = -errno;
+            LFS_TRACE("lfs_emubd_create -> %"PRId32, err);
+            return err;
+        }
+    }
+
+    // Load history
+    snprintf(emu->child, LFS_NAME_MAX, ".history");
+    f = fopen(emu->path, "r");
+    if (!f) {
+        memset(&emu->history, 0, sizeof(emu->history));
+    } else {
+        size_t res = fread(&emu->history, sizeof(emu->history), 1, f);
+        lfs_emubd_fromle32(emu);
+        if (res < 1) {
+            err = -errno;
+            LFS_TRACE("lfs_emubd_create -> %"PRId32, err);
+            return err;
+        }
+
+        err = fclose(f);
+        if (err) {
+            err = -errno;
+            LFS_TRACE("lfs_emubd_create -> %"PRId32, err);
+            return err;
+        }
+    }
+
+    LFS_TRACE("lfs_emubd_create -> %"PRId32, 0);
+    return 0;
+}
+
+void lfs_emubd_destroy(const struct lfs_config *cfg) {
+    LFS_TRACE("lfs_emubd_destroy(%p)", (void*)cfg);
+    lfs_emubd_sync(cfg);
+
+    lfs_emubd_t *emu = cfg->context;
+    free(emu->path);
+    LFS_TRACE("lfs_emubd_destroy -> %s", "void");
+}
+
+int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block,
+        lfs_off_t off, void *buffer, lfs_size_t size) {
+    LFS_TRACE("lfs_emubd_read(%p, 0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs_emubd_t *emu = cfg->context;
+    uint8_t *data = buffer;
+
+    // Check if read is valid
+    assert(off  % cfg->read_size == 0);
+    assert(size % cfg->read_size == 0);
+    assert(block < cfg->block_count);
+
+    // Zero out buffer for debugging
+    memset(data, 0, size);
+
+    // Read data
+    snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block);
+
+    FILE *f = fopen(emu->path, "rb");
+    if (!f && errno != ENOENT) {
+        int err = -errno;
+        LFS_TRACE("lfs_emubd_read -> %d", err);
+        return err;
+    }
+
+    if (f) {
+        int err = fseek(f, off, SEEK_SET);
+        if (err) {
+            err = -errno;
+            LFS_TRACE("lfs_emubd_read -> %d", err);
+            return err;
+        }
+
+        size_t res = fread(data, 1, size, f);
+        if (res < size && !feof(f)) {
+            err = -errno;
+            LFS_TRACE("lfs_emubd_read -> %d", err);
+            return err;
+        }
+
+        err = fclose(f);
+        if (err) {
+            err = -errno;
+            LFS_TRACE("lfs_emubd_read -> %d", err);
+            return err;
+        }
+    }
+
+    emu->stats.read_count += size;
+    LFS_TRACE("lfs_emubd_read -> %d", 0);
+    return 0;
+}
+
+int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block,
+        lfs_off_t off, const void *buffer, lfs_size_t size) {
+    LFS_TRACE("lfs_emubd_prog(%p, 0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs_emubd_t *emu = cfg->context;
+    const uint8_t *data = buffer;
+
+    // Check if write is valid
+    assert(off  % cfg->prog_size == 0);
+    assert(size % cfg->prog_size == 0);
+    assert(block < cfg->block_count);
+
+    // Program data
+    snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block);
+
+    FILE *f = fopen(emu->path, "r+b");
+    if (!f) {
+        int err = (errno == EACCES) ? 0 : -errno;
+        LFS_TRACE("lfs_emubd_prog -> %d", err);
+        return err;
+    }
+
+    // Check that file was erased
+    assert(f);
+
+    int err = fseek(f, off, SEEK_SET);
+    if (err) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_prog -> %d", err);
+        return err;
+    }
+
+    size_t res = fwrite(data, 1, size, f);
+    if (res < size) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_prog -> %d", err);
+        return err;
+    }
+
+    err = fseek(f, off, SEEK_SET);
+    if (err) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_prog -> %d", err);
+        return err;
+    }
+
+    uint8_t dat;
+    res = fread(&dat, 1, 1, f);
+    if (res < 1) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_prog -> %d", err);
+        return err;
+    }
+
+    err = fclose(f);
+    if (err) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_prog -> %d", err);
+        return err;
+    }
+
+    // update history and stats
+    if (block != emu->history.blocks[0]) {
+        memmove(&emu->history.blocks[1], &emu->history.blocks[0],
+                sizeof(emu->history) - sizeof(emu->history.blocks[0]));
+        emu->history.blocks[0] = block;
+    }
+
+    emu->stats.prog_count += size;
+    LFS_TRACE("lfs_emubd_prog -> %d", 0);
+    return 0;
+}
+
+int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block) {
+    LFS_TRACE("lfs_emubd_erase(%p, 0x%"PRIx32")", (void*)cfg, block);
+    lfs_emubd_t *emu = cfg->context;
+
+    // Check if erase is valid
+    assert(block < cfg->block_count);
+
+    // Erase the block
+    snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block);
+    struct stat st;
+    int err = stat(emu->path, &st);
+    if (err && errno != ENOENT) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_erase -> %d", err);
+        return err;
+    }
+
+    if (!err && S_ISREG(st.st_mode) && (S_IWUSR & st.st_mode)) {
+        err = unlink(emu->path);
+        if (err) {
+            err = -errno;
+            LFS_TRACE("lfs_emubd_erase -> %d", err);
+            return err;
+        }
+    }
+
+    if (err || (S_ISREG(st.st_mode) && (S_IWUSR & st.st_mode))) {
+        FILE *f = fopen(emu->path, "w");
+        if (!f) {
+            err = -errno;
+            LFS_TRACE("lfs_emubd_erase -> %d", err);
+            return err;
+        }
+
+        err = fclose(f);
+        if (err) {
+            err = -errno;
+            LFS_TRACE("lfs_emubd_erase -> %d", err);
+            return err;
+        }
+    }
+
+    emu->stats.erase_count += cfg->block_size;
+    LFS_TRACE("lfs_emubd_erase -> %d", 0);
+    return 0;
+}
+
+int lfs_emubd_sync(const struct lfs_config *cfg) {
+    LFS_TRACE("lfs_emubd_sync(%p)", (void*)cfg);
+    lfs_emubd_t *emu = cfg->context;
+
+    // Just write out info/stats for later lookup
+    snprintf(emu->child, LFS_NAME_MAX, ".config");
+    FILE *f = fopen(emu->path, "w");
+    if (!f) {
+        int err = -errno;
+        LFS_TRACE("lfs_emubd_sync -> %d", err);
+        return err;
+    }
+
+    lfs_emubd_tole32(emu);
+    size_t res = fwrite(&emu->cfg, sizeof(emu->cfg), 1, f);
+    lfs_emubd_fromle32(emu);
+    if (res < 1) {
+        int err = -errno;
+        LFS_TRACE("lfs_emubd_sync -> %d", err);
+        return err;
+    }
+
+    int err = fclose(f);
+    if (err) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_sync -> %d", err);
+        return err;
+    }
+
+    snprintf(emu->child, LFS_NAME_MAX, ".stats");
+    f = fopen(emu->path, "w");
+    if (!f) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_sync -> %d", err);
+        return err;
+    }
+
+    lfs_emubd_tole32(emu);
+    res = fwrite(&emu->stats, sizeof(emu->stats), 1, f);
+    lfs_emubd_fromle32(emu);
+    if (res < 1) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_sync -> %d", err);
+        return err;
+    }
+
+    err = fclose(f);
+    if (err) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_sync -> %d", err);
+        return err;
+    }
+
+    snprintf(emu->child, LFS_NAME_MAX, ".history");
+    f = fopen(emu->path, "w");
+    if (!f) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_sync -> %d", err);
+        return err;
+    }
+
+    lfs_emubd_tole32(emu);
+    res = fwrite(&emu->history, sizeof(emu->history), 1, f);
+    lfs_emubd_fromle32(emu);
+    if (res < 1) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_sync -> %d", err);
+        return err;
+    }
+
+    err = fclose(f);
+    if (err) {
+        err = -errno;
+        LFS_TRACE("lfs_emubd_sync -> %d", err);
+        return err;
+    }
+
+    LFS_TRACE("lfs_emubd_sync -> %d", 0);
+    return 0;
+}

emubd/lfs_emubd.h

@@ -4,11 +4,11 @@
  * Copyright (c) 2017, Arm Limited. All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef LFS2_EMUBD_H
-#define LFS2_EMUBD_H
+#ifndef LFS_EMUBD_H
+#define LFS_EMUBD_H
 
-#include "lfs2.h"
-#include "lfs2_util.h"
+#include "lfs.h"
+#include "lfs_util.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -17,25 +17,13 @@ extern "C"
 
 
 // Config options
-#ifndef LFS2_EMUBD_READ_SIZE
-#define LFS2_EMUBD_READ_SIZE 1
-#endif
-
-#ifndef LFS2_EMUBD_PROG_SIZE
-#define LFS2_EMUBD_PROG_SIZE 1
-#endif
-
-#ifndef LFS2_EMUBD_ERASE_SIZE
-#define LFS2_EMUBD_ERASE_SIZE 512
-#endif
-
-#ifndef LFS2_EMUBD_TOTAL_SIZE
-#define LFS2_EMUBD_TOTAL_SIZE 524288
+#ifndef LFS_EMUBD_ERASE_VALUE
+#define LFS_EMUBD_ERASE_VALUE 0x00
 #endif
 
 
 // The emu bd state
-typedef struct lfs2_emubd {
+typedef struct lfs_emubd {
     char *path;
     char *child;
 
@@ -46,7 +34,7 @@ typedef struct lfs2_emubd {
     } stats;
 
     struct {
-        lfs2_block_t blocks[4];
+        lfs_block_t blocks[4];
     } history;
 
     struct {
@@ -55,33 +43,33 @@ typedef struct lfs2_emubd {
         uint32_t block_size;
         uint32_t block_count;
     } cfg;
-} lfs2_emubd_t;
+} lfs_emubd_t;
 
 
 // Create a block device using path for the directory to store blocks
-int lfs2_emubd_create(const struct lfs2_config *cfg, const char *path);
+int lfs_emubd_create(const struct lfs_config *cfg, const char *path);
 
 // Clean up memory associated with emu block device
-void lfs2_emubd_destroy(const struct lfs2_config *cfg);
+void lfs_emubd_destroy(const struct lfs_config *cfg);
 
 // Read a block
-int lfs2_emubd_read(const struct lfs2_config *cfg, lfs2_block_t block,
-        lfs2_off_t off, void *buffer, lfs2_size_t size);
+int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block,
+        lfs_off_t off, void *buffer, lfs_size_t size);
 
 // Program a block
 //
 // The block must have previously been erased.
-int lfs2_emubd_prog(const struct lfs2_config *cfg, lfs2_block_t block,
-        lfs2_off_t off, const void *buffer, lfs2_size_t size);
+int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block,
+        lfs_off_t off, const void *buffer, lfs_size_t size);
 
 // Erase a block
 //
 // A block must be erased before being programmed. The
 // state of an erased block is undefined.
-int lfs2_emubd_erase(const struct lfs2_config *cfg, lfs2_block_t block);
+int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block);
 
 // Sync the block device
-int lfs2_emubd_sync(const struct lfs2_config *cfg);
+int lfs_emubd_sync(const struct lfs_config *cfg);
 
 
 #ifdef __cplusplus

lfs.h

@@ -4,8 +4,8 @@
  * Copyright (c) 2017, Arm Limited. All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef LFS2_H
-#define LFS2_H
+#ifndef LFS_H
+#define LFS_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -21,239 +21,245 @@ extern "C"
 // Software library version
 // Major (top-nibble), incremented on backwards incompatible changes
 // Minor (bottom-nibble), incremented on feature additions
-#define LFS2_VERSION 0x00020000
-#define LFS2_VERSION_MAJOR (0xffff & (LFS2_VERSION >> 16))
-#define LFS2_VERSION_MINOR (0xffff & (LFS2_VERSION >>  0))
+#define LFS_VERSION 0x00020001
+#define LFS_VERSION_MAJOR (0xffff & (LFS_VERSION >> 16))
+#define LFS_VERSION_MINOR (0xffff & (LFS_VERSION >>  0))
 
 // Version of On-disk data structures
 // Major (top-nibble), incremented on backwards incompatible changes
 // Minor (bottom-nibble), incremented on feature additions
-#define LFS2_DISK_VERSION 0x00020000
-#define LFS2_DISK_VERSION_MAJOR (0xffff & (LFS2_DISK_VERSION >> 16))
-#define LFS2_DISK_VERSION_MINOR (0xffff & (LFS2_DISK_VERSION >>  0))
+#define LFS_DISK_VERSION 0x00020000
+#define LFS_DISK_VERSION_MAJOR (0xffff & (LFS_DISK_VERSION >> 16))
+#define LFS_DISK_VERSION_MINOR (0xffff & (LFS_DISK_VERSION >>  0))
 
 
 /// Definitions ///
 
 // Type definitions
-typedef uint32_t lfs2_size_t;
-typedef uint32_t lfs2_off_t;
+typedef uint32_t lfs_size_t;
+typedef uint32_t lfs_off_t;
 
-typedef int32_t  lfs2_ssize_t;
-typedef int32_t  lfs2_soff_t;
+typedef int32_t  lfs_ssize_t;
+typedef int32_t  lfs_soff_t;
 
-typedef uint32_t lfs2_block_t;
+typedef uint32_t lfs_block_t;
 
 // Maximum name size in bytes, may be redefined to reduce the size of the
 // info struct. Limited to <= 1022. Stored in superblock and must be
 // respected by other littlefs drivers.
-#ifndef LFS2_NAME_MAX
-#define LFS2_NAME_MAX 255
+#ifndef LFS_NAME_MAX
+#define LFS_NAME_MAX 255
 #endif
 
 // Maximum size of a file in bytes, may be redefined to limit to support other
 // drivers. Limited on disk to <= 4294967296. However, above 2147483647 the
-// functions lfs2_file_seek, lfs2_file_size, and lfs2_file_tell will return
+// functions lfs_file_seek, lfs_file_size, and lfs_file_tell will return
 // incorrect values due to using signed integers. Stored in superblock and
 // must be respected by other littlefs drivers.
-#ifndef LFS2_FILE_MAX
-#define LFS2_FILE_MAX 2147483647
+#ifndef LFS_FILE_MAX
+#define LFS_FILE_MAX 2147483647
 #endif
 
 // Maximum size of custom attributes in bytes, may be redefined, but there is
-// no real benefit to using a smaller LFS2_ATTR_MAX. Limited to <= 1022.
-#ifndef LFS2_ATTR_MAX
-#define LFS2_ATTR_MAX 1022
+// no real benefit to using a smaller LFS_ATTR_MAX. Limited to <= 1022.
+#ifndef LFS_ATTR_MAX
+#define LFS_ATTR_MAX 1022
 #endif
 
 // Possible error codes, these are negative to allow
 // valid positive return values
-enum lfs2_error {
-    LFS2_ERR_OK          = 0,    // No error
-    LFS2_ERR_IO          = -5,   // Error during device operation
-    LFS2_ERR_CORRUPT     = -84,  // Corrupted
-    LFS2_ERR_NOENT       = -2,   // No directory entry
-    LFS2_ERR_EXIST       = -17,  // Entry already exists
-    LFS2_ERR_NOTDIR      = -20,  // Entry is not a dir
-    LFS2_ERR_ISDIR       = -21,  // Entry is a dir
-    LFS2_ERR_NOTEMPTY    = -39,  // Dir is not empty
-    LFS2_ERR_BADF        = -9,   // Bad file number
-    LFS2_ERR_FBIG        = -27,  // File too large
-    LFS2_ERR_INVAL       = -22,  // Invalid parameter
-    LFS2_ERR_NOSPC       = -28,  // No space left on device
-    LFS2_ERR_NOMEM       = -12,  // No more memory available
-    LFS2_ERR_NOATTR      = -61,  // No data/attr available
-    LFS2_ERR_NAMETOOLONG = -36,  // File name too long
+enum lfs_error {
+    LFS_ERR_OK          = 0,    // No error
+    LFS_ERR_IO          = -5,   // Error during device operation
+    LFS_ERR_CORRUPT     = -84,  // Corrupted
+    LFS_ERR_NOENT       = -2,   // No directory entry
+    LFS_ERR_EXIST       = -17,  // Entry already exists
+    LFS_ERR_NOTDIR      = -20,  // Entry is not a dir
+    LFS_ERR_ISDIR       = -21,  // Entry is a dir
+    LFS_ERR_NOTEMPTY    = -39,  // Dir is not empty
+    LFS_ERR_BADF        = -9,   // Bad file number
+    LFS_ERR_FBIG        = -27,  // File too large
+    LFS_ERR_INVAL       = -22,  // Invalid parameter
+    LFS_ERR_NOSPC       = -28,  // No space left on device
+    LFS_ERR_NOMEM       = -12,  // No more memory available
+    LFS_ERR_NOATTR      = -61,  // No data/attr available
+    LFS_ERR_NAMETOOLONG = -36,  // File name too long
 };
 
 // File types
-enum lfs2_type {
+enum lfs_type {
     // file types
-    LFS2_TYPE_REG            = 0x001,
-    LFS2_TYPE_DIR            = 0x002,
+    LFS_TYPE_REG            = 0x001,
+    LFS_TYPE_DIR            = 0x002,
 
     // internally used types
-    LFS2_TYPE_SPLICE         = 0x400,
-    LFS2_TYPE_NAME           = 0x000,
-    LFS2_TYPE_STRUCT         = 0x200,
-    LFS2_TYPE_USERATTR       = 0x300,
-    LFS2_TYPE_FROM           = 0x100,
-    LFS2_TYPE_TAIL           = 0x600,
-    LFS2_TYPE_GLOBALS        = 0x700,
-    LFS2_TYPE_CRC            = 0x500,
+    LFS_TYPE_SPLICE         = 0x400,
+    LFS_TYPE_NAME           = 0x000,
+    LFS_TYPE_STRUCT         = 0x200,
+    LFS_TYPE_USERATTR       = 0x300,
+    LFS_TYPE_FROM           = 0x100,
+    LFS_TYPE_TAIL           = 0x600,
+    LFS_TYPE_GLOBALS        = 0x700,
+    LFS_TYPE_CRC            = 0x500,
 
     // internally used type specializations
-    LFS2_TYPE_CREATE         = 0x401,
-    LFS2_TYPE_DELETE         = 0x4ff,
-    LFS2_TYPE_SUPERBLOCK     = 0x0ff,
-    LFS2_TYPE_DIRSTRUCT      = 0x200,
-    LFS2_TYPE_CTZSTRUCT      = 0x202,
-    LFS2_TYPE_INLINESTRUCT   = 0x201,
-    LFS2_TYPE_SOFTTAIL       = 0x600,
-    LFS2_TYPE_HARDTAIL       = 0x601,
-    LFS2_TYPE_MOVESTATE      = 0x7ff,
+    LFS_TYPE_CREATE         = 0x401,
+    LFS_TYPE_DELETE         = 0x4ff,
+    LFS_TYPE_SUPERBLOCK     = 0x0ff,
+    LFS_TYPE_DIRSTRUCT      = 0x200,
+    LFS_TYPE_CTZSTRUCT      = 0x202,
+    LFS_TYPE_INLINESTRUCT   = 0x201,
+    LFS_TYPE_SOFTTAIL       = 0x600,
+    LFS_TYPE_HARDTAIL       = 0x601,
+    LFS_TYPE_MOVESTATE      = 0x7ff,
 
     // internal chip sources
-    LFS2_FROM_NOOP           = 0x000,
-    LFS2_FROM_MOVE           = 0x101,
-    LFS2_FROM_USERATTRS      = 0x102,
+    LFS_FROM_NOOP           = 0x000,
+    LFS_FROM_MOVE           = 0x101,
+    LFS_FROM_USERATTRS      = 0x102,
 };
 
 // File open flags
-enum lfs2_open_flags {
+enum lfs_open_flags {
     // open flags
-    LFS2_O_RDONLY = 1,         // Open a file as read only
-    LFS2_O_WRONLY = 2,         // Open a file as write only
-    LFS2_O_RDWR   = 3,         // Open a file as read and write
-    LFS2_O_CREAT  = 0x0100,    // Create a file if it does not exist
-    LFS2_O_EXCL   = 0x0200,    // Fail if a file already exists
-    LFS2_O_TRUNC  = 0x0400,    // Truncate the existing file to zero size
-    LFS2_O_APPEND = 0x0800,    // Move to end of file on every write
+    LFS_O_RDONLY = 1,         // Open a file as read only
+    LFS_O_WRONLY = 2,         // Open a file as write only
+    LFS_O_RDWR   = 3,         // Open a file as read and write
+    LFS_O_CREAT  = 0x0100,    // Create a file if it does not exist
+    LFS_O_EXCL   = 0x0200,    // Fail if a file already exists
+    LFS_O_TRUNC  = 0x0400,    // Truncate the existing file to zero size
+    LFS_O_APPEND = 0x0800,    // Move to end of file on every write
 
     // internally used flags
-    LFS2_F_DIRTY   = 0x010000, // File does not match storage
-    LFS2_F_WRITING = 0x020000, // File has been written since last flush
-    LFS2_F_READING = 0x040000, // File has been read since last flush
-    LFS2_F_ERRED   = 0x080000, // An error occured during write
-    LFS2_F_INLINE  = 0x100000, // Currently inlined in directory entry
+    LFS_F_DIRTY   = 0x010000, // File does not match storage
+    LFS_F_WRITING = 0x020000, // File has been written since last flush
+    LFS_F_READING = 0x040000, // File has been read since last flush
+    LFS_F_ERRED   = 0x080000, // An error occured during write
+    LFS_F_INLINE  = 0x100000, // Currently inlined in directory entry
+    LFS_F_OPENED  = 0x200000, // File has been opened
 };
 
 // File seek flags
-enum lfs2_whence_flags {
-    LFS2_SEEK_SET = 0,   // Seek relative to an absolute position
-    LFS2_SEEK_CUR = 1,   // Seek relative to the current file position
-    LFS2_SEEK_END = 2,   // Seek relative to the end of the file
+enum lfs_whence_flags {
+    LFS_SEEK_SET = 0,   // Seek relative to an absolute position
+    LFS_SEEK_CUR = 1,   // Seek relative to the current file position
+    LFS_SEEK_END = 2,   // Seek relative to the end of the file
 };
 
 
 // Configuration provided during initialization of the littlefs
-struct lfs2_config {
+struct lfs_config {
     // Opaque user provided context that can be used to pass
     // information to the block device operations
     void *context;
 
     // Read a region in a block. Negative error codes are propogated
     // to the user.
-    int (*read)(const struct lfs2_config *c, lfs2_block_t block,
-            lfs2_off_t off, void *buffer, lfs2_size_t size);
+    int (*read)(const struct lfs_config *c, lfs_block_t block,
+            lfs_off_t off, void *buffer, lfs_size_t size);
 
     // Program a region in a block. The block must have previously
     // been erased. Negative error codes are propogated to the user.
-    // May return LFS2_ERR_CORRUPT if the block should be considered bad.
-    int (*prog)(const struct lfs2_config *c, lfs2_block_t block,
-            lfs2_off_t off, const void *buffer, lfs2_size_t size);
+    // May return LFS_ERR_CORRUPT if the block should be considered bad.
+    int (*prog)(const struct lfs_config *c, lfs_block_t block,
+            lfs_off_t off, const void *buffer, lfs_size_t size);
 
     // Erase a block. A block must be erased before being programmed.
     // The state of an erased block is undefined. Negative error codes
     // are propogated to the user.
-    // May return LFS2_ERR_CORRUPT if the block should be considered bad.
-    int (*erase)(const struct lfs2_config *c, lfs2_block_t block);
+    // May return LFS_ERR_CORRUPT if the block should be considered bad.
+    int (*erase)(const struct lfs_config *c, lfs_block_t block);
 
     // Sync the state of the underlying block device. Negative error codes
     // are propogated to the user.
-    int (*sync)(const struct lfs2_config *c);
+    int (*sync)(const struct lfs_config *c);
 
     // Minimum size of a block read. All read operations will be a
     // multiple of this value.
-    lfs2_size_t read_size;
+    lfs_size_t read_size;
 
     // Minimum size of a block program. All program operations will be a
     // multiple of this value.
-    lfs2_size_t prog_size;
+    lfs_size_t prog_size;
 
     // Size of an erasable block. This does not impact ram consumption and
     // may be larger than the physical erase size. However, non-inlined files
     // take up at minimum one block. Must be a multiple of the read
     // and program sizes.
-    lfs2_size_t block_size;
+    lfs_size_t block_size;
 
     // Number of erasable blocks on the device.
-    lfs2_size_t block_count;
+    lfs_size_t block_count;
 
-    // Number of erase cycles before we should move data to another block.
-    // May be zero, in which case no block-level wear-leveling is performed.
-    uint32_t block_cycles;
+    // Number of erase cycles before littlefs evicts metadata logs and moves 
+    // the metadata to another block. Suggested values are in the
+    // range 100-1000, with large values having better performance at the cost
+    // of less consistent wear distribution.
+    //
+    // Set to -1 to disable block-level wear-leveling.
+    int32_t block_cycles;
 
     // Size of block caches. Each cache buffers a portion of a block in RAM.
     // The littlefs needs a read cache, a program cache, and one additional
     // cache per file. Larger caches can improve performance by storing more
     // data and reducing the number of disk accesses. Must be a multiple of
     // the read and program sizes, and a factor of the block size.
-    lfs2_size_t cache_size;
+    lfs_size_t cache_size;
 
     // Size of the lookahead buffer in bytes. A larger lookahead buffer
     // increases the number of blocks found during an allocation pass. The
     // lookahead buffer is stored as a compact bitmap, so each byte of RAM
-    // can track 8 blocks. Must be a multiple of 4.
-    lfs2_size_t lookahead_size;
+    // can track 8 blocks. Must be a multiple of 8.
+    lfs_size_t lookahead_size;
 
     // Optional statically allocated read buffer. Must be cache_size.
-    // By default lfs2_malloc is used to allocate this buffer.
+    // By default lfs_malloc is used to allocate this buffer.
     void *read_buffer;
 
     // Optional statically allocated program buffer. Must be cache_size.
-    // By default lfs2_malloc is used to allocate this buffer.
+    // By default lfs_malloc is used to allocate this buffer.
     void *prog_buffer;
 
-    // Optional statically allocated program buffer. Must be lookahead_size.
-    // By default lfs2_malloc is used to allocate this buffer.
+    // Optional statically allocated lookahead buffer. Must be lookahead_size
+    // and aligned to a 32-bit boundary. By default lfs_malloc is used to
+    // allocate this buffer.
     void *lookahead_buffer;
 
     // Optional upper limit on length of file names in bytes. No downside for
     // larger names except the size of the info struct which is controlled by
-    // the LFS2_NAME_MAX define. Defaults to LFS2_NAME_MAX when zero. Stored in
+    // the LFS_NAME_MAX define. Defaults to LFS_NAME_MAX when zero. Stored in
     // superblock and must be respected by other littlefs drivers.
-    lfs2_size_t name_max;
+    lfs_size_t name_max;
 
     // Optional upper limit on files in bytes. No downside for larger files
-    // but must be <= LFS2_FILE_MAX. Defaults to LFS2_FILE_MAX when zero. Stored
+    // but must be <= LFS_FILE_MAX. Defaults to LFS_FILE_MAX when zero. Stored
     // in superblock and must be respected by other littlefs drivers.
-    lfs2_size_t file_max;
+    lfs_size_t file_max;
 
     // Optional upper limit on custom attributes in bytes. No downside for
-    // larger attributes size but must be <= LFS2_ATTR_MAX. Defaults to
-    // LFS2_ATTR_MAX when zero.
-    lfs2_size_t attr_max;
+    // larger attributes size but must be <= LFS_ATTR_MAX. Defaults to
+    // LFS_ATTR_MAX when zero.
+    lfs_size_t attr_max;
 };
 
 // File info structure
-struct lfs2_info {
-    // Type of the file, either LFS2_TYPE_REG or LFS2_TYPE_DIR
+struct lfs_info {
+    // Type of the file, either LFS_TYPE_REG or LFS_TYPE_DIR
     uint8_t type;
 
     // Size of the file, only valid for REG files. Limited to 32-bits.
-    lfs2_size_t size;
+    lfs_size_t size;
 
     // Name of the file stored as a null-terminated string. Limited to
-    // LFS2_NAME_MAX+1, which can be changed by redefining LFS2_NAME_MAX to
-    // reduce RAM. LFS2_NAME_MAX is stored in superblock and must be
+    // LFS_NAME_MAX+1, which can be changed by redefining LFS_NAME_MAX to
+    // reduce RAM. LFS_NAME_MAX is stored in superblock and must be
     // respected by other littlefs drivers.
-    char name[LFS2_NAME_MAX+1];
+    char name[LFS_NAME_MAX+1];
 };
 
 // Custom attribute structure, used to describe custom attributes
 // committed atomically during file writes.
-struct lfs2_attr {
+struct lfs_attr {
     // 8-bit type of attribute, provided by user and used to
     // identify the attribute
     uint8_t type;
@@ -261,14 +267,14 @@ struct lfs2_attr {
     // Pointer to buffer containing the attribute
     void *buffer;
 
-    // Size of attribute in bytes, limited to LFS2_ATTR_MAX
-    lfs2_size_t size;
+    // Size of attribute in bytes, limited to LFS_ATTR_MAX
+    lfs_size_t size;
 };
 
-// Optional configuration provided during lfs2_file_opencfg
-struct lfs2_file_config {
+// Optional configuration provided during lfs_file_opencfg
+struct lfs_file_config {
     // Optional statically allocated file buffer. Must be cache_size.
-    // By default lfs2_malloc is used to allocate this buffer.
+    // By default lfs_malloc is used to allocate this buffer.
     void *buffer;
 
     // Optional list of custom attributes related to the file. If the file
@@ -278,109 +284,113 @@ struct lfs2_file_config {
     // write occurs atomically with update to the file's contents.
     //
     // Custom attributes are uniquely identified by an 8-bit type and limited
-    // to LFS2_ATTR_MAX bytes. When read, if the stored attribute is smaller
+    // to LFS_ATTR_MAX bytes. When read, if the stored attribute is smaller
     // than the buffer, it will be padded with zeros. If the stored attribute
     // is larger, then it will be silently truncated. If the attribute is not
     // found, it will be created implicitly.
-    struct lfs2_attr *attrs;
+    struct lfs_attr *attrs;
 
     // Number of custom attributes in the list
-    lfs2_size_t attr_count;
+    lfs_size_t attr_count;
 };
 
 
 /// internal littlefs data structures ///
-typedef struct lfs2_cache {
-    lfs2_block_t block;
-    lfs2_off_t off;
-    lfs2_size_t size;
+typedef struct lfs_cache {
+    lfs_block_t block;
+    lfs_off_t off;
+    lfs_size_t size;
     uint8_t *buffer;
-} lfs2_cache_t;
+} lfs_cache_t;
 
-typedef struct lfs2_mdir {
-    lfs2_block_t pair[2];
+typedef struct lfs_mdir {
+    lfs_block_t pair[2];
     uint32_t rev;
-    lfs2_off_t off;
+    lfs_off_t off;
     uint32_t etag;
     uint16_t count;
     bool erased;
     bool split;
-    lfs2_block_t tail[2];
-} lfs2_mdir_t;
+    lfs_block_t tail[2];
+} lfs_mdir_t;
 
 // littlefs directory type
-typedef struct lfs2_dir {
-    struct lfs2_dir *next;
+typedef struct lfs_dir {
+    struct lfs_dir *next;
     uint16_t id;
     uint8_t type;
-    lfs2_mdir_t m;
+    lfs_mdir_t m;
 
-    lfs2_off_t pos;
-    lfs2_block_t head[2];
-} lfs2_dir_t;
+    lfs_off_t pos;
+    lfs_block_t head[2];
+} lfs_dir_t;
 
 // littlefs file type
-typedef struct lfs2_file {
-    struct lfs2_file *next;
+typedef struct lfs_file {
+    struct lfs_file *next;
     uint16_t id;
     uint8_t type;
-    lfs2_mdir_t m;
+    lfs_mdir_t m;
 
-    struct lfs2_ctz {
-        lfs2_block_t head;
-        lfs2_size_t size;
+    struct lfs_ctz {
+        lfs_block_t head;
+        lfs_size_t size;
     } ctz;
 
     uint32_t flags;
-    lfs2_off_t pos;
-    lfs2_block_t block;
-    lfs2_off_t off;
-    lfs2_cache_t cache;
+    lfs_off_t pos;
+    lfs_block_t block;
+    lfs_off_t off;
+    lfs_cache_t cache;
 
-    const struct lfs2_file_config *cfg;
-} lfs2_file_t;
+    const struct lfs_file_config *cfg;
+} lfs_file_t;
 
-typedef struct lfs2_superblock {
+typedef struct lfs_superblock {
     uint32_t version;
-    lfs2_size_t block_size;
-    lfs2_size_t block_count;
-    lfs2_size_t name_max;
-    lfs2_size_t file_max;
-    lfs2_size_t attr_max;
-} lfs2_superblock_t;
+    lfs_size_t block_size;
+    lfs_size_t block_count;
+    lfs_size_t name_max;
+    lfs_size_t file_max;
+    lfs_size_t attr_max;
+} lfs_superblock_t;
 
 // The littlefs filesystem type
-typedef struct lfs2 {
-    lfs2_cache_t rcache;
-    lfs2_cache_t pcache;
+typedef struct lfs {
+    lfs_cache_t rcache;
+    lfs_cache_t pcache;
 
-    lfs2_block_t root[2];
-    struct lfs2_mlist {
-        struct lfs2_mlist *next;
+    lfs_block_t root[2];
+    struct lfs_mlist {
+        struct lfs_mlist *next;
         uint16_t id;
         uint8_t type;
-        lfs2_mdir_t m;
+        lfs_mdir_t m;
     } *mlist;
     uint32_t seed;
 
-    struct lfs2_gstate {
+    struct lfs_gstate {
         uint32_t tag;
-        lfs2_block_t pair[2];
+        lfs_block_t pair[2];
     } gstate, gpending, gdelta;
 
-    struct lfs2_free {
-        lfs2_block_t off;
-        lfs2_block_t size;
-        lfs2_block_t i;
-        lfs2_block_t ack;
+    struct lfs_free {
+        lfs_block_t off;
+        lfs_block_t size;
+        lfs_block_t i;
+        lfs_block_t ack;
         uint32_t *buffer;
     } free;
 
-    const struct lfs2_config *cfg;
-    lfs2_size_t name_max;
-    lfs2_size_t file_max;
-    lfs2_size_t attr_max;
-} lfs2_t;
+    const struct lfs_config *cfg;
+    lfs_size_t name_max;
+    lfs_size_t file_max;
+    lfs_size_t attr_max;
+
+#ifdef LFS_MIGRATE
+    struct lfs1 *lfs1;
+#endif
+} lfs_t;
 
 
 /// Filesystem functions ///
@@ -392,23 +402,23 @@ typedef struct lfs2 {
 // be zeroed for defaults and backwards compatibility.
 //
 // Returns a negative error code on failure.
-int lfs2_format(lfs2_t *lfs2, const struct lfs2_config *config);
+int lfs_format(lfs_t *lfs, const struct lfs_config *config);
 
 // Mounts a littlefs
 //
 // Requires a littlefs object and config struct. Multiple filesystems
 // may be mounted simultaneously with multiple littlefs objects. Both
-// lfs2 and config must be allocated while mounted. The config struct must
+// lfs and config must be allocated while mounted. The config struct must
 // be zeroed for defaults and backwards compatibility.
 //
 // Returns a negative error code on failure.
-int lfs2_mount(lfs2_t *lfs2, const struct lfs2_config *config);
+int lfs_mount(lfs_t *lfs, const struct lfs_config *config);
 
 // Unmounts a littlefs
 //
 // Does nothing besides releasing any allocated resources.
 // Returns a negative error code on failure.
-int lfs2_unmount(lfs2_t *lfs2);
+int lfs_unmount(lfs_t *lfs);
 
 /// General operations ///
 
@@ -416,7 +426,7 @@ int lfs2_unmount(lfs2_t *lfs2);
 //
 // If removing a directory, the directory must be empty.
 // Returns a negative error code on failure.
-int lfs2_remove(lfs2_t *lfs2, const char *path);
+int lfs_remove(lfs_t *lfs, const char *path);
 
 // Rename or move a file or directory
 //
@@ -424,45 +434,45 @@ int lfs2_remove(lfs2_t *lfs2, const char *path);
 // If the destination is a directory, the directory must be empty.
 //
 // Returns a negative error code on failure.
-int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath);
+int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath);
 
 // Find info about a file or directory
 //
 // Fills out the info structure, based on the specified file or directory.
 // Returns a negative error code on failure.
-int lfs2_stat(lfs2_t *lfs2, const char *path, struct lfs2_info *info);
+int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info);
 
 // Get a custom attribute
 //
 // Custom attributes are uniquely identified by an 8-bit type and limited
-// to LFS2_ATTR_MAX bytes. When read, if the stored attribute is smaller than
+// to LFS_ATTR_MAX bytes. When read, if the stored attribute is smaller than
 // the buffer, it will be padded with zeros. If the stored attribute is larger,
 // then it will be silently truncated. If no attribute is found, the error
-// LFS2_ERR_NOATTR is returned and the buffer is filled with zeros.
+// LFS_ERR_NOATTR is returned and the buffer is filled with zeros.
 //
 // Returns the size of the attribute, or a negative error code on failure.
 // Note, the returned size is the size of the attribute on disk, irrespective
 // of the size of the buffer. This can be used to dynamically allocate a buffer
 // or check for existance.
-lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
-        uint8_t type, void *buffer, lfs2_size_t size);
+lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path,
+        uint8_t type, void *buffer, lfs_size_t size);
 
 // Set custom attributes
 //
 // Custom attributes are uniquely identified by an 8-bit type and limited
-// to LFS2_ATTR_MAX bytes. If an attribute is not found, it will be
+// to LFS_ATTR_MAX bytes. If an attribute is not found, it will be
 // implicitly created.
 //
 // Returns a negative error code on failure.
-int lfs2_setattr(lfs2_t *lfs2, const char *path,
-        uint8_t type, const void *buffer, lfs2_size_t size);
+int lfs_setattr(lfs_t *lfs, const char *path,
+        uint8_t type, const void *buffer, lfs_size_t size);
 
 // Removes a custom attribute
 //
 // If an attribute is not found, nothing happens.
 //
 // Returns a negative error code on failure.
-int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type);
+int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type);
 
 
 /// File operations ///
@@ -470,25 +480,25 @@ int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type);
 // Open a file
 //
 // The mode that the file is opened in is determined by the flags, which
-// are values from the enum lfs2_open_flags that are bitwise-ored together.
+// are values from the enum lfs_open_flags that are bitwise-ored together.
 //
 // Returns a negative error code on failure.
-int lfs2_file_open(lfs2_t *lfs2, lfs2_file_t *file,
+int lfs_file_open(lfs_t *lfs, lfs_file_t *file,
         const char *path, int flags);
 
 // Open a file with extra configuration
 //
 // The mode that the file is opened in is determined by the flags, which
-// are values from the enum lfs2_open_flags that are bitwise-ored together.
+// are values from the enum lfs_open_flags that are bitwise-ored together.
 //
 // The config struct provides additional config options per file as described
 // above. The config struct must be allocated while the file is open, and the
 // config struct must be zeroed for defaults and backwards compatibility.
 //
 // Returns a negative error code on failure.
-int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
+int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file,
         const char *path, int flags,
-        const struct lfs2_file_config *config);
+        const struct lfs_file_config *config);
 
 // Close a file
 //
@@ -496,20 +506,20 @@ int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
 // sync had been called and releases any allocated resources.
 //
 // Returns a negative error code on failure.
-int lfs2_file_close(lfs2_t *lfs2, lfs2_file_t *file);
+int lfs_file_close(lfs_t *lfs, lfs_file_t *file);
 
 // Synchronize a file on storage
 //
 // Any pending writes are written out to storage.
 // Returns a negative error code on failure.
-int lfs2_file_sync(lfs2_t *lfs2, lfs2_file_t *file);
+int lfs_file_sync(lfs_t *lfs, lfs_file_t *file);
 
 // Read data from file
 //
 // Takes a buffer and size indicating where to store the read data.
 // Returns the number of bytes read, or a negative error code on failure.
-lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
-        void *buffer, lfs2_size_t size);
+lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file,
+        void *buffer, lfs_size_t size);
 
 // Write data to file
 //
@@ -517,38 +527,38 @@ lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
 // actually be updated on the storage until either sync or close is called.
 //
 // Returns the number of bytes written, or a negative error code on failure.
-lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
-        const void *buffer, lfs2_size_t size);
+lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file,
+        const void *buffer, lfs_size_t size);
 
 // Change the position of the file
 //
 // The change in position is determined by the offset and whence flag.
-// Returns the old position of the file, or a negative error code on failure.
-lfs2_soff_t lfs2_file_seek(lfs2_t *lfs2, lfs2_file_t *file,
-        lfs2_soff_t off, int whence);
+// Returns the new position of the file, or a negative error code on failure.
+lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file,
+        lfs_soff_t off, int whence);
 
 // Truncates the size of the file to the specified size
 //
 // Returns a negative error code on failure.
-int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size);
+int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size);
 
 // Return the position of the file
 //
-// Equivalent to lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_CUR)
+// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR)
 // Returns the position of the file, or a negative error code on failure.
-lfs2_soff_t lfs2_file_tell(lfs2_t *lfs2, lfs2_file_t *file);
+lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file);
 
 // Change the position of the file to the beginning of the file
 //
-// Equivalent to lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_CUR)
+// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_SET)
 // Returns a negative error code on failure.
-int lfs2_file_rewind(lfs2_t *lfs2, lfs2_file_t *file);
+int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file);
 
 // Return the size of the file
 //
-// Similar to lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_END)
+// Similar to lfs_file_seek(lfs, file, 0, LFS_SEEK_END)
 // Returns the size of the file, or a negative error code on failure.
-lfs2_soff_t lfs2_file_size(lfs2_t *lfs2, lfs2_file_t *file);
+lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file);
 
 
 /// Directory operations ///
@@ -556,25 +566,26 @@ lfs2_soff_t lfs2_file_size(lfs2_t *lfs2, lfs2_file_t *file);
 // Create a directory
 //
 // Returns a negative error code on failure.
-int lfs2_mkdir(lfs2_t *lfs2, const char *path);
+int lfs_mkdir(lfs_t *lfs, const char *path);
 
 // Open a directory
 //
 // Once open a directory can be used with read to iterate over files.
 // Returns a negative error code on failure.
-int lfs2_dir_open(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path);
+int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path);
 
 // Close a directory
 //
 // Releases any allocated resources.
 // Returns a negative error code on failure.
-int lfs2_dir_close(lfs2_t *lfs2, lfs2_dir_t *dir);
+int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir);
 
 // Read an entry in the directory
 //
 // Fills out the info structure, based on the specified file or directory.
-// Returns a negative error code on failure.
-int lfs2_dir_read(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info);
+// Returns a positive value on success, 0 at the end of directory,
+// or a negative error code on failure.
+int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info);
 
 // Change the position of the directory
 //
@@ -582,7 +593,7 @@ int lfs2_dir_read(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info);
 // an absolute offset in the directory seek.
 //
 // Returns a negative error code on failure.
-int lfs2_dir_seek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off);
+int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off);
 
 // Return the position of the directory
 //
@@ -590,12 +601,12 @@ int lfs2_dir_seek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off);
 // sense, but does indicate the current position in the directory iteration.
 //
 // Returns the position of the directory, or a negative error code on failure.
-lfs2_soff_t lfs2_dir_tell(lfs2_t *lfs2, lfs2_dir_t *dir);
+lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir);
 
 // Change the position of the directory to the beginning of the directory
 //
 // Returns a negative error code on failure.
-int lfs2_dir_rewind(lfs2_t *lfs2, lfs2_dir_t *dir);
+int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir);
 
 
 /// Filesystem-level filesystem operations
@@ -606,7 +617,7 @@ int lfs2_dir_rewind(lfs2_t *lfs2, lfs2_dir_t *dir);
 // size may be larger than the filesystem actually is.
 //
 // Returns the number of allocated blocks, or a negative error code on failure.
-lfs2_ssize_t lfs2_fs_size(lfs2_t *lfs2);
+lfs_ssize_t lfs_fs_size(lfs_t *lfs);
 
 // Traverse through all blocks in use by the filesystem
 //
@@ -615,7 +626,22 @@ lfs2_ssize_t lfs2_fs_size(lfs2_t *lfs2);
 // blocks are in use or how much of the storage is available.
 //
 // Returns a negative error code on failure.
-int lfs2_fs_traverse(lfs2_t *lfs2, int (*cb)(void*, lfs2_block_t), void *data);
+int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data);
+
+#ifdef LFS_MIGRATE
+// Attempts to migrate a previous version of littlefs
+//
+// Behaves similarly to the lfs_format function. Attempts to mount
+// the previous version of littlefs and update the filesystem so it can be
+// mounted with the current version of littlefs.
+//
+// Requires a littlefs object and config struct. This clobbers the littlefs
+// object, and does not leave the filesystem mounted. The config struct must
+// be zeroed for defaults and backwards compatibility.
+//
+// Returns a negative error code on failure.
+int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg);
+#endif
 
 
 #ifdef __cplusplus

lfs2_util.h

@@ -1,219 +0,0 @@
-/*
- * lfs2 utility functions
- *
- * Copyright (c) 2017, Arm Limited. All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#ifndef LFS2_UTIL_H
-#define LFS2_UTIL_H
-
-// Users can override lfs2_util.h with their own configuration by defining
-// LFS2_CONFIG as a header file to include (-DLFS2_CONFIG=lfs2_config.h).
-//
-// If LFS2_CONFIG is used, none of the default utils will be emitted and must be
-// provided by the config file. To start, I would suggest copying lfs2_util.h
-// and modifying as needed.
-#ifdef LFS2_CONFIG
-#define LFS2_STRINGIZE(x) LFS2_STRINGIZE2(x)
-#define LFS2_STRINGIZE2(x) #x
-#include LFS2_STRINGIZE(LFS2_CONFIG)
-#else
-
-// System includes
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <inttypes.h>
-
-#ifndef LFS2_NO_MALLOC
-#include <stdlib.h>
-#endif
-#ifndef LFS2_NO_ASSERT
-#include <assert.h>
-#endif
-#if !defined(LFS2_NO_DEBUG) || !defined(LFS2_NO_WARN) || !defined(LFS2_NO_ERROR)
-#include <stdio.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-// Macros, may be replaced by system specific wrappers. Arguments to these
-// macros must not have side-effects as the macros can be removed for a smaller
-// code footprint
-
-// Logging functions
-#ifndef LFS2_NO_DEBUG
-#define LFS2_DEBUG(fmt, ...) \
-    printf("lfs2 debug:%d: " fmt "\n", __LINE__, __VA_ARGS__)
-#else
-#define LFS2_DEBUG(fmt, ...)
-#endif
-
-#ifndef LFS2_NO_WARN
-#define LFS2_WARN(fmt, ...) \
-    printf("lfs2 warn:%d: " fmt "\n", __LINE__, __VA_ARGS__)
-#else
-#define LFS2_WARN(fmt, ...)
-#endif
-
-#ifndef LFS2_NO_ERROR
-#define LFS2_ERROR(fmt, ...) \
-    printf("lfs2 error:%d: " fmt "\n", __LINE__, __VA_ARGS__)
-#else
-#define LFS2_ERROR(fmt, ...)
-#endif
-
-// Runtime assertions
-#ifndef LFS2_NO_ASSERT
-#define LFS2_ASSERT(test) assert(test)
-#else
-#define LFS2_ASSERT(test)
-#endif
-
-
-// Builtin functions, these may be replaced by more efficient
-// toolchain-specific implementations. LFS2_NO_INTRINSICS falls back to a more
-// expensive basic C implementation for debugging purposes
-
-// Min/max functions for unsigned 32-bit numbers
-static inline uint32_t lfs2_max(uint32_t a, uint32_t b) {
-    return (a > b) ? a : b;
-}
-
-static inline uint32_t lfs2_min(uint32_t a, uint32_t b) {
-    return (a < b) ? a : b;
-}
-
-// Align to nearest multiple of a size
-static inline uint32_t lfs2_aligndown(uint32_t a, uint32_t alignment) {
-    return a - (a % alignment);
-}
-
-static inline uint32_t lfs2_alignup(uint32_t a, uint32_t alignment) {
-    return lfs2_aligndown(a + alignment-1, alignment);
-}
-
-// Find the next smallest power of 2 less than or equal to a
-static inline uint32_t lfs2_npw2(uint32_t a) {
-#if !defined(LFS2_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
-    return 32 - __builtin_clz(a-1);
-#else
-    uint32_t r = 0;
-    uint32_t s;
-    a -= 1;
-    s = (a > 0xffff) << 4; a >>= s; r |= s;
-    s = (a > 0xff  ) << 3; a >>= s; r |= s;
-    s = (a > 0xf   ) << 2; a >>= s; r |= s;
-    s = (a > 0x3   ) << 1; a >>= s; r |= s;
-    return (r | (a >> 1)) + 1;
-#endif
-}
-
-// Count the number of trailing binary zeros in a
-// lfs2_ctz(0) may be undefined
-static inline uint32_t lfs2_ctz(uint32_t a) {
-#if !defined(LFS2_NO_INTRINSICS) && defined(__GNUC__)
-    return __builtin_ctz(a);
-#else
-    return lfs2_npw2((a & -a) + 1) - 1;
-#endif
-}
-
-// Count the number of binary ones in a
-static inline uint32_t lfs2_popc(uint32_t a) {
-#if !defined(LFS2_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
-    return __builtin_popcount(a);
-#else
-    a = a - ((a >> 1) & 0x55555555);
-    a = (a & 0x33333333) + ((a >> 2) & 0x33333333);
-    return (((a + (a >> 4)) & 0xf0f0f0f) * 0x1010101) >> 24;
-#endif
-}
-
-// Find the sequence comparison of a and b, this is the distance
-// between a and b ignoring overflow
-static inline int lfs2_scmp(uint32_t a, uint32_t b) {
-    return (int)(unsigned)(a - b);
-}
-
-// Convert between 32-bit little-endian and native order
-static inline uint32_t lfs2_fromle32(uint32_t a) {
-#if !defined(LFS2_NO_INTRINSICS) && ( \
-    (defined(  BYTE_ORDER  ) &&   BYTE_ORDER   ==   ORDER_LITTLE_ENDIAN  ) || \
-    (defined(__BYTE_ORDER  ) && __BYTE_ORDER   == __ORDER_LITTLE_ENDIAN  ) || \
-    (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
-    return a;
-#elif !defined(LFS2_NO_INTRINSICS) && ( \
-    (defined(  BYTE_ORDER  ) &&   BYTE_ORDER   ==   ORDER_BIG_ENDIAN  ) || \
-    (defined(__BYTE_ORDER  ) && __BYTE_ORDER   == __ORDER_BIG_ENDIAN  ) || \
-    (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
-    return __builtin_bswap32(a);
-#else
-    return (((uint8_t*)&a)[0] <<  0) |
-           (((uint8_t*)&a)[1] <<  8) |
-           (((uint8_t*)&a)[2] << 16) |
-           (((uint8_t*)&a)[3] << 24);
-#endif
-}
-
-static inline uint32_t lfs2_tole32(uint32_t a) {
-    return lfs2_fromle32(a);
-}
-
-// Convert between 32-bit big-endian and native order
-static inline uint32_t lfs2_frombe32(uint32_t a) {
-#if !defined(LFS2_NO_INTRINSICS) && ( \
-    (defined(  BYTE_ORDER  ) &&   BYTE_ORDER   ==   ORDER_LITTLE_ENDIAN  ) || \
-    (defined(__BYTE_ORDER  ) && __BYTE_ORDER   == __ORDER_LITTLE_ENDIAN  ) || \
-    (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
-    return __builtin_bswap32(a);
-#elif !defined(LFS2_NO_INTRINSICS) && ( \
-    (defined(  BYTE_ORDER  ) &&   BYTE_ORDER   ==   ORDER_BIG_ENDIAN  ) || \
-    (defined(__BYTE_ORDER  ) && __BYTE_ORDER   == __ORDER_BIG_ENDIAN  ) || \
-    (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
-    return a;
-#else
-    return (((uint8_t*)&a)[0] << 24) |
-           (((uint8_t*)&a)[1] << 16) |
-           (((uint8_t*)&a)[2] <<  8) |
-           (((uint8_t*)&a)[3] <<  0);
-#endif
-}
-
-static inline uint32_t lfs2_tobe32(uint32_t a) {
-    return lfs2_frombe32(a);
-}
-
-// Calculate CRC-32 with polynomial = 0x04c11db7
-uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size);
-
-// Allocate memory, only used if buffers are not provided to littlefs
-static inline void *lfs2_malloc(size_t size) {
-#ifndef LFS2_NO_MALLOC
-    return malloc(size);
-#else
-    (void)size;
-    return NULL;
-#endif
-}
-
-// Deallocate memory, only used if buffers are not provided to littlefs
-static inline void lfs2_free(void *p) {
-#ifndef LFS2_NO_MALLOC
-    free(p);
-#else
-    (void)p;
-#endif
-}
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif
-#endif

lfs_util.c

@@ -1,17 +1,17 @@
 /*
- * lfs2 util functions
+ * lfs util functions
  *
  * Copyright (c) 2017, Arm Limited. All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include "lfs2_util.h"
+#include "lfs_util.h"
 
 // Only compile if user does not provide custom config
-#ifndef LFS2_CONFIG
+#ifndef LFS_CONFIG
 
 
 // Software CRC implementation with small lookup table
-uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size) {
+uint32_t lfs_crc(uint32_t crc, const void *buffer, size_t size) {
     static const uint32_t rtable[16] = {
         0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac,
         0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,

lfs_util.h

@@ -0,0 +1,230 @@
+/*
+ * lfs utility functions
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef LFS_UTIL_H
+#define LFS_UTIL_H
+
+// Users can override lfs_util.h with their own configuration by defining
+// LFS_CONFIG as a header file to include (-DLFS_CONFIG=lfs_config.h).
+//
+// If LFS_CONFIG is used, none of the default utils will be emitted and must be
+// provided by the config file. To start, I would suggest copying lfs_util.h
+// and modifying as needed.
+#ifdef LFS_CONFIG
+#define LFS_STRINGIZE(x) LFS_STRINGIZE2(x)
+#define LFS_STRINGIZE2(x) #x
+#include LFS_STRINGIZE(LFS_CONFIG)
+#else
+
+// System includes
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <inttypes.h>
+
+#ifndef LFS_NO_MALLOC
+#include <stdlib.h>
+#endif
+#ifndef LFS_NO_ASSERT
+#include <assert.h>
+#endif
+#if !defined(LFS_NO_DEBUG) || \
+        !defined(LFS_NO_WARN) || \
+        !defined(LFS_NO_ERROR) || \
+        defined(LFS_YES_TRACE)
+#include <stdio.h>
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+// Macros, may be replaced by system specific wrappers. Arguments to these
+// macros must not have side-effects as the macros can be removed for a smaller
+// code footprint
+
+// Logging functions
+#ifdef LFS_YES_TRACE
+#define LFS_TRACE(fmt, ...) \
+    printf("lfs_trace:%d: " fmt "\n", __LINE__, __VA_ARGS__)
+#else
+#define LFS_TRACE(fmt, ...)
+#endif
+
+#ifndef LFS_NO_DEBUG
+#define LFS_DEBUG(fmt, ...) \
+    printf("lfs_debug:%d: " fmt "\n", __LINE__, __VA_ARGS__)
+#else
+#define LFS_DEBUG(fmt, ...)
+#endif
+
+#ifndef LFS_NO_WARN
+#define LFS_WARN(fmt, ...) \
+    printf("lfs_warn:%d: " fmt "\n", __LINE__, __VA_ARGS__)
+#else
+#define LFS_WARN(fmt, ...)
+#endif
+
+#ifndef LFS_NO_ERROR
+#define LFS_ERROR(fmt, ...) \
+    printf("lfs_error:%d: " fmt "\n", __LINE__, __VA_ARGS__)
+#else
+#define LFS_ERROR(fmt, ...)
+#endif
+
+// Runtime assertions
+#ifndef LFS_NO_ASSERT
+#define LFS_ASSERT(test) assert(test)
+#else
+#define LFS_ASSERT(test)
+#endif
+
+
+// Builtin functions, these may be replaced by more efficient
+// toolchain-specific implementations. LFS_NO_INTRINSICS falls back to a more
+// expensive basic C implementation for debugging purposes
+
+// Min/max functions for unsigned 32-bit numbers
+static inline uint32_t lfs_max(uint32_t a, uint32_t b) {
+    return (a > b) ? a : b;
+}
+
+static inline uint32_t lfs_min(uint32_t a, uint32_t b) {
+    return (a < b) ? a : b;
+}
+
+// Align to nearest multiple of a size
+static inline uint32_t lfs_aligndown(uint32_t a, uint32_t alignment) {
+    return a - (a % alignment);
+}
+
+static inline uint32_t lfs_alignup(uint32_t a, uint32_t alignment) {
+    return lfs_aligndown(a + alignment-1, alignment);
+}
+
+// Find the next smallest power of 2 less than or equal to a
+static inline uint32_t lfs_npw2(uint32_t a) {
+#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
+    return 32 - __builtin_clz(a-1);
+#else
+    uint32_t r = 0;
+    uint32_t s;
+    a -= 1;
+    s = (a > 0xffff) << 4; a >>= s; r |= s;
+    s = (a > 0xff  ) << 3; a >>= s; r |= s;
+    s = (a > 0xf   ) << 2; a >>= s; r |= s;
+    s = (a > 0x3   ) << 1; a >>= s; r |= s;
+    return (r | (a >> 1)) + 1;
+#endif
+}
+
+// Count the number of trailing binary zeros in a
+// lfs_ctz(0) may be undefined
+static inline uint32_t lfs_ctz(uint32_t a) {
+#if !defined(LFS_NO_INTRINSICS) && defined(__GNUC__)
+    return __builtin_ctz(a);
+#else
+    return lfs_npw2((a & -a) + 1) - 1;
+#endif
+}
+
+// Count the number of binary ones in a
+static inline uint32_t lfs_popc(uint32_t a) {
+#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
+    return __builtin_popcount(a);
+#else
+    a = a - ((a >> 1) & 0x55555555);
+    a = (a & 0x33333333) + ((a >> 2) & 0x33333333);
+    return (((a + (a >> 4)) & 0xf0f0f0f) * 0x1010101) >> 24;
+#endif
+}
+
+// Find the sequence comparison of a and b, this is the distance
+// between a and b ignoring overflow
+static inline int lfs_scmp(uint32_t a, uint32_t b) {
+    return (int)(unsigned)(a - b);
+}
+
+// Convert between 32-bit little-endian and native order
+static inline uint32_t lfs_fromle32(uint32_t a) {
+#if !defined(LFS_NO_INTRINSICS) && ( \
+    (defined(  BYTE_ORDER  ) && defined(  ORDER_LITTLE_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_LITTLE_ENDIAN  ) || \
+    (defined(__BYTE_ORDER  ) && defined(__ORDER_LITTLE_ENDIAN  ) && __BYTE_ORDER   == __ORDER_LITTLE_ENDIAN  ) || \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+    return a;
+#elif !defined(LFS_NO_INTRINSICS) && ( \
+    (defined(  BYTE_ORDER  ) && defined(  ORDER_BIG_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_BIG_ENDIAN  ) || \
+    (defined(__BYTE_ORDER  ) && defined(__ORDER_BIG_ENDIAN  ) && __BYTE_ORDER   == __ORDER_BIG_ENDIAN  ) || \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
+    return __builtin_bswap32(a);
+#else
+    return (((uint8_t*)&a)[0] <<  0) |
+           (((uint8_t*)&a)[1] <<  8) |
+           (((uint8_t*)&a)[2] << 16) |
+           (((uint8_t*)&a)[3] << 24);
+#endif
+}
+
+static inline uint32_t lfs_tole32(uint32_t a) {
+    return lfs_fromle32(a);
+}
+
+// Convert between 32-bit big-endian and native order
+static inline uint32_t lfs_frombe32(uint32_t a) {
+#if !defined(LFS_NO_INTRINSICS) && ( \
+    (defined(  BYTE_ORDER  ) && defined(  ORDER_LITTLE_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_LITTLE_ENDIAN  ) || \
+    (defined(__BYTE_ORDER  ) && defined(__ORDER_LITTLE_ENDIAN  ) && __BYTE_ORDER   == __ORDER_LITTLE_ENDIAN  ) || \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+    return __builtin_bswap32(a);
+#elif !defined(LFS_NO_INTRINSICS) && ( \
+    (defined(  BYTE_ORDER  ) && defined(  ORDER_BIG_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_BIG_ENDIAN  ) || \
+    (defined(__BYTE_ORDER  ) && defined(__ORDER_BIG_ENDIAN  ) && __BYTE_ORDER   == __ORDER_BIG_ENDIAN  ) || \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
+    return a;
+#else
+    return (((uint8_t*)&a)[0] << 24) |
+           (((uint8_t*)&a)[1] << 16) |
+           (((uint8_t*)&a)[2] <<  8) |
+           (((uint8_t*)&a)[3] <<  0);
+#endif
+}
+
+static inline uint32_t lfs_tobe32(uint32_t a) {
+    return lfs_frombe32(a);
+}
+
+// Calculate CRC-32 with polynomial = 0x04c11db7
+uint32_t lfs_crc(uint32_t crc, const void *buffer, size_t size);
+
+// Allocate memory, only used if buffers are not provided to littlefs
+// Note, memory must be 64-bit aligned
+static inline void *lfs_malloc(size_t size) {
+#ifndef LFS_NO_MALLOC
+    return malloc(size);
+#else
+    (void)size;
+    return NULL;
+#endif
+}
+
+// Deallocate memory, only used if buffers are not provided to littlefs
+static inline void lfs_free(void *p) {
+#ifndef LFS_NO_MALLOC
+    free(p);
+#else
+    (void)p;
+#endif
+}
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
+#endif

scripts/corrupt.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import struct
 import sys

scripts/debug.py

@@ -95,7 +95,7 @@ def main(*blocks):
         print '%04x: %08x  %-15s %3s %4s  %-23s  %-8s' % (
             off, tag,
             typeof(type) + (' bad!' if iscrc and ~crc else ''),
-            id if id != 0x3ff else '.',
+            hex(id)[2:] if id != 0x3ff else '.',
             size if size != 0x3ff else 'x',
             ' '.join('%02x' % ord(c) for c in data[:8]),
             ''.join(c if c >= ' ' and c <= '~' else '.' for c in data[:8]))

scripts/prefix.py

@@ -1,11 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # This script replaces prefixes of files, and symbols in that file.
 # Useful for creating different versions of the codebase that don't
 # conflict at compile time.
 #
 # example:
-# $ ./scripts/prefix.py lfs22
+# $ ./scripts/prefix.py lfs2
 
 import os
 import os.path
@@ -16,7 +16,7 @@ import tempfile
 import shutil
 import subprocess
 
-DEFAULT_PREFIX = "lfs2"
+DEFAULT_PREFIX = "lfs"
 
 def subn(from_prefix, to_prefix, name):
     name, count1 = re.subn('\\b'+from_prefix, to_prefix, name)

scripts/results.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python2
+
+import struct
+import sys
+import time
+import os
+import re
+
+def main():
+    with open('blocks/.config') as file:
+        read_size, prog_size, block_size, block_count = (
+            struct.unpack('<LLLL', file.read()))
+
+    real_size = sum(
+        os.path.getsize(os.path.join('blocks', f))
+        for f in os.listdir('blocks') if re.match('\d+', f))
+
+    with open('blocks/.stats') as file:
+        read_count, prog_count, erase_count = (
+            struct.unpack('<QQQ', file.read()))
+
+    runtime = time.time() - os.stat('blocks').st_ctime
+
+    print 'results: %dB %dB %dB %.3fs' % (
+        read_count, prog_count, erase_count, runtime)
+
+if __name__ == "__main__":
+    main(*sys.argv[1:])

scripts/template.fmt

@@ -0,0 +1,96 @@
+/// AUTOGENERATED TEST ///
+#include "lfs.h"
+#include "emubd/lfs_emubd.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+
+// test stuff
+static void test_assert(const char *file, unsigned line,
+        const char *s, uintmax_t v, uintmax_t e) {{
+    if (v != e) {{
+        fprintf(stderr, "\033[97m%s:%u: \033[91m"
+                "assert failed with %jd, expected %jd\033[0m\n"
+                "    %s\n\n", file, line, v, e, s);
+        exit(-2);
+    }}
+}}
+
+#define test_assert(v, e) \
+        test_assert(__FILE__, __LINE__, #v " => " #e, v, e)
+
+// implicit variable for asserts
+uintmax_t test;
+
+// utility functions for traversals
+static int __attribute__((used)) test_count(void *p, lfs_block_t b) {{
+    (void)b;
+    unsigned *u = (unsigned*)p;
+    *u += 1;
+    return 0;
+}}
+
+// lfs declarations
+lfs_t lfs;
+lfs_emubd_t bd;
+// other declarations for convenience
+lfs_file_t file;
+lfs_dir_t dir;
+struct lfs_info info;
+uint8_t buffer[1024];
+char path[1024];
+
+// test configuration options
+#ifndef LFS_READ_SIZE
+#define LFS_READ_SIZE 16
+#endif
+
+#ifndef LFS_PROG_SIZE
+#define LFS_PROG_SIZE LFS_READ_SIZE
+#endif
+
+#ifndef LFS_BLOCK_SIZE
+#define LFS_BLOCK_SIZE 512
+#endif
+
+#ifndef LFS_BLOCK_COUNT
+#define LFS_BLOCK_COUNT 1024
+#endif
+
+#ifndef LFS_BLOCK_CYCLES
+#define LFS_BLOCK_CYCLES 1024
+#endif
+
+#ifndef LFS_CACHE_SIZE
+#define LFS_CACHE_SIZE (64 % LFS_PROG_SIZE == 0 ? 64 : LFS_PROG_SIZE)
+#endif
+
+#ifndef LFS_LOOKAHEAD_SIZE
+#define LFS_LOOKAHEAD_SIZE 16
+#endif
+
+const struct lfs_config cfg = {{
+    .context = &bd,
+    .read  = &lfs_emubd_read,
+    .prog  = &lfs_emubd_prog,
+    .erase = &lfs_emubd_erase,
+    .sync  = &lfs_emubd_sync,
+
+    .read_size      = LFS_READ_SIZE,
+    .prog_size      = LFS_PROG_SIZE,
+    .block_size     = LFS_BLOCK_SIZE,
+    .block_count    = LFS_BLOCK_COUNT,
+    .block_cycles   = LFS_BLOCK_CYCLES,
+    .cache_size     = LFS_CACHE_SIZE,
+    .lookahead_size = LFS_LOOKAHEAD_SIZE,
+}};
+
+
+// Entry point
+int main(void) {{
+    lfs_emubd_create(&cfg, "blocks");
+
+{tests}
+    lfs_emubd_destroy(&cfg);
+}}

scripts/test.py

@@ -0,0 +1,81 @@
+#!/usr/bin/env python2
+
+import re
+import sys
+import subprocess
+import os
+
+
+def generate(test):
+    with open("scripts/template.fmt") as file:
+        template = file.read()
+
+    haslines = 'TEST_LINE' in os.environ and 'TEST_FILE' in os.environ
+
+    lines = []
+    for offset, line in enumerate(
+            re.split('(?<=(?:.;| [{}]))\n', test.read())):
+        match = re.match('((?: *\n)*)( *)(.*)=>(.*);',
+                line, re.DOTALL | re.MULTILINE)
+        if match:
+            preface, tab, test, expect = match.groups()
+            lines.extend(['']*preface.count('\n'))
+            lines.append(tab+'test_assert({test}, {expect});'.format(
+                test=test.strip(), expect=expect.strip()))
+        else:
+            lines.append(line)
+
+    # Create test file
+    with open('test.c', 'w') as file:
+        if 'TEST_LINE' in os.environ and 'TEST_FILE' in os.environ:
+            lines.insert(0, '#line %d "%s"' % (
+                    int(os.environ['TEST_LINE']) + 1,
+                    os.environ['TEST_FILE']))
+            lines.append('#line %d "test.c"' % (
+                    template[:template.find('{tests}')].count('\n')
+                    + len(lines) + 2))
+
+        file.write(template.format(tests='\n'.join(lines)))
+
+    # Remove build artifacts to force rebuild
+    try:
+        os.remove('test.o')
+        os.remove('lfs')
+    except OSError:
+        pass
+
+def compile():
+    subprocess.check_call([
+            os.environ.get('MAKE', 'make'),
+            '--no-print-directory', '-s'])
+
+def execute():
+    if 'EXEC' in os.environ:
+        subprocess.check_call([os.environ['EXEC'], "./lfs"])
+    else:
+        subprocess.check_call(["./lfs"])
+
+def main(test=None):
+    try:
+        if test and not test.startswith('-'):
+            with open(test) as file:
+                generate(file)
+        else:
+            generate(sys.stdin)
+
+        compile()
+
+        if test == '-s':
+            sys.exit(1)
+
+        execute()
+
+    except subprocess.CalledProcessError:
+        # Python stack trace is counterproductive, just exit
+        sys.exit(2)
+    except KeyboardInterrupt:
+        # Python stack trace is counterproductive, just exit
+        sys.exit(3)
+
+if __name__ == "__main__":
+    main(*sys.argv[1:])

tests/stats.py

@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-import struct
-import sys
-import time
-import os
-import re
-
-def main():
-    with open('blocks/.config') as file:
-        s = struct.unpack('<LLLL', file.read())
-        print 'read_size: %d' % s[0]
-        print 'prog_size: %d' % s[1]
-        print 'block_size: %d' % s[2]
-        print 'block_size: %d' % s[3]
-
-    print 'real_size: %d' % sum(
-        os.path.getsize(os.path.join('blocks', f))
-        for f in os.listdir('blocks') if re.match('\d+', f))
-
-    with open('blocks/.stats') as file:
-        s = struct.unpack('<QQQ', file.read())
-        print 'read_count: %d' % s[0]
-        print 'prog_count: %d' % s[1]
-        print 'erase_count: %d' % s[2]
-
-    print 'runtime: %.3f' % (time.time() - os.stat('blocks').st_ctime)
-
-if __name__ == "__main__":
-    main(*sys.argv[1:])

tests/template.fmt

@@ -1,116 +0,0 @@
-/// AUTOGENERATED TEST ///
-#include "lfs2.h"
-#include "emubd/lfs2_emubd.h"
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-
-// test stuff
-static void test_log(const char *s, uintmax_t v) {{
-    printf("%s: %jd\n", s, v);
-}}
-
-static void test_assert(const char *file, unsigned line,
-        const char *s, uintmax_t v, uintmax_t e) {{
-    static const char *last[6] = {{0, 0}};
-    if (v != e || !(last[0] == s || last[1] == s ||
-            last[2] == s || last[3] == s ||
-            last[4] == s || last[5] == s)) {{
-        test_log(s, v);
-        last[0] = last[1];
-        last[1] = last[2];
-        last[2] = last[3];
-        last[3] = last[4];
-        last[4] = last[5];
-        last[5] = s;
-    }}
-
-    if (v != e) {{
-        fprintf(stderr, "\033[31m%s:%u: assert %s failed with %jd, "
-                "expected %jd\033[0m\n", file, line, s, v, e);
-        exit(-2);
-    }}
-}}
-
-#define test_assert(s, v, e) test_assert(__FILE__, __LINE__, s, v, e)
-
-
-// utility functions for traversals
-static int __attribute__((used)) test_count(void *p, lfs2_block_t b) {{
-    (void)b;
-    unsigned *u = (unsigned*)p;
-    *u += 1;
-    return 0;
-}}
-
-
-// lfs2 declarations
-lfs2_t lfs2;
-lfs2_emubd_t bd;
-lfs2_file_t file[4];
-lfs2_dir_t dir[4];
-struct lfs2_info info;
-
-uint8_t buffer[1024];
-uint8_t wbuffer[1024];
-uint8_t rbuffer[1024];
-lfs2_size_t size;
-lfs2_size_t wsize;
-lfs2_size_t rsize;
-
-uintmax_t test;
-
-#ifndef LFS2_READ_SIZE
-#define LFS2_READ_SIZE 16
-#endif
-
-#ifndef LFS2_PROG_SIZE
-#define LFS2_PROG_SIZE LFS2_READ_SIZE
-#endif
-
-#ifndef LFS2_BLOCK_SIZE
-#define LFS2_BLOCK_SIZE 512
-#endif
-
-#ifndef LFS2_BLOCK_COUNT
-#define LFS2_BLOCK_COUNT 1024
-#endif
-
-#ifndef LFS2_BLOCK_CYCLES
-#define LFS2_BLOCK_CYCLES 1024
-#endif
-
-#ifndef LFS2_CACHE_SIZE
-#define LFS2_CACHE_SIZE 64
-#endif
-
-#ifndef LFS2_LOOKAHEAD_SIZE
-#define LFS2_LOOKAHEAD_SIZE 16
-#endif
-
-const struct lfs2_config cfg = {{
-    .context = &bd,
-    .read  = &lfs2_emubd_read,
-    .prog  = &lfs2_emubd_prog,
-    .erase = &lfs2_emubd_erase,
-    .sync  = &lfs2_emubd_sync,
-
-    .read_size      = LFS2_READ_SIZE,
-    .prog_size      = LFS2_PROG_SIZE,
-    .block_size     = LFS2_BLOCK_SIZE,
-    .block_count    = LFS2_BLOCK_COUNT,
-    .block_cycles   = LFS2_BLOCK_CYCLES,
-    .cache_size     = LFS2_CACHE_SIZE,
-    .lookahead_size = LFS2_LOOKAHEAD_SIZE,
-}};
-
-
-// Entry point
-int main(void) {{
-    lfs2_emubd_create(&cfg, "blocks");
-
-{tests}
-
-    lfs2_emubd_destroy(&cfg);
-}}

tests/test.py

@@ -1,61 +0,0 @@
-#!/usr/bin/env python
-
-import re
-import sys
-import subprocess
-import os
-
-def generate(test):
-    with open("tests/template.fmt") as file:
-        template = file.read()
-
-    lines = []
-    for line in re.split('(?<=(?:.;| [{}]))\n', test.read()):
-        match = re.match('(?: *\n)*( *)(.*)=>(.*);', line, re.DOTALL | re.MULTILINE)
-        if match:
-            tab, test, expect = match.groups()
-            lines.append(tab+'test = {test};'.format(test=test.strip()))
-            lines.append(tab+'test_assert("{name}", test, {expect});'.format(
-                    name = re.match('\w*', test.strip()).group(),
-                    expect = expect.strip()))
-        else:
-            lines.append(line)
-
-    # Create test file
-    with open('test.c', 'w') as file:
-        file.write(template.format(tests='\n'.join(lines)))
-
-    # Remove build artifacts to force rebuild
-    try:
-        os.remove('test.o')
-        os.remove('lfs2')
-    except OSError:
-        pass
-
-def compile():
-    subprocess.check_call([
-            os.environ.get('MAKE', 'make'),
-            '--no-print-directory', '-s'])
-
-def execute():
-    if 'EXEC' in os.environ:
-        subprocess.check_call([os.environ['EXEC'], "./lfs2"])
-    else:
-        subprocess.check_call(["./lfs2"])
-
-def main(test=None):
-    if test and not test.startswith('-'):
-        with open(test) as file:
-            generate(file)
-    else:
-        generate(sys.stdin)
-
-    compile()
-
-    if test == '-s':
-        sys.exit(1)
-
-    execute()
-
-if __name__ == "__main__":
-    main(*sys.argv[1:])

tests/test_alloc.sh

@@ -1,485 +1,484 @@
 #!/bin/bash
-set -eu
+set -euE
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
 
 echo "=== Allocator tests ==="
 rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 TEST
 
 SIZE=15000
 
-lfs2_mkdir() {
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "$1") => 0;
-    lfs2_unmount(&lfs2) => 0;
+lfs_mkdir() {
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "$1") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 }
 
-lfs2_remove() {
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_remove(&lfs2, "$1/eggs") => 0;
-    lfs2_remove(&lfs2, "$1/bacon") => 0;
-    lfs2_remove(&lfs2, "$1/pancakes") => 0;
-    lfs2_remove(&lfs2, "$1") => 0;
-    lfs2_unmount(&lfs2) => 0;
+lfs_remove() {
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_remove(&lfs, "$1/eggs") => 0;
+    lfs_remove(&lfs, "$1/bacon") => 0;
+    lfs_remove(&lfs, "$1/pancakes") => 0;
+    lfs_remove(&lfs, "$1") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 }
 
-lfs2_alloc_singleproc() {
-tests/test.py << TEST
+lfs_alloc_singleproc() {
+scripts/test.py << TEST
     const char *names[] = {"bacon", "eggs", "pancakes"};
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_file_t files[sizeof(names)/sizeof(names[0])];
+    lfs_mount(&lfs, &cfg) => 0;
     for (unsigned n = 0; n < sizeof(names)/sizeof(names[0]); n++) {
-        sprintf((char*)buffer, "$1/%s", names[n]);
-        lfs2_file_open(&lfs2, &file[n], (char*)buffer,
-                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+        sprintf(path, "$1/%s", names[n]);
+        lfs_file_open(&lfs, &files[n], path,
+                LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
     }
     for (unsigned n = 0; n < sizeof(names)/sizeof(names[0]); n++) {
-        size = strlen(names[n]);
+        lfs_size_t size = strlen(names[n]);
         for (int i = 0; i < $SIZE; i++) {
-            lfs2_file_write(&lfs2, &file[n], names[n], size) => size;
+            lfs_file_write(&lfs, &files[n], names[n], size) => size;
         }
     }
     for (unsigned n = 0; n < sizeof(names)/sizeof(names[0]); n++) {
-        lfs2_file_close(&lfs2, &file[n]) => 0;
+        lfs_file_close(&lfs, &files[n]) => 0;
     }
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 }
 
-lfs2_alloc_multiproc() {
+lfs_alloc_multiproc() {
 for name in bacon eggs pancakes
 do
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "$1/$name",
-            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
-    size = strlen("$name");
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "$1/$name",
+            LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
+    lfs_size_t size = strlen("$name");
     memcpy(buffer, "$name", size);
     for (int i = 0; i < $SIZE; i++) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 done
 }
 
-lfs2_verify() {
+lfs_verify() {
 for name in bacon eggs pancakes
 do
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "$1/$name", LFS2_O_RDONLY) => 0;
-    size = strlen("$name");
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "$1/$name", LFS_O_RDONLY) => 0;
+    lfs_size_t size = strlen("$name");
     for (int i = 0; i < $SIZE; i++) {
-        lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_read(&lfs, &file, buffer, size) => size;
         memcmp(buffer, "$name", size) => 0;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 done
 }
 
 echo "--- Single-process allocation test ---"
-lfs2_mkdir singleproc
-lfs2_alloc_singleproc singleproc
-lfs2_verify singleproc
+lfs_mkdir singleproc
+lfs_alloc_singleproc singleproc
+lfs_verify singleproc
 
 echo "--- Multi-process allocation test ---"
-lfs2_mkdir multiproc
-lfs2_alloc_multiproc multiproc
-lfs2_verify multiproc
-lfs2_verify singleproc
+lfs_mkdir multiproc
+lfs_alloc_multiproc multiproc
+lfs_verify multiproc
+lfs_verify singleproc
 
 echo "--- Single-process reuse test ---"
-lfs2_remove singleproc
-lfs2_mkdir singleprocreuse
-lfs2_alloc_singleproc singleprocreuse
-lfs2_verify singleprocreuse
-lfs2_verify multiproc
+lfs_remove singleproc
+lfs_mkdir singleprocreuse
+lfs_alloc_singleproc singleprocreuse
+lfs_verify singleprocreuse
+lfs_verify multiproc
 
 echo "--- Multi-process reuse test ---"
-lfs2_remove multiproc
-lfs2_mkdir multiprocreuse
-lfs2_alloc_singleproc multiprocreuse
-lfs2_verify multiprocreuse
-lfs2_verify singleprocreuse
+lfs_remove multiproc
+lfs_mkdir multiprocreuse
+lfs_alloc_singleproc multiprocreuse
+lfs_verify multiprocreuse
+lfs_verify singleprocreuse
 
 echo "--- Cleanup ---"
-lfs2_remove multiprocreuse
-lfs2_remove singleprocreuse
+lfs_remove multiprocreuse
+lfs_remove singleprocreuse
 
 echo "--- Exhaustion test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
-    size = strlen("exhaustion");
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
+    lfs_size_t size = strlen("exhaustion");
     memcpy(buffer, "exhaustion", size);
-    lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
-    lfs2_file_sync(&lfs2, &file[0]) => 0;
+    lfs_file_write(&lfs, &file, buffer, size) => size;
+    lfs_file_sync(&lfs, &file) => 0;
 
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    lfs2_ssize_t res;
+    lfs_ssize_t res;
     while (true) {
-        res = lfs2_file_write(&lfs2, &file[0], buffer, size);
+        res = lfs_file_write(&lfs, &file, buffer, size);
         if (res < 0) {
             break;
         }
 
         res => size;
     }
-    res => LFS2_ERR_NOSPC;
+    res => LFS_ERR_NOSPC;
 
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_RDONLY);
-    size = strlen("exhaustion");
-    lfs2_file_size(&lfs2, &file[0]) => size;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "exhaustion", LFS_O_RDONLY);
+    lfs_size_t size = strlen("exhaustion");
+    lfs_file_size(&lfs, &file) => size;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "exhaustion", size) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Exhaustion wraparound test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_remove(&lfs2, "exhaustion") => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_remove(&lfs, "exhaustion") => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "padding", LFS2_O_WRONLY | LFS2_O_CREAT);
-    size = strlen("buffering");
+    lfs_file_open(&lfs, &file, "padding", LFS_O_WRONLY | LFS_O_CREAT);
+    lfs_size_t size = strlen("buffering");
     memcpy(buffer, "buffering", size);
     for (int i = 0; i < $SIZE; i++) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_remove(&lfs2, "padding") => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_remove(&lfs, "padding") => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    lfs_file_open(&lfs, &file, "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
     size = strlen("exhaustion");
     memcpy(buffer, "exhaustion", size);
-    lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
-    lfs2_file_sync(&lfs2, &file[0]) => 0;
+    lfs_file_write(&lfs, &file, buffer, size) => size;
+    lfs_file_sync(&lfs, &file) => 0;
 
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    lfs2_ssize_t res;
+    lfs_ssize_t res;
     while (true) {
-        res = lfs2_file_write(&lfs2, &file[0], buffer, size);
+        res = lfs_file_write(&lfs, &file, buffer, size);
         if (res < 0) {
             break;
         }
 
         res => size;
     }
-    res => LFS2_ERR_NOSPC;
+    res => LFS_ERR_NOSPC;
 
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_RDONLY);
-    size = strlen("exhaustion");
-    lfs2_file_size(&lfs2, &file[0]) => size;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "exhaustion", LFS_O_RDONLY);
+    lfs_size_t size = strlen("exhaustion");
+    lfs_file_size(&lfs, &file) => size;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "exhaustion", size) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_remove(&lfs2, "exhaustion") => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_remove(&lfs, "exhaustion") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Dir exhaustion test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
 
     // find out max file size
-    lfs2_mkdir(&lfs2, "exhaustiondir") => 0;
-    size = strlen("blahblahblahblah");
+    lfs_mkdir(&lfs, "exhaustiondir") => 0;
+    lfs_size_t size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    lfs_file_open(&lfs, &file, "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
     int count = 0;
     int err;
     while (true) {
-        err = lfs2_file_write(&lfs2, &file[0], buffer, size);
+        err = lfs_file_write(&lfs, &file, buffer, size);
         if (err < 0) {
             break;
         }
 
         count += 1;
     }
-    err => LFS2_ERR_NOSPC;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    err => LFS_ERR_NOSPC;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_remove(&lfs2, "exhaustion") => 0;
-    lfs2_remove(&lfs2, "exhaustiondir") => 0;
+    lfs_remove(&lfs, "exhaustion") => 0;
+    lfs_remove(&lfs, "exhaustiondir") => 0;
 
     // see if dir fits with max file size
-    lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    lfs_file_open(&lfs, &file, "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
     for (int i = 0; i < count; i++) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_mkdir(&lfs2, "exhaustiondir") => 0;
-    lfs2_remove(&lfs2, "exhaustiondir") => 0;
-    lfs2_remove(&lfs2, "exhaustion") => 0;
+    lfs_mkdir(&lfs, "exhaustiondir") => 0;
+    lfs_remove(&lfs, "exhaustiondir") => 0;
+    lfs_remove(&lfs, "exhaustion") => 0;
 
     // see if dir fits with > max file size
-    lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    lfs_file_open(&lfs, &file, "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
     for (int i = 0; i < count+1; i++) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_mkdir(&lfs2, "exhaustiondir") => LFS2_ERR_NOSPC;
+    lfs_mkdir(&lfs, "exhaustiondir") => LFS_ERR_NOSPC;
 
-    lfs2_remove(&lfs2, "exhaustion") => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_remove(&lfs, "exhaustion") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Chained dir exhaustion test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
 
     // find out max file size
-    lfs2_mkdir(&lfs2, "exhaustiondir") => 0;
+    lfs_mkdir(&lfs, "exhaustiondir") => 0;
     for (int i = 0; i < 10; i++) {
-        sprintf((char*)buffer, "dirwithanexhaustivelylongnameforpadding%d", i);
-        lfs2_mkdir(&lfs2, (char*)buffer) => 0;
+        sprintf(path, "dirwithanexhaustivelylongnameforpadding%d", i);
+        lfs_mkdir(&lfs, path) => 0;
     }
-    size = strlen("blahblahblahblah");
+    lfs_size_t size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    lfs_file_open(&lfs, &file, "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
     int count = 0;
     int err;
     while (true) {
-        err = lfs2_file_write(&lfs2, &file[0], buffer, size);
+        err = lfs_file_write(&lfs, &file, buffer, size);
         if (err < 0) {
             break;
         }
 
         count += 1;
     }
-    err => LFS2_ERR_NOSPC;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    err => LFS_ERR_NOSPC;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_remove(&lfs2, "exhaustion") => 0;
-    lfs2_remove(&lfs2, "exhaustiondir") => 0;
+    lfs_remove(&lfs, "exhaustion") => 0;
+    lfs_remove(&lfs, "exhaustiondir") => 0;
     for (int i = 0; i < 10; i++) {
-        sprintf((char*)buffer, "dirwithanexhaustivelylongnameforpadding%d", i);
-        lfs2_remove(&lfs2, (char*)buffer) => 0;
+        sprintf(path, "dirwithanexhaustivelylongnameforpadding%d", i);
+        lfs_remove(&lfs, path) => 0;
     }
 
     // see that chained dir fails
-    lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    lfs_file_open(&lfs, &file, "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
     for (int i = 0; i < count+1; i++) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_sync(&lfs2, &file[0]) => 0;
+    lfs_file_sync(&lfs, &file) => 0;
 
     for (int i = 0; i < 10; i++) {
-        sprintf((char*)buffer, "dirwithanexhaustivelylongnameforpadding%d", i);
-        lfs2_mkdir(&lfs2, (char*)buffer) => 0;
+        sprintf(path, "dirwithanexhaustivelylongnameforpadding%d", i);
+        lfs_mkdir(&lfs, path) => 0;
     }
 
-    lfs2_mkdir(&lfs2, "exhaustiondir") => LFS2_ERR_NOSPC;
+    lfs_mkdir(&lfs, "exhaustiondir") => LFS_ERR_NOSPC;
 
     // shorten file to try a second chained dir
     while (true) {
-        err = lfs2_mkdir(&lfs2, "exhaustiondir");
-        if (err != LFS2_ERR_NOSPC) {
+        err = lfs_mkdir(&lfs, "exhaustiondir");
+        if (err != LFS_ERR_NOSPC) {
             break;
         }
 
-        lfs2_ssize_t filesize = lfs2_file_size(&lfs2, &file[0]);
+        lfs_ssize_t filesize = lfs_file_size(&lfs, &file);
         filesize > 0 => true;
 
-        lfs2_file_truncate(&lfs2, &file[0], filesize - size) => 0;
-        lfs2_file_sync(&lfs2, &file[0]) => 0;
+        lfs_file_truncate(&lfs, &file, filesize - size) => 0;
+        lfs_file_sync(&lfs, &file) => 0;
     }
     err => 0;
 
-    lfs2_mkdir(&lfs2, "exhaustiondir2") => LFS2_ERR_NOSPC;
+    lfs_mkdir(&lfs, "exhaustiondir2") => LFS_ERR_NOSPC;
 
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Split dir test ---"
-rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
 
     // create one block hole for half a directory
-    lfs2_file_open(&lfs2, &file[0], "bump", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    for (lfs2_size_t i = 0; i < cfg.block_size; i += 2) {
+    lfs_file_open(&lfs, &file, "bump", LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    for (lfs_size_t i = 0; i < cfg.block_size; i += 2) {
         memcpy(&buffer[i], "hi", 2);
     }
-    lfs2_file_write(&lfs2, &file[0], buffer, cfg.block_size) => cfg.block_size;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_write(&lfs, &file, buffer, cfg.block_size) => cfg.block_size;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
-    size = strlen("blahblahblahblah");
+    lfs_file_open(&lfs, &file, "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
+    lfs_size_t size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    for (lfs2_size_t i = 0;
+    for (lfs_size_t i = 0;
             i < (cfg.block_count-4)*(cfg.block_size-8);
             i += size) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
     // remount to force reset of lookahead
-    lfs2_unmount(&lfs2) => 0;
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_unmount(&lfs) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // open hole
-    lfs2_remove(&lfs2, "bump") => 0;
+    lfs_remove(&lfs, "bump") => 0;
 
-    lfs2_mkdir(&lfs2, "splitdir") => 0;
-    lfs2_file_open(&lfs2, &file[0], "splitdir/bump",
-            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    for (lfs2_size_t i = 0; i < cfg.block_size; i += 2) {
+    lfs_mkdir(&lfs, "splitdir") => 0;
+    lfs_file_open(&lfs, &file, "splitdir/bump",
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    for (lfs_size_t i = 0; i < cfg.block_size; i += 2) {
         memcpy(&buffer[i], "hi", 2);
     }
-    lfs2_file_write(&lfs2, &file[0], buffer, 2*cfg.block_size) => LFS2_ERR_NOSPC;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_write(&lfs, &file, buffer, 2*cfg.block_size) => LFS_ERR_NOSPC;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Outdated lookahead test ---"
-rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // fill completely with two files
-    lfs2_file_open(&lfs2, &file[0], "exhaustion1",
-            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    size = strlen("blahblahblahblah");
+    lfs_file_open(&lfs, &file, "exhaustion1",
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_size_t size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    for (lfs2_size_t i = 0;
+    for (lfs_size_t i = 0;
             i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
             i += size) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "exhaustion2",
-            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs_file_open(&lfs, &file, "exhaustion2",
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    for (lfs2_size_t i = 0;
+    for (lfs_size_t i = 0;
             i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
             i += size) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
     // remount to force reset of lookahead
-    lfs2_unmount(&lfs2) => 0;
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_unmount(&lfs) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // rewrite one file
-    lfs2_file_open(&lfs2, &file[0], "exhaustion1",
-            LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
-    lfs2_file_sync(&lfs2, &file[0]) => 0;
+    lfs_file_open(&lfs, &file, "exhaustion1",
+            LFS_O_WRONLY | LFS_O_TRUNC) => 0;
+    lfs_file_sync(&lfs, &file) => 0;
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    for (lfs2_size_t i = 0;
+    for (lfs_size_t i = 0;
             i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
             i += size) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
     // rewrite second file, this requires lookahead does not
     // use old population
-    lfs2_file_open(&lfs2, &file[0], "exhaustion2",
-            LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
-    lfs2_file_sync(&lfs2, &file[0]) => 0;
+    lfs_file_open(&lfs, &file, "exhaustion2",
+            LFS_O_WRONLY | LFS_O_TRUNC) => 0;
+    lfs_file_sync(&lfs, &file) => 0;
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    for (lfs2_size_t i = 0;
+    for (lfs_size_t i = 0;
             i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
             i += size) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 TEST
 
 echo "--- Outdated lookahead and split dir test ---"
-rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // fill completely with two files
-    lfs2_file_open(&lfs2, &file[0], "exhaustion1",
-            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    size = strlen("blahblahblahblah");
+    lfs_file_open(&lfs, &file, "exhaustion1",
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_size_t size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    for (lfs2_size_t i = 0;
+    for (lfs_size_t i = 0;
             i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
             i += size) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "exhaustion2",
-            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs_file_open(&lfs, &file, "exhaustion2",
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    for (lfs2_size_t i = 0;
+    for (lfs_size_t i = 0;
             i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
             i += size) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
     // remount to force reset of lookahead
-    lfs2_unmount(&lfs2) => 0;
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_unmount(&lfs) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     // rewrite one file with a hole of one block
-    lfs2_file_open(&lfs2, &file[0], "exhaustion1",
-            LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
-    lfs2_file_sync(&lfs2, &file[0]) => 0;
+    lfs_file_open(&lfs, &file, "exhaustion1",
+            LFS_O_WRONLY | LFS_O_TRUNC) => 0;
+    lfs_file_sync(&lfs, &file) => 0;
     size = strlen("blahblahblahblah");
     memcpy(buffer, "blahblahblahblah", size);
-    for (lfs2_size_t i = 0;
+    for (lfs_size_t i = 0;
             i < ((cfg.block_count-2)/2 - 1)*(cfg.block_size-8);
             i += size) {
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
     // try to allocate a directory, should fail!
-    lfs2_mkdir(&lfs2, "split") => LFS2_ERR_NOSPC;
+    lfs_mkdir(&lfs, "split") => LFS_ERR_NOSPC;
 
     // file should not fail
-    lfs2_file_open(&lfs2, &file[0], "notasplit",
-            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    lfs2_file_write(&lfs2, &file[0], "hi", 2) => 2;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_open(&lfs, &file, "notasplit",
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_file_write(&lfs, &file, "hi", 2) => 2;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Results ---"
-tests/stats.py
+scripts/results.py

tests/test_attrs.sh

@@ -1,286 +1,294 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
 
 echo "=== Attr tests ==="
 rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "hello") => 0;
-    lfs2_file_open(&lfs2, &file[0], "hello/hello",
-            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    lfs2_file_write(&lfs2, &file[0], "hello", strlen("hello"))
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "hello") => 0;
+    lfs_file_open(&lfs, &file, "hello/hello",
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_file_write(&lfs, &file, "hello", strlen("hello"))
             => strlen("hello");
-    lfs2_file_close(&lfs2, &file[0]);
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file);
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Set/get attribute ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_setattr(&lfs2, "hello", 'A', "aaaa",   4) => 0;
-    lfs2_setattr(&lfs2, "hello", 'B', "bbbbbb", 6) => 0;
-    lfs2_setattr(&lfs2, "hello", 'C', "ccccc",  5) => 0;
-    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => 6;
-    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    lfs_setattr(&lfs, "hello", 'A', "aaaa",   4) => 0;
+    lfs_setattr(&lfs, "hello", 'B', "bbbbbb", 6) => 0;
+    lfs_setattr(&lfs, "hello", 'C', "ccccc",  5) => 0;
+    lfs_getattr(&lfs, "hello", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "hello", 'B', buffer+4,  6) => 6;
+    lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5;
     memcmp(buffer,    "aaaa",   4) => 0;
     memcmp(buffer+4,  "bbbbbb", 6) => 0;
     memcmp(buffer+10, "ccccc",  5) => 0;
 
-    lfs2_setattr(&lfs2, "hello", 'B', "", 0) => 0;
-    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => 0;
-    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+    lfs_setattr(&lfs, "hello", 'B', "", 0) => 0;
+    lfs_getattr(&lfs, "hello", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "hello", 'B', buffer+4,  6) => 0;
+    lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5;
     memcmp(buffer,    "aaaa",         4) => 0;
     memcmp(buffer+4,  "\0\0\0\0\0\0", 6) => 0;
     memcmp(buffer+10, "ccccc",        5) => 0;
 
-    lfs2_removeattr(&lfs2, "hello", 'B') => 0;
-    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => LFS2_ERR_NOATTR;
-    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+    lfs_removeattr(&lfs, "hello", 'B') => 0;
+    lfs_getattr(&lfs, "hello", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "hello", 'B', buffer+4,  6) => LFS_ERR_NOATTR;
+    lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5;
     memcmp(buffer,    "aaaa",         4) => 0;
     memcmp(buffer+4,  "\0\0\0\0\0\0", 6) => 0;
     memcmp(buffer+10, "ccccc",        5) => 0;
 
-    lfs2_setattr(&lfs2, "hello", 'B', "dddddd", 6) => 0;
-    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => 6;
-    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+    lfs_setattr(&lfs, "hello", 'B', "dddddd", 6) => 0;
+    lfs_getattr(&lfs, "hello", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "hello", 'B', buffer+4,  6) => 6;
+    lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5;
     memcmp(buffer,    "aaaa",   4) => 0;
     memcmp(buffer+4,  "dddddd", 6) => 0;
     memcmp(buffer+10, "ccccc",  5) => 0;
 
-    lfs2_setattr(&lfs2, "hello", 'B', "eee", 3) => 0;
-    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => 3;
-    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+    lfs_setattr(&lfs, "hello", 'B', "eee", 3) => 0;
+    lfs_getattr(&lfs, "hello", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "hello", 'B', buffer+4,  6) => 3;
+    lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5;
     memcmp(buffer,    "aaaa",      4) => 0;
     memcmp(buffer+4,  "eee\0\0\0", 6) => 0;
     memcmp(buffer+10, "ccccc",     5) => 0;
 
-    lfs2_setattr(&lfs2, "hello", 'A', buffer, LFS2_ATTR_MAX+1) => LFS2_ERR_NOSPC;
-    lfs2_setattr(&lfs2, "hello", 'B', "fffffffff", 9) => 0;
-    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => 9;
-    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+    lfs_setattr(&lfs, "hello", 'A', buffer, LFS_ATTR_MAX+1) => LFS_ERR_NOSPC;
+    lfs_setattr(&lfs, "hello", 'B', "fffffffff", 9) => 0;
+    lfs_getattr(&lfs, "hello", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "hello", 'B', buffer+4,  6) => 9;
+    lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5;
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  9) => 9;
-    lfs2_getattr(&lfs2, "hello", 'C', buffer+13, 5) => 5;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    lfs_getattr(&lfs, "hello", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "hello", 'B', buffer+4,  9) => 9;
+    lfs_getattr(&lfs, "hello", 'C', buffer+13, 5) => 5;
     memcmp(buffer,    "aaaa",      4) => 0;
     memcmp(buffer+4,  "fffffffff", 9) => 0;
     memcmp(buffer+13, "ccccc",     5) => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, sizeof(buffer)) => strlen("hello");
+    lfs_file_open(&lfs, &file, "hello/hello", LFS_O_RDONLY) => 0;
+    lfs_file_read(&lfs, &file, buffer, sizeof(buffer)) => strlen("hello");
     memcmp(buffer, "hello", strlen("hello")) => 0;
-    lfs2_file_close(&lfs2, &file[0]);
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file);
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Set/get root attribute ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_setattr(&lfs2, "/", 'A', "aaaa",   4) => 0;
-    lfs2_setattr(&lfs2, "/", 'B', "bbbbbb", 6) => 0;
-    lfs2_setattr(&lfs2, "/", 'C', "ccccc",  5) => 0;
-    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => 6;
-    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    lfs_setattr(&lfs, "/", 'A', "aaaa",   4) => 0;
+    lfs_setattr(&lfs, "/", 'B', "bbbbbb", 6) => 0;
+    lfs_setattr(&lfs, "/", 'C', "ccccc",  5) => 0;
+    lfs_getattr(&lfs, "/", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "/", 'B', buffer+4,  6) => 6;
+    lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5;
     memcmp(buffer,    "aaaa",   4) => 0;
     memcmp(buffer+4,  "bbbbbb", 6) => 0;
     memcmp(buffer+10, "ccccc",  5) => 0;
 
-    lfs2_setattr(&lfs2, "/", 'B', "", 0) => 0;
-    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => 0;
-    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+    lfs_setattr(&lfs, "/", 'B', "", 0) => 0;
+    lfs_getattr(&lfs, "/", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "/", 'B', buffer+4,  6) => 0;
+    lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5;
     memcmp(buffer,    "aaaa",         4) => 0;
     memcmp(buffer+4,  "\0\0\0\0\0\0", 6) => 0;
     memcmp(buffer+10, "ccccc",        5) => 0;
 
-    lfs2_removeattr(&lfs2, "/", 'B') => 0;
-    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => LFS2_ERR_NOATTR;
-    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+    lfs_removeattr(&lfs, "/", 'B') => 0;
+    lfs_getattr(&lfs, "/", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "/", 'B', buffer+4,  6) => LFS_ERR_NOATTR;
+    lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5;
     memcmp(buffer,    "aaaa",         4) => 0;
     memcmp(buffer+4,  "\0\0\0\0\0\0", 6) => 0;
     memcmp(buffer+10, "ccccc",        5) => 0;
 
-    lfs2_setattr(&lfs2, "/", 'B', "dddddd", 6) => 0;
-    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => 6;
-    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+    lfs_setattr(&lfs, "/", 'B', "dddddd", 6) => 0;
+    lfs_getattr(&lfs, "/", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "/", 'B', buffer+4,  6) => 6;
+    lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5;
     memcmp(buffer,    "aaaa",   4) => 0;
     memcmp(buffer+4,  "dddddd", 6) => 0;
     memcmp(buffer+10, "ccccc",  5) => 0;
 
-    lfs2_setattr(&lfs2, "/", 'B', "eee", 3) => 0;
-    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => 3;
-    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+    lfs_setattr(&lfs, "/", 'B', "eee", 3) => 0;
+    lfs_getattr(&lfs, "/", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "/", 'B', buffer+4,  6) => 3;
+    lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5;
     memcmp(buffer,    "aaaa",      4) => 0;
     memcmp(buffer+4,  "eee\0\0\0", 6) => 0;
     memcmp(buffer+10, "ccccc",     5) => 0;
 
-    lfs2_setattr(&lfs2, "/", 'A', buffer, LFS2_ATTR_MAX+1) => LFS2_ERR_NOSPC;
-    lfs2_setattr(&lfs2, "/", 'B', "fffffffff", 9) => 0;
-    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => 9;
-    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_setattr(&lfs, "/", 'A', buffer, LFS_ATTR_MAX+1) => LFS_ERR_NOSPC;
+    lfs_setattr(&lfs, "/", 'B', "fffffffff", 9) => 0;
+    lfs_getattr(&lfs, "/", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "/", 'B', buffer+4,  6) => 9;
+    lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
-    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  9) => 9;
-    lfs2_getattr(&lfs2, "/", 'C', buffer+13, 5) => 5;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    lfs_getattr(&lfs, "/", 'A', buffer,    4) => 4;
+    lfs_getattr(&lfs, "/", 'B', buffer+4,  9) => 9;
+    lfs_getattr(&lfs, "/", 'C', buffer+13, 5) => 5;
     memcmp(buffer,    "aaaa",      4) => 0;
     memcmp(buffer+4,  "fffffffff", 9) => 0;
     memcmp(buffer+13, "ccccc",     5) => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, sizeof(buffer)) => strlen("hello");
+    lfs_file_open(&lfs, &file, "hello/hello", LFS_O_RDONLY) => 0;
+    lfs_file_read(&lfs, &file, buffer, sizeof(buffer)) => strlen("hello");
     memcmp(buffer, "hello", strlen("hello")) => 0;
-    lfs2_file_close(&lfs2, &file[0]);
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file);
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Set/get file attribute ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    struct lfs2_attr attrs1[] = {
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    struct lfs_attr attrs1[] = {
         {'A', buffer,    4},
         {'B', buffer+4,  6},
         {'C', buffer+10, 5},
     };
-    struct lfs2_file_config cfg1 = {.attrs=attrs1, .attr_count=3};
+    struct lfs_file_config cfg1 = {.attrs=attrs1, .attr_count=3};
 
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_WRONLY, &cfg1) => 0;
     memcpy(buffer,    "aaaa",   4);
     memcpy(buffer+4,  "bbbbbb", 6);
     memcpy(buffer+10, "ccccc",  5);
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
     memset(buffer, 0, 15);
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_RDONLY, &cfg1) => 0;
+    lfs_file_close(&lfs, &file) => 0;
     memcmp(buffer,    "aaaa",   4) => 0;
     memcmp(buffer+4,  "bbbbbb", 6) => 0;
     memcmp(buffer+10, "ccccc",  5) => 0;
 
     attrs1[1].size = 0;
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_WRONLY, &cfg1) => 0;
+    lfs_file_close(&lfs, &file) => 0;
     memset(buffer, 0, 15);
     attrs1[1].size = 6;
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_RDONLY, &cfg1) => 0;
+    lfs_file_close(&lfs, &file) => 0;
     memcmp(buffer,    "aaaa",         4) => 0;
     memcmp(buffer+4,  "\0\0\0\0\0\0", 6) => 0;
     memcmp(buffer+10, "ccccc",        5) => 0;
 
     attrs1[1].size = 6;
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_WRONLY, &cfg1) => 0;
     memcpy(buffer+4,  "dddddd", 6);
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
     memset(buffer, 0, 15);
     attrs1[1].size = 6;
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_RDONLY, &cfg1) => 0;
+    lfs_file_close(&lfs, &file) => 0;
     memcmp(buffer,    "aaaa",   4) => 0;
     memcmp(buffer+4,  "dddddd", 6) => 0;
     memcmp(buffer+10, "ccccc",  5) => 0;
 
     attrs1[1].size = 3;
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_WRONLY, &cfg1) => 0;
     memcpy(buffer+4,  "eee", 3);
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
     memset(buffer, 0, 15);
     attrs1[1].size = 6;
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_RDONLY, &cfg1) => 0;
+    lfs_file_close(&lfs, &file) => 0;
     memcmp(buffer,    "aaaa",      4) => 0;
     memcmp(buffer+4,  "eee\0\0\0", 6) => 0;
     memcmp(buffer+10, "ccccc",     5) => 0;
 
-    attrs1[0].size = LFS2_ATTR_MAX+1;
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1)
-        => LFS2_ERR_NOSPC;
+    attrs1[0].size = LFS_ATTR_MAX+1;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_WRONLY, &cfg1)
+        => LFS_ERR_NOSPC;
 
-    struct lfs2_attr attrs2[] = {
+    struct lfs_attr attrs2[] = {
         {'A', buffer,    4},
         {'B', buffer+4,  9},
         {'C', buffer+13, 5},
     };
-    struct lfs2_file_config cfg2 = {.attrs=attrs2, .attr_count=3};
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDWR, &cfg2) => 0;
+    struct lfs_file_config cfg2 = {.attrs=attrs2, .attr_count=3};
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_RDWR, &cfg2) => 0;
     memcpy(buffer+4,  "fffffffff", 9);
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
     attrs1[0].size = 4;
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_RDONLY, &cfg1) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    struct lfs2_attr attrs2[] = {
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    struct lfs_attr attrs2[] = {
         {'A', buffer,    4},
         {'B', buffer+4,  9},
         {'C', buffer+13, 5},
     };
-    struct lfs2_file_config cfg2 = {.attrs=attrs2, .attr_count=3};
+    struct lfs_file_config cfg2 = {.attrs=attrs2, .attr_count=3};
 
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg2) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_RDONLY, &cfg2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
     memcmp(buffer,    "aaaa",      4) => 0;
     memcmp(buffer+4,  "fffffffff", 9) => 0;
     memcmp(buffer+13, "ccccc",     5) => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, sizeof(buffer)) => strlen("hello");
+    lfs_file_open(&lfs, &file, "hello/hello", LFS_O_RDONLY) => 0;
+    lfs_file_read(&lfs, &file, buffer, sizeof(buffer)) => strlen("hello");
     memcmp(buffer, "hello", strlen("hello")) => 0;
-    lfs2_file_close(&lfs2, &file[0]);
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file);
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Deferred file attributes ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    struct lfs2_attr attrs1[] = {
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    struct lfs_attr attrs1[] = {
         {'B', "gggg", 4},
         {'C', "",     0},
         {'D', "hhhh", 4},
     };
-    struct lfs2_file_config cfg1 = {.attrs=attrs1, .attr_count=3};
+    struct lfs_file_config cfg1 = {.attrs=attrs1, .attr_count=3};
 
-    lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
+    lfs_file_opencfg(&lfs, &file, "hello/hello", LFS_O_WRONLY, &cfg1) => 0;
 
-    lfs2_getattr(&lfs2, "hello/hello", 'B', buffer,    9) => 9;
-    lfs2_getattr(&lfs2, "hello/hello", 'C', buffer+9,  9) => 5;
-    lfs2_getattr(&lfs2, "hello/hello", 'D', buffer+18, 9) => LFS2_ERR_NOATTR;
+    lfs_getattr(&lfs, "hello/hello", 'B', buffer,    9) => 9;
+    lfs_getattr(&lfs, "hello/hello", 'C', buffer+9,  9) => 5;
+    lfs_getattr(&lfs, "hello/hello", 'D', buffer+18, 9) => LFS_ERR_NOATTR;
     memcmp(buffer,    "fffffffff",          9) => 0;
     memcmp(buffer+9,  "ccccc\0\0\0\0",      9) => 0;
     memcmp(buffer+18, "\0\0\0\0\0\0\0\0\0", 9) => 0;
 
-    lfs2_file_sync(&lfs2, &file[0]) => 0;
-    lfs2_getattr(&lfs2, "hello/hello", 'B', buffer,    9) => 4;
-    lfs2_getattr(&lfs2, "hello/hello", 'C', buffer+9,  9) => 0;
-    lfs2_getattr(&lfs2, "hello/hello", 'D', buffer+18, 9) => 4;
+    lfs_file_sync(&lfs, &file) => 0;
+    lfs_getattr(&lfs, "hello/hello", 'B', buffer,    9) => 4;
+    lfs_getattr(&lfs, "hello/hello", 'C', buffer+9,  9) => 0;
+    lfs_getattr(&lfs, "hello/hello", 'D', buffer+18, 9) => 4;
     memcmp(buffer,    "gggg\0\0\0\0\0",     9) => 0;
     memcmp(buffer+9,  "\0\0\0\0\0\0\0\0\0", 9) => 0;
     memcmp(buffer+18, "hhhh\0\0\0\0\0",     9) => 0;
 
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Results ---"
-tests/stats.py
+scripts/results.py

tests/test_corrupt.sh

@@ -1,76 +1,79 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
 
 echo "=== Corrupt tests ==="
 
 NAMEMULT=64
 FILEMULT=1
 
-lfs2_mktree() {
-tests/test.py ${1:-} << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+lfs_mktree() {
+scripts/test.py ${1:-} << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 1; i < 10; i++) {
         for (int j = 0; j < $NAMEMULT; j++) {
             buffer[j] = '0'+i;
         }
         buffer[$NAMEMULT] = '\0';
-        lfs2_mkdir(&lfs2, (char*)buffer) => 0;
+        lfs_mkdir(&lfs, (char*)buffer) => 0;
 
         buffer[$NAMEMULT] = '/';
         for (int j = 0; j < $NAMEMULT; j++) {
             buffer[j+$NAMEMULT+1] = '0'+i;
         }
         buffer[2*$NAMEMULT+1] = '\0';
-        lfs2_file_open(&lfs2, &file[0], (char*)buffer,
-                LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+        lfs_file_open(&lfs, &file, (char*)buffer,
+                LFS_O_WRONLY | LFS_O_CREAT) => 0;
         
-        size = $NAMEMULT;
+        lfs_size_t size = $NAMEMULT;
         for (int j = 0; j < i*$FILEMULT; j++) {
-            lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+            lfs_file_write(&lfs, &file, buffer, size) => size;
         }
 
-        lfs2_file_close(&lfs2, &file[0]) => 0;
+        lfs_file_close(&lfs, &file) => 0;
     }
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 }
 
-lfs2_chktree() {
-tests/test.py ${1:-} << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
+lfs_chktree() {
+scripts/test.py ${1:-} << TEST
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 1; i < 10; i++) {
         for (int j = 0; j < $NAMEMULT; j++) {
             buffer[j] = '0'+i;
         }
         buffer[$NAMEMULT] = '\0';
-        lfs2_stat(&lfs2, (char*)buffer, &info) => 0;
-        info.type => LFS2_TYPE_DIR;
+        lfs_stat(&lfs, (char*)buffer, &info) => 0;
+        info.type => LFS_TYPE_DIR;
 
         buffer[$NAMEMULT] = '/';
         for (int j = 0; j < $NAMEMULT; j++) {
             buffer[j+$NAMEMULT+1] = '0'+i;
         }
         buffer[2*$NAMEMULT+1] = '\0';
-        lfs2_file_open(&lfs2, &file[0], (char*)buffer, LFS2_O_RDONLY) => 0;
+        lfs_file_open(&lfs, &file, (char*)buffer, LFS_O_RDONLY) => 0;
         
-        size = $NAMEMULT;
+        lfs_size_t size = $NAMEMULT;
         for (int j = 0; j < i*$FILEMULT; j++) {
-            lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
+            uint8_t rbuffer[1024];
+            lfs_file_read(&lfs, &file, rbuffer, size) => size;
             memcmp(buffer, rbuffer, size) => 0;
         }
 
-        lfs2_file_close(&lfs2, &file[0]) => 0;
+        lfs_file_close(&lfs, &file) => 0;
     }
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 }
 
 echo "--- Sanity check ---"
 rm -rf blocks
-lfs2_mktree
-lfs2_chktree
+lfs_mktree
+lfs_chktree
 BLOCKS="$(ls blocks | grep -vw '[01]')"
 
 echo "--- Block corruption ---"
@@ -79,8 +82,8 @@ do
     rm -rf blocks
     mkdir blocks
     ln -s /dev/zero blocks/$b
-    lfs2_mktree
-    lfs2_chktree
+    lfs_mktree
+    lfs_chktree
 done
 
 echo "--- Block persistance ---"
@@ -88,10 +91,10 @@ for b in $BLOCKS
 do 
     rm -rf blocks
     mkdir blocks
-    lfs2_mktree
+    lfs_mktree
     chmod a-w blocks/$b || true
-    lfs2_mktree
-    lfs2_chktree
+    lfs_mktree
+    lfs_chktree
 done
 
 echo "--- Big region corruption ---"
@@ -101,8 +104,8 @@ for i in {2..512}
 do
     ln -s /dev/zero blocks/$(printf '%x' $i)
 done
-lfs2_mktree
-lfs2_chktree
+lfs_mktree
+lfs_chktree
 
 echo "--- Alternating corruption ---"
 rm -rf blocks
@@ -111,8 +114,7 @@ for i in {2..1024..2}
 do
     ln -s /dev/zero blocks/$(printf '%x' $i)
 done
-lfs2_mktree
-lfs2_chktree
+lfs_mktree
+lfs_chktree
 
-echo "--- Results ---"
-tests/stats.py
+scripts/results.py

tests/test_dirs.sh

@@ -1,484 +1,489 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
+
+echo "=== Directory tests ==="
 
 LARGESIZE=128
 
-echo "=== Directory tests ==="
 rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 TEST
 
 echo "--- Root directory ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Directory creation ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "potato") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "potato") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- File creation ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "burito", LFS2_O_CREAT | LFS2_O_WRONLY) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "burito", LFS_O_CREAT | LFS_O_WRONLY) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Directory iteration ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "burito") => 0;
-    info.type => LFS2_TYPE_REG;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_REG;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "potato") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Directory failures ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "potato") => LFS2_ERR_EXIST;
-    lfs2_dir_open(&lfs2, &dir[0], "tomato") => LFS2_ERR_NOENT;
-    lfs2_dir_open(&lfs2, &dir[0], "burito") => LFS2_ERR_NOTDIR;
-    lfs2_file_open(&lfs2, &file[0], "tomato", LFS2_O_RDONLY) => LFS2_ERR_NOENT;
-    lfs2_file_open(&lfs2, &file[0], "potato", LFS2_O_RDONLY) => LFS2_ERR_ISDIR;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "potato") => LFS_ERR_EXIST;
+    lfs_dir_open(&lfs, &dir, "tomato") => LFS_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "burito") => LFS_ERR_NOTDIR;
+    lfs_file_open(&lfs, &file, "tomato", LFS_O_RDONLY) => LFS_ERR_NOENT;
+    lfs_file_open(&lfs, &file, "potato", LFS_O_RDONLY) => LFS_ERR_ISDIR;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Nested directories ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "potato/baked") => 0;
-    lfs2_mkdir(&lfs2, "potato/sweet") => 0;
-    lfs2_mkdir(&lfs2, "potato/fried") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "potato/baked") => 0;
+    lfs_mkdir(&lfs, "potato/sweet") => 0;
+    lfs_mkdir(&lfs, "potato/fried") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "potato") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "potato") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "baked") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "fried") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "sweet") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Multi-block directory ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "cactus") => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "cactus") => 0;
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "cactus/test%03d", i);
-        lfs2_mkdir(&lfs2, (char*)buffer) => 0;
+        sprintf(path, "cactus/test%03d", i);
+        lfs_mkdir(&lfs, path) => 0;
     }
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "cactus") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "cactus") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
+    info.type => LFS_TYPE_DIR;
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "test%03d", i);
-        lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-        strcmp(info.name, (char*)buffer) => 0;
-        info.type => LFS2_TYPE_DIR;
+        sprintf(path, "test%03d", i);
+        lfs_dir_read(&lfs, &dir, &info) => 1;
+        strcmp(info.name, path) => 0;
+        info.type => LFS_TYPE_DIR;
     }
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Directory remove ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_remove(&lfs2, "potato") => LFS2_ERR_NOTEMPTY;
-    lfs2_remove(&lfs2, "potato/sweet") => 0;
-    lfs2_remove(&lfs2, "potato/baked") => 0;
-    lfs2_remove(&lfs2, "potato/fried") => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_remove(&lfs, "potato") => LFS_ERR_NOTEMPTY;
+    lfs_remove(&lfs, "potato/sweet") => 0;
+    lfs_remove(&lfs, "potato/baked") => 0;
+    lfs_remove(&lfs, "potato/fried") => 0;
 
-    lfs2_dir_open(&lfs2, &dir[0], "potato") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_open(&lfs, &dir, "potato") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
 
-    lfs2_remove(&lfs2, "potato") => 0;
+    lfs_remove(&lfs, "potato") => 0;
 
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "burito") => 0;
-    info.type => LFS2_TYPE_REG;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_REG;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "cactus") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "burito") => 0;
-    info.type => LFS2_TYPE_REG;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_REG;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "cactus") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Directory rename ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "coldpotato") => 0;
-    lfs2_mkdir(&lfs2, "coldpotato/baked") => 0;
-    lfs2_mkdir(&lfs2, "coldpotato/sweet") => 0;
-    lfs2_mkdir(&lfs2, "coldpotato/fried") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "coldpotato") => 0;
+    lfs_mkdir(&lfs, "coldpotato/baked") => 0;
+    lfs_mkdir(&lfs, "coldpotato/sweet") => 0;
+    lfs_mkdir(&lfs, "coldpotato/fried") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_rename(&lfs2, "coldpotato", "hotpotato") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_rename(&lfs, "coldpotato", "hotpotato") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "hotpotato") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "hotpotato") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "baked") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "fried") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "sweet") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "warmpotato") => 0;
-    lfs2_mkdir(&lfs2, "warmpotato/mushy") => 0;
-    lfs2_rename(&lfs2, "hotpotato", "warmpotato") => LFS2_ERR_NOTEMPTY;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "warmpotato") => 0;
+    lfs_mkdir(&lfs, "warmpotato/mushy") => 0;
+    lfs_rename(&lfs, "hotpotato", "warmpotato") => LFS_ERR_NOTEMPTY;
 
-    lfs2_remove(&lfs2, "warmpotato/mushy") => 0;
-    lfs2_rename(&lfs2, "hotpotato", "warmpotato") => 0;
+    lfs_remove(&lfs, "warmpotato/mushy") => 0;
+    lfs_rename(&lfs, "hotpotato", "warmpotato") => 0;
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "warmpotato") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "warmpotato") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "baked") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "fried") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "sweet") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "coldpotato") => 0;
-    lfs2_rename(&lfs2, "warmpotato/baked", "coldpotato/baked") => 0;
-    lfs2_rename(&lfs2, "warmpotato/sweet", "coldpotato/sweet") => 0;
-    lfs2_rename(&lfs2, "warmpotato/fried", "coldpotato/fried") => 0;
-    lfs2_remove(&lfs2, "coldpotato") => LFS2_ERR_NOTEMPTY;
-    lfs2_remove(&lfs2, "warmpotato") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "coldpotato") => 0;
+    lfs_rename(&lfs, "warmpotato/baked", "coldpotato/baked") => 0;
+    lfs_rename(&lfs, "warmpotato/sweet", "coldpotato/sweet") => 0;
+    lfs_rename(&lfs, "warmpotato/fried", "coldpotato/fried") => 0;
+    lfs_remove(&lfs, "coldpotato") => LFS_ERR_NOTEMPTY;
+    lfs_remove(&lfs, "warmpotato") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "coldpotato") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "coldpotato") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "baked") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "fried") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "sweet") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Recursive remove ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_remove(&lfs2, "coldpotato") => LFS2_ERR_NOTEMPTY;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_remove(&lfs, "coldpotato") => LFS_ERR_NOTEMPTY;
 
-    lfs2_dir_open(&lfs2, &dir[0], "coldpotato") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_open(&lfs, &dir, "coldpotato") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
 
     while (true) {
-        int err = lfs2_dir_read(&lfs2, &dir[0], &info);
+        int err = lfs_dir_read(&lfs, &dir, &info);
         err >= 0 => 1;
         if (err == 0) {
             break;
         }
 
-        strcpy((char*)buffer, "coldpotato/");
-        strcat((char*)buffer, info.name);
-        lfs2_remove(&lfs2, (char*)buffer) => 0;
+        strcpy(path, "coldpotato/");
+        strcat(path, info.name);
+        lfs_remove(&lfs, path) => 0;
     }
 
-    lfs2_remove(&lfs2, "coldpotato") => 0;
+    lfs_remove(&lfs, "coldpotato") => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "burito") => 0;
-    info.type => LFS2_TYPE_REG;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_REG;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "cactus") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Multi-block rename ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "cactus/test%03d", i);
-        sprintf((char*)wbuffer, "cactus/tedd%03d", i);
-        lfs2_rename(&lfs2, (char*)buffer, (char*)wbuffer) => 0;
+        char oldpath[1024];
+        char newpath[1024];
+        sprintf(oldpath, "cactus/test%03d", i);
+        sprintf(newpath, "cactus/tedd%03d", i);
+        lfs_rename(&lfs, oldpath, newpath) => 0;
     }
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "cactus") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "cactus") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
+    info.type => LFS_TYPE_DIR;
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "tedd%03d", i);
-        lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-        strcmp(info.name, (char*)buffer) => 0;
-        info.type => LFS2_TYPE_DIR;
+        sprintf(path, "tedd%03d", i);
+        lfs_dir_read(&lfs, &dir, &info) => 1;
+        strcmp(info.name, path) => 0;
+        info.type => LFS_TYPE_DIR;
     }
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Multi-block remove ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_remove(&lfs2, "cactus") => LFS2_ERR_NOTEMPTY;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_remove(&lfs, "cactus") => LFS_ERR_NOTEMPTY;
 
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "cactus/tedd%03d", i);
-        lfs2_remove(&lfs2, (char*)buffer) => 0;
+        sprintf(path, "cactus/tedd%03d", i);
+        lfs_remove(&lfs, path) => 0;
     }
 
-    lfs2_remove(&lfs2, "cactus") => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_remove(&lfs, "cactus") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "burito") => 0;
-    info.type => LFS2_TYPE_REG;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    info.type => LFS_TYPE_REG;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Multi-block directory with files ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "prickly-pear") => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "prickly-pear") => 0;
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "prickly-pear/test%03d", i);
-        lfs2_file_open(&lfs2, &file[0], (char*)buffer,
-                LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-        size = 6;
-        memcpy(wbuffer, "Hello", size);
-        lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
-        lfs2_file_close(&lfs2, &file[0]) => 0;
+        sprintf(path, "prickly-pear/test%03d", i);
+        lfs_file_open(&lfs, &file, path, LFS_O_WRONLY | LFS_O_CREAT) => 0;
+        lfs_size_t size = 6;
+        memcpy(buffer, "Hello", size);
+        lfs_file_write(&lfs, &file, buffer, size) => size;
+        lfs_file_close(&lfs, &file) => 0;
     }
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "prickly-pear") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "prickly-pear") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
+    info.type => LFS_TYPE_DIR;
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "test%03d", i);
-        lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-        strcmp(info.name, (char*)buffer) => 0;
-        info.type => LFS2_TYPE_REG;
+        sprintf(path, "test%03d", i);
+        lfs_dir_read(&lfs, &dir, &info) => 1;
+        strcmp(info.name, path) => 0;
+        info.type => LFS_TYPE_REG;
         info.size => 6;
     }
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Multi-block rename with files ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "prickly-pear/test%03d", i);
-        sprintf((char*)wbuffer, "prickly-pear/tedd%03d", i);
-        lfs2_rename(&lfs2, (char*)buffer, (char*)wbuffer) => 0;
+        char oldpath[1024];
+        char newpath[1024];
+        sprintf(oldpath, "prickly-pear/test%03d", i);
+        sprintf(newpath, "prickly-pear/tedd%03d", i);
+        lfs_rename(&lfs, oldpath, newpath) => 0;
     }
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "prickly-pear") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "prickly-pear") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
+    info.type => LFS_TYPE_DIR;
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "tedd%03d", i);
-        lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-        strcmp(info.name, (char*)buffer) => 0;
-        info.type => LFS2_TYPE_REG;
+        sprintf(path, "tedd%03d", i);
+        lfs_dir_read(&lfs, &dir, &info) => 1;
+        strcmp(info.name, path) => 0;
+        info.type => LFS_TYPE_REG;
         info.size => 6;
     }
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Multi-block remove with files ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_remove(&lfs2, "prickly-pear") => LFS2_ERR_NOTEMPTY;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_remove(&lfs, "prickly-pear") => LFS_ERR_NOTEMPTY;
 
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "prickly-pear/tedd%03d", i);
-        lfs2_remove(&lfs2, (char*)buffer) => 0;
+        sprintf(path, "prickly-pear/tedd%03d", i);
+        lfs_remove(&lfs, path) => 0;
     }
 
-    lfs2_remove(&lfs2, "prickly-pear") => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_remove(&lfs, "prickly-pear") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "burito") => 0;
-    info.type => LFS2_TYPE_REG;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    info.type => LFS_TYPE_REG;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Results ---"
-tests/stats.py
+scripts/results.py

tests/test_entries.sh

@@ -1,19 +1,22 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
+
+echo "=== Entry tests ==="
 
 # Note: These tests are intended for 512 byte inline size at different
 # inline sizes they should still pass, but won't be testing anything
 
-echo "=== Entry tests ==="
 rm -rf blocks
 function read_file {
 cat << TEST
 
     size = $2;
-    lfs2_file_open(&lfs2, &file[0], "$1", LFS2_O_RDONLY) => 0;
-    lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
+    lfs_file_open(&lfs, &file, "$1", LFS_O_RDONLY) => 0;
+    lfs_file_read(&lfs, &file, rbuffer, size) => size;
     memcmp(rbuffer, wbuffer, size) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 TEST
 }
 
@@ -21,19 +24,23 @@ function write_file {
 cat << TEST
 
     size = $2;
-    lfs2_file_open(&lfs2, &file[0], "$1",
-            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    lfs_file_open(&lfs, &file, "$1",
+            LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0;
     memset(wbuffer, 'c', size);
-    lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_write(&lfs, &file, wbuffer, size) => size;
+    lfs_file_close(&lfs, &file) => 0;
 TEST
 }
 
 echo "--- Entry grow test ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+    lfs_size_t size;
+
+    lfs_mount(&lfs, &cfg) => 0;
     $(write_file "hi0" 20)
     $(write_file "hi1" 20)
     $(write_file "hi2" 20)
@@ -46,14 +53,18 @@ tests/test.py << TEST
     $(read_file "hi1" 200)
     $(read_file "hi2" 20)
     $(read_file "hi3" 20)
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Entry shrink test ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+    lfs_size_t size;
+
+    lfs_mount(&lfs, &cfg) => 0;
     $(write_file "hi0" 20)
     $(write_file "hi1" 200)
     $(write_file "hi2" 20)
@@ -66,14 +77,18 @@ tests/test.py << TEST
     $(read_file "hi1" 20)
     $(read_file "hi2" 20)
     $(read_file "hi3" 20)
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Entry spill test ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+    lfs_size_t size;
+
+    lfs_mount(&lfs, &cfg) => 0;
     $(write_file "hi0" 200)
     $(write_file "hi1" 200)
     $(write_file "hi2" 200)
@@ -83,14 +98,18 @@ tests/test.py << TEST
     $(read_file "hi1" 200)
     $(read_file "hi2" 200)
     $(read_file "hi3" 200)
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Entry push spill test ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+    lfs_size_t size;
+
+    lfs_mount(&lfs, &cfg) => 0;
     $(write_file "hi0" 200)
     $(write_file "hi1" 20)
     $(write_file "hi2" 200)
@@ -103,14 +122,18 @@ tests/test.py << TEST
     $(read_file "hi1" 200)
     $(read_file "hi2" 200)
     $(read_file "hi3" 200)
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Entry push spill two test ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+    lfs_size_t size;
+
+    lfs_mount(&lfs, &cfg) => 0;
     $(write_file "hi0" 200)
     $(write_file "hi1" 20)
     $(write_file "hi2" 200)
@@ -125,97 +148,104 @@ tests/test.py << TEST
     $(read_file "hi2" 200)
     $(read_file "hi3" 200)
     $(read_file "hi4" 200)
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Entry drop test ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+    lfs_size_t size;
+
+    lfs_mount(&lfs, &cfg) => 0;
     $(write_file "hi0" 200)
     $(write_file "hi1" 200)
     $(write_file "hi2" 200)
     $(write_file "hi3" 200)
 
-    lfs2_remove(&lfs2, "hi1") => 0;
-    lfs2_stat(&lfs2, "hi1", &info) => LFS2_ERR_NOENT;
+    lfs_remove(&lfs, "hi1") => 0;
+    lfs_stat(&lfs, "hi1", &info) => LFS_ERR_NOENT;
     $(read_file "hi0" 200)
     $(read_file "hi2" 200)
     $(read_file "hi3" 200)
 
-    lfs2_remove(&lfs2, "hi2") => 0;
-    lfs2_stat(&lfs2, "hi2", &info) => LFS2_ERR_NOENT;
+    lfs_remove(&lfs, "hi2") => 0;
+    lfs_stat(&lfs, "hi2", &info) => LFS_ERR_NOENT;
     $(read_file "hi0" 200)
     $(read_file "hi3" 200)
 
-    lfs2_remove(&lfs2, "hi3") => 0;
-    lfs2_stat(&lfs2, "hi3", &info) => LFS2_ERR_NOENT;
+    lfs_remove(&lfs, "hi3") => 0;
+    lfs_stat(&lfs, "hi3", &info) => LFS_ERR_NOENT;
     $(read_file "hi0" 200)
 
-    lfs2_remove(&lfs2, "hi0") => 0;
-    lfs2_stat(&lfs2, "hi0", &info) => LFS2_ERR_NOENT;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_remove(&lfs, "hi0") => 0;
+    lfs_stat(&lfs, "hi0", &info) => LFS_ERR_NOENT;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Create too big ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
-    memset(buffer, 'm', 200);
-    buffer[200] = '\0';
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(path, 'm', 200);
+    path[200] = '\0';
 
-    size = 400;
-    lfs2_file_open(&lfs2, &file[0], (char*)buffer,
-            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    lfs_size_t size = 400;
+    lfs_file_open(&lfs, &file, path,
+            LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0;
+    uint8_t wbuffer[1024];
     memset(wbuffer, 'c', size);
-    lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_write(&lfs, &file, wbuffer, size) => size;
+    lfs_file_close(&lfs, &file) => 0;
 
     size = 400;
-    lfs2_file_open(&lfs2, &file[0], (char*)buffer, LFS2_O_RDONLY) => 0;
-    lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
+    lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
+    uint8_t rbuffer[1024];
+    lfs_file_read(&lfs, &file, rbuffer, size) => size;
     memcmp(rbuffer, wbuffer, size) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Resize too big ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
-    memset(buffer, 'm', 200);
-    buffer[200] = '\0';
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(path, 'm', 200);
+    path[200] = '\0';
+
+    lfs_size_t size = 40;
+    lfs_file_open(&lfs, &file, path,
+            LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0;
+    uint8_t wbuffer[1024];
+    memset(wbuffer, 'c', size);
+    lfs_file_write(&lfs, &file, wbuffer, size) => size;
+    lfs_file_close(&lfs, &file) => 0;
 
     size = 40;
-    lfs2_file_open(&lfs2, &file[0], (char*)buffer,
-            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
-    memset(wbuffer, 'c', size);
-    lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-
-    size = 40;
-    lfs2_file_open(&lfs2, &file[0], (char*)buffer, LFS2_O_RDONLY) => 0;
-    lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
+    lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
+    uint8_t rbuffer[1024];
+    lfs_file_read(&lfs, &file, rbuffer, size) => size;
     memcmp(rbuffer, wbuffer, size) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
     size = 400;
-    lfs2_file_open(&lfs2, &file[0], (char*)buffer,
-            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    lfs_file_open(&lfs, &file, path,
+            LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0;
     memset(wbuffer, 'c', size);
-    lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_write(&lfs, &file, wbuffer, size) => size;
+    lfs_file_close(&lfs, &file) => 0;
 
     size = 400;
-    lfs2_file_open(&lfs2, &file[0], (char*)buffer, LFS2_O_RDONLY) => 0;
-    lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
+    lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
+    lfs_file_read(&lfs, &file, rbuffer, size) => size;
     memcmp(rbuffer, wbuffer, size) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Results ---"
-tests/stats.py
+scripts/results.py

tests/test_files.sh

@@ -1,72 +1,77 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
+
+echo "=== File tests ==="
 
 SMALLSIZE=32
 MEDIUMSIZE=8192
 LARGESIZE=262144
 
-echo "=== File tests ==="
 rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 TEST
 
 echo "--- Simple file test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "hello", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    size = strlen("Hello World!\n");
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "hello", LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_size_t size = strlen("Hello World!\n");
+    uint8_t wbuffer[1024];
     memcpy(wbuffer, "Hello World!\n", size);
-    lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_write(&lfs, &file, wbuffer, size) => size;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "hello", LFS2_O_RDONLY) => 0;
+    lfs_file_open(&lfs, &file, "hello", LFS_O_RDONLY) => 0;
     size = strlen("Hello World!\n");
-    lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
+    uint8_t rbuffer[1024];
+    lfs_file_read(&lfs, &file, rbuffer, size) => size;
     memcmp(rbuffer, wbuffer, size) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 w_test() {
-tests/test.py ${4:-} << TEST
-    size = $1;
-    lfs2_size_t chunk = 31;
+scripts/test.py ${4:-} << TEST
+    lfs_size_t size = $1;
+    lfs_size_t chunk = 31;
     srand(0);
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "$2",
-        ${3:-LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC}) => 0;
-    for (lfs2_size_t i = 0; i < size; i += chunk) {
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "$2",
+        ${3:-LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC}) => 0;
+    for (lfs_size_t i = 0; i < size; i += chunk) {
         chunk = (chunk < size - i) ? chunk : size - i;
-        for (lfs2_size_t b = 0; b < chunk; b++) {
+        for (lfs_size_t b = 0; b < chunk; b++) {
             buffer[b] = rand() & 0xff;
         }
-        lfs2_file_write(&lfs2, &file[0], buffer, chunk) => chunk;
+        lfs_file_write(&lfs, &file, buffer, chunk) => chunk;
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 }
 
 r_test() {
-tests/test.py << TEST
-    size = $1;
-    lfs2_size_t chunk = 29;
+scripts/test.py << TEST
+    lfs_size_t size = $1;
+    lfs_size_t chunk = 29;
     srand(0);
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_stat(&lfs2, "$2", &info) => 0;
-    info.type => LFS2_TYPE_REG;
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_stat(&lfs, "$2", &info) => 0;
+    info.type => LFS_TYPE_REG;
     info.size => size;
-    lfs2_file_open(&lfs2, &file[0], "$2", ${3:-LFS2_O_RDONLY}) => 0;
-    for (lfs2_size_t i = 0; i < size; i += chunk) {
+    lfs_file_open(&lfs, &file, "$2", ${3:-LFS_O_RDONLY}) => 0;
+    for (lfs_size_t i = 0; i < size; i += chunk) {
         chunk = (chunk < size - i) ? chunk : size - i;
-        lfs2_file_read(&lfs2, &file[0], buffer, chunk) => chunk;
-        for (lfs2_size_t b = 0; b < chunk && i+b < size; b++) {
+        lfs_file_read(&lfs, &file, buffer, chunk) => chunk;
+        for (lfs_size_t b = 0; b < chunk && i+b < size; b++) {
             buffer[b] => rand() & 0xff;
         }
     }
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 }
 
@@ -105,54 +110,112 @@ r_test $LARGESIZE largeavacado
 r_test 0 noavacado
 
 echo "--- Dir check ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hello") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => strlen("Hello World!\n");
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "largeavacado") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => $LARGESIZE;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "mediumavacado") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => $MEDIUMSIZE;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "noavacado") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "smallavacado") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => $SMALLSIZE;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Many file test ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+echo "--- Many files test ---"
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 TEST
-tests/test.py << TEST
-    // Create 300 files of 6 bytes
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "directory") => 0;
+scripts/test.py << TEST
+    // Create 300 files of 7 bytes
+    lfs_mount(&lfs, &cfg) => 0;
     for (unsigned i = 0; i < 300; i++) {
-        snprintf((char*)buffer, sizeof(buffer), "file_%03d", i);
-        lfs2_file_open(&lfs2, &file[0], (char*)buffer, LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-        size = 6;
-        memcpy(wbuffer, "Hello", size);
-        lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
-        lfs2_file_close(&lfs2, &file[0]) => 0;
+        sprintf(path, "file_%03d", i);
+        lfs_file_open(&lfs, &file, path,
+                LFS_O_RDWR | LFS_O_CREAT | LFS_O_EXCL) => 0;
+        lfs_size_t size = 7;
+        uint8_t wbuffer[1024];
+        uint8_t rbuffer[1024];
+        snprintf((char*)wbuffer, size, "Hi %03d", i);
+        lfs_file_write(&lfs, &file, wbuffer, size) => size;
+        lfs_file_rewind(&lfs, &file) => 0;
+        lfs_file_read(&lfs, &file, rbuffer, size) => size;
+        memcmp(wbuffer, rbuffer, size) => 0;
+        lfs_file_close(&lfs, &file) => 0;
     }
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Results ---"
-tests/stats.py
+echo "--- Many files with flush test ---"
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
+TEST
+scripts/test.py << TEST
+    // Create 300 files of 7 bytes
+    lfs_mount(&lfs, &cfg) => 0;
+    for (unsigned i = 0; i < 300; i++) {
+        sprintf(path, "file_%03d", i);
+        lfs_file_open(&lfs, &file, path,
+                LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
+        lfs_size_t size = 7;
+        uint8_t wbuffer[1024];
+        uint8_t rbuffer[1024];
+        snprintf((char*)wbuffer, size, "Hi %03d", i);
+        lfs_file_write(&lfs, &file, wbuffer, size) => size;
+        lfs_file_close(&lfs, &file) => 0;
+
+        lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
+        lfs_file_read(&lfs, &file, rbuffer, size) => size;
+        memcmp(wbuffer, rbuffer, size) => 0;
+        lfs_file_close(&lfs, &file) => 0;
+    }
+    lfs_unmount(&lfs) => 0;
+TEST
+
+echo "--- Many files with power cycle test ---"
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
+TEST
+scripts/test.py << TEST
+    // Create 300 files of 7 bytes
+    lfs_mount(&lfs, &cfg) => 0;
+    for (unsigned i = 0; i < 300; i++) {
+        sprintf(path, "file_%03d", i);
+        lfs_file_open(&lfs, &file, path,
+                LFS_O_WRONLY | LFS_O_CREAT | LFS_O_EXCL) => 0;
+        lfs_size_t size = 7;
+        uint8_t wbuffer[1024];
+        uint8_t rbuffer[1024];
+        snprintf((char*)wbuffer, size, "Hi %03d", i);
+        lfs_file_write(&lfs, &file, wbuffer, size) => size;
+        lfs_file_close(&lfs, &file) => 0;
+        lfs_unmount(&lfs) => 0;
+
+        lfs_mount(&lfs, &cfg) => 0;
+        lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
+        lfs_file_read(&lfs, &file, rbuffer, size) => size;
+        memcmp(wbuffer, rbuffer, size) => 0;
+        lfs_file_close(&lfs, &file) => 0;
+    }
+    lfs_unmount(&lfs) => 0;
+TEST
+
+scripts/results.py

tests/test_format.sh

@@ -1,50 +1,51 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
 
 echo "=== Formatting tests ==="
 rm -rf blocks
 
 echo "--- Basic formatting ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 TEST
 
 echo "--- Basic mounting ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Invalid superblocks ---"
 ln -f -s /dev/zero blocks/0
 ln -f -s /dev/zero blocks/1
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => LFS2_ERR_NOSPC;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => LFS_ERR_NOSPC;
 TEST
 rm blocks/0 blocks/1
 
 echo "--- Invalid mount ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => LFS2_ERR_CORRUPT;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => LFS_ERR_CORRUPT;
 TEST
 
 echo "--- Expanding superblock ---"
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
-    lfs2_mount(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
     for (int i = 0; i < 100; i++) {
-        lfs2_mkdir(&lfs2, "dummy") => 0;
-        lfs2_remove(&lfs2, "dummy") => 0;
+        lfs_mkdir(&lfs, "dummy") => 0;
+        lfs_remove(&lfs, "dummy") => 0;
     }
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "dummy") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "dummy") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Results ---"
-tests/stats.py
+scripts/results.py

tests/test_interspersed.sh

@@ -1,186 +1,190 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
 
 echo "=== Interspersed tests ==="
 rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 TEST
 
 echo "--- Interspersed file test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "a", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    lfs2_file_open(&lfs2, &file[1], "b", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    lfs2_file_open(&lfs2, &file[2], "c", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    lfs2_file_open(&lfs2, &file[3], "d", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_t files[4];
+    lfs_file_open(&lfs, &files[0], "a", LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_file_open(&lfs, &files[1], "b", LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_file_open(&lfs, &files[2], "c", LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_file_open(&lfs, &files[3], "d", LFS_O_WRONLY | LFS_O_CREAT) => 0;
 
     for (int i = 0; i < 10; i++) {
-        lfs2_file_write(&lfs2, &file[0], (const void*)"a", 1) => 1;
-        lfs2_file_write(&lfs2, &file[1], (const void*)"b", 1) => 1;
-        lfs2_file_write(&lfs2, &file[2], (const void*)"c", 1) => 1;
-        lfs2_file_write(&lfs2, &file[3], (const void*)"d", 1) => 1;
+        lfs_file_write(&lfs, &files[0], (const void*)"a", 1) => 1;
+        lfs_file_write(&lfs, &files[1], (const void*)"b", 1) => 1;
+        lfs_file_write(&lfs, &files[2], (const void*)"c", 1) => 1;
+        lfs_file_write(&lfs, &files[3], (const void*)"d", 1) => 1;
     }
 
-    lfs2_file_close(&lfs2, &file[0]);
-    lfs2_file_close(&lfs2, &file[1]);
-    lfs2_file_close(&lfs2, &file[2]);
-    lfs2_file_close(&lfs2, &file[3]);
+    lfs_file_close(&lfs, &files[0]);
+    lfs_file_close(&lfs, &files[1]);
+    lfs_file_close(&lfs, &files[2]);
+    lfs_file_close(&lfs, &files[3]);
 
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "a") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => 10;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "b") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => 10;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "c") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => 10;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "d") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => 10;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "a", LFS2_O_RDONLY) => 0;
-    lfs2_file_open(&lfs2, &file[1], "b", LFS2_O_RDONLY) => 0;
-    lfs2_file_open(&lfs2, &file[2], "c", LFS2_O_RDONLY) => 0;
-    lfs2_file_open(&lfs2, &file[3], "d", LFS2_O_RDONLY) => 0;
+    lfs_file_open(&lfs, &files[0], "a", LFS_O_RDONLY) => 0;
+    lfs_file_open(&lfs, &files[1], "b", LFS_O_RDONLY) => 0;
+    lfs_file_open(&lfs, &files[2], "c", LFS_O_RDONLY) => 0;
+    lfs_file_open(&lfs, &files[3], "d", LFS_O_RDONLY) => 0;
 
     for (int i = 0; i < 10; i++) {
-        lfs2_file_read(&lfs2, &file[0], buffer, 1) => 1;
+        lfs_file_read(&lfs, &files[0], buffer, 1) => 1;
         buffer[0] => 'a';
-        lfs2_file_read(&lfs2, &file[1], buffer, 1) => 1;
+        lfs_file_read(&lfs, &files[1], buffer, 1) => 1;
         buffer[0] => 'b';
-        lfs2_file_read(&lfs2, &file[2], buffer, 1) => 1;
+        lfs_file_read(&lfs, &files[2], buffer, 1) => 1;
         buffer[0] => 'c';
-        lfs2_file_read(&lfs2, &file[3], buffer, 1) => 1;
+        lfs_file_read(&lfs, &files[3], buffer, 1) => 1;
         buffer[0] => 'd';
     }
 
-    lfs2_file_close(&lfs2, &file[0]);
-    lfs2_file_close(&lfs2, &file[1]);
-    lfs2_file_close(&lfs2, &file[2]);
-    lfs2_file_close(&lfs2, &file[3]);
+    lfs_file_close(&lfs, &files[0]);
+    lfs_file_close(&lfs, &files[1]);
+    lfs_file_close(&lfs, &files[2]);
+    lfs_file_close(&lfs, &files[3]);
     
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Interspersed remove file test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "e", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_t files[4];
+    lfs_file_open(&lfs, &files[0], "e", LFS_O_WRONLY | LFS_O_CREAT) => 0;
 
     for (int i = 0; i < 5; i++) {
-        lfs2_file_write(&lfs2, &file[0], (const void*)"e", 1) => 1;
+        lfs_file_write(&lfs, &files[0], (const void*)"e", 1) => 1;
     }
 
-    lfs2_remove(&lfs2, "a") => 0;
-    lfs2_remove(&lfs2, "b") => 0;
-    lfs2_remove(&lfs2, "c") => 0;
-    lfs2_remove(&lfs2, "d") => 0;
+    lfs_remove(&lfs, "a") => 0;
+    lfs_remove(&lfs, "b") => 0;
+    lfs_remove(&lfs, "c") => 0;
+    lfs_remove(&lfs, "d") => 0;
 
     for (int i = 0; i < 5; i++) {
-        lfs2_file_write(&lfs2, &file[0], (const void*)"e", 1) => 1;
+        lfs_file_write(&lfs, &files[0], (const void*)"e", 1) => 1;
     }
 
-    lfs2_file_close(&lfs2, &file[0]);
+    lfs_file_close(&lfs, &files[0]);
 
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "e") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => 10;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "e", LFS2_O_RDONLY) => 0;
+    lfs_file_open(&lfs, &files[0], "e", LFS_O_RDONLY) => 0;
 
     for (int i = 0; i < 10; i++) {
-        lfs2_file_read(&lfs2, &file[0], buffer, 1) => 1;
+        lfs_file_read(&lfs, &files[0], buffer, 1) => 1;
         buffer[0] => 'e';
     }
 
-    lfs2_file_close(&lfs2, &file[0]);
+    lfs_file_close(&lfs, &files[0]);
     
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Remove inconveniently test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "e", LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
-    lfs2_file_open(&lfs2, &file[1], "f", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
-    lfs2_file_open(&lfs2, &file[2], "g", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_t files[4];
+    lfs_file_open(&lfs, &files[0], "e", LFS_O_WRONLY | LFS_O_TRUNC) => 0;
+    lfs_file_open(&lfs, &files[1], "f", LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_file_open(&lfs, &files[2], "g", LFS_O_WRONLY | LFS_O_CREAT) => 0;
 
     for (int i = 0; i < 5; i++) {
-        lfs2_file_write(&lfs2, &file[0], (const void*)"e", 1) => 1;
-        lfs2_file_write(&lfs2, &file[1], (const void*)"f", 1) => 1;
-        lfs2_file_write(&lfs2, &file[2], (const void*)"g", 1) => 1;
+        lfs_file_write(&lfs, &files[0], (const void*)"e", 1) => 1;
+        lfs_file_write(&lfs, &files[1], (const void*)"f", 1) => 1;
+        lfs_file_write(&lfs, &files[2], (const void*)"g", 1) => 1;
     }
 
-    lfs2_remove(&lfs2, "f") => 0;
+    lfs_remove(&lfs, "f") => 0;
 
     for (int i = 0; i < 5; i++) {
-        lfs2_file_write(&lfs2, &file[0], (const void*)"e", 1) => 1;
-        lfs2_file_write(&lfs2, &file[1], (const void*)"f", 1) => 1;
-        lfs2_file_write(&lfs2, &file[2], (const void*)"g", 1) => 1;
+        lfs_file_write(&lfs, &files[0], (const void*)"e", 1) => 1;
+        lfs_file_write(&lfs, &files[1], (const void*)"f", 1) => 1;
+        lfs_file_write(&lfs, &files[2], (const void*)"g", 1) => 1;
     }
 
-    lfs2_file_close(&lfs2, &file[0]);
-    lfs2_file_close(&lfs2, &file[1]);
-    lfs2_file_close(&lfs2, &file[2]);
+    lfs_file_close(&lfs, &files[0]);
+    lfs_file_close(&lfs, &files[1]);
+    lfs_file_close(&lfs, &files[2]);
 
-    lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_open(&lfs, &dir, "/") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    info.type => LFS2_TYPE_DIR;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    info.type => LFS_TYPE_DIR;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "e") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => 10;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "g") => 0;
-    info.type => LFS2_TYPE_REG;
+    info.type => LFS_TYPE_REG;
     info.size => 10;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "e", LFS2_O_RDONLY) => 0;
-    lfs2_file_open(&lfs2, &file[1], "g", LFS2_O_RDONLY) => 0;
+    lfs_file_open(&lfs, &files[0], "e", LFS_O_RDONLY) => 0;
+    lfs_file_open(&lfs, &files[1], "g", LFS_O_RDONLY) => 0;
 
     for (int i = 0; i < 10; i++) {
-        lfs2_file_read(&lfs2, &file[0], buffer, 1) => 1;
+        lfs_file_read(&lfs, &files[0], buffer, 1) => 1;
         buffer[0] => 'e';
-        lfs2_file_read(&lfs2, &file[1], buffer, 1) => 1;
+        lfs_file_read(&lfs, &files[1], buffer, 1) => 1;
         buffer[0] => 'g';
     }
 
-    lfs2_file_close(&lfs2, &file[0]);
-    lfs2_file_close(&lfs2, &file[1]);
+    lfs_file_close(&lfs, &files[0]);
+    lfs_file_close(&lfs, &files[1]);
     
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Results ---"
-tests/stats.py
+scripts/results.py

tests/test_move.sh

@@ -1,332 +1,333 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
 
 echo "=== Move tests ==="
 rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "a") => 0;
-    lfs2_mkdir(&lfs2, "b") => 0;
-    lfs2_mkdir(&lfs2, "c") => 0;
-    lfs2_mkdir(&lfs2, "d") => 0;
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "a") => 0;
+    lfs_mkdir(&lfs, "b") => 0;
+    lfs_mkdir(&lfs, "c") => 0;
+    lfs_mkdir(&lfs, "d") => 0;
 
-    lfs2_mkdir(&lfs2, "a/hi") => 0;
-    lfs2_mkdir(&lfs2, "a/hi/hola") => 0;
-    lfs2_mkdir(&lfs2, "a/hi/bonjour") => 0;
-    lfs2_mkdir(&lfs2, "a/hi/ohayo") => 0;
+    lfs_mkdir(&lfs, "a/hi") => 0;
+    lfs_mkdir(&lfs, "a/hi/hola") => 0;
+    lfs_mkdir(&lfs, "a/hi/bonjour") => 0;
+    lfs_mkdir(&lfs, "a/hi/ohayo") => 0;
 
-    lfs2_file_open(&lfs2, &file[0], "a/hello", LFS2_O_CREAT | LFS2_O_WRONLY) => 0;
-    lfs2_file_write(&lfs2, &file[0], "hola\n", 5) => 5;
-    lfs2_file_write(&lfs2, &file[0], "bonjour\n", 8) => 8;
-    lfs2_file_write(&lfs2, &file[0], "ohayo\n", 6) => 6;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_open(&lfs, &file, "a/hello", LFS_O_CREAT | LFS_O_WRONLY) => 0;
+    lfs_file_write(&lfs, &file, "hola\n", 5) => 5;
+    lfs_file_write(&lfs, &file, "bonjour\n", 8) => 8;
+    lfs_file_write(&lfs, &file, "ohayo\n", 6) => 6;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Move file ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_rename(&lfs2, "a/hello", "b/hello") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_rename(&lfs, "a/hello", "b/hello") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "a") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "a") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hi") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "b") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_dir_open(&lfs, &dir, "b") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hello") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Move file corrupt source ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_rename(&lfs2, "b/hello", "c/hello") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_rename(&lfs, "b/hello", "c/hello") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/corrupt.py -n 1
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "b") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/corrupt.py -n 1
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "b") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_dir_open(&lfs, &dir, "c") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hello") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Move file corrupt source and dest ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_rename(&lfs2, "c/hello", "d/hello") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_rename(&lfs, "c/hello", "d/hello") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/corrupt.py -n 2
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/corrupt.py -n 2
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "c") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hello") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "d") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_dir_open(&lfs, &dir, "d") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Move file after corrupt ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_rename(&lfs2, "c/hello", "d/hello") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_rename(&lfs, "c/hello", "d/hello") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "c") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "d") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_dir_open(&lfs, &dir, "d") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hello") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Move dir ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_rename(&lfs2, "a/hi", "b/hi") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_rename(&lfs, "a/hi", "b/hi") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "a") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "a") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "b") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_dir_open(&lfs, &dir, "b") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hi") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Move dir corrupt source ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_rename(&lfs2, "b/hi", "c/hi") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_rename(&lfs, "b/hi", "c/hi") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/corrupt.py -n 1
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "b") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/corrupt.py -n 1
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "b") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_dir_open(&lfs, &dir, "c") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hi") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Move dir corrupt source and dest ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_rename(&lfs2, "c/hi", "d/hi") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_rename(&lfs, "c/hi", "d/hi") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/corrupt.py -n 2
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/corrupt.py -n 2
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "c") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hi") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "d") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_dir_open(&lfs, &dir, "d") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hello") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Move dir after corrupt ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_rename(&lfs2, "c/hi", "d/hi") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_rename(&lfs, "c/hi", "d/hi") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "c") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "d") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_dir_open(&lfs, &dir, "d") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hello") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hi") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Move check ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
 
-    lfs2_dir_open(&lfs2, &dir[0], "a/hi") => LFS2_ERR_NOENT;
-    lfs2_dir_open(&lfs2, &dir[0], "b/hi") => LFS2_ERR_NOENT;
-    lfs2_dir_open(&lfs2, &dir[0], "c/hi") => LFS2_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "a/hi") => LFS_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "b/hi") => LFS_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "c/hi") => LFS_ERR_NOENT;
 
-    lfs2_dir_open(&lfs2, &dir[0], "d/hi") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_open(&lfs, &dir, "d/hi") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "bonjour") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hola") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "ohayo") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
 
-    lfs2_dir_open(&lfs2, &dir[0], "a/hello") => LFS2_ERR_NOENT;
-    lfs2_dir_open(&lfs2, &dir[0], "b/hello") => LFS2_ERR_NOENT;
-    lfs2_dir_open(&lfs2, &dir[0], "c/hello") => LFS2_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "a/hello") => LFS_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "b/hello") => LFS_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "c/hello") => LFS_ERR_NOENT;
 
-    lfs2_file_open(&lfs2, &file[0], "d/hello", LFS2_O_RDONLY) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, 5) => 5;
+    lfs_file_open(&lfs, &file, "d/hello", LFS_O_RDONLY) => 0;
+    lfs_file_read(&lfs, &file, buffer, 5) => 5;
     memcmp(buffer, "hola\n", 5) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, 8) => 8;
+    lfs_file_read(&lfs, &file, buffer, 8) => 8;
     memcmp(buffer, "bonjour\n", 8) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, 6) => 6;
+    lfs_file_read(&lfs, &file, buffer, 6) => 6;
     memcmp(buffer, "ohayo\n", 6) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Move state stealing ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
 
-    lfs2_remove(&lfs2, "b") => 0;
-    lfs2_remove(&lfs2, "c") => 0;
+    lfs_remove(&lfs, "b") => 0;
+    lfs_remove(&lfs, "c") => 0;
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
 
-    lfs2_dir_open(&lfs2, &dir[0], "a/hi") => LFS2_ERR_NOENT;
-    lfs2_dir_open(&lfs2, &dir[0], "b") => LFS2_ERR_NOENT;
-    lfs2_dir_open(&lfs2, &dir[0], "c") => LFS2_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "a/hi") => LFS_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "b") => LFS_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "c") => LFS_ERR_NOENT;
 
-    lfs2_dir_open(&lfs2, &dir[0], "d/hi") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_open(&lfs, &dir, "d/hi") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "bonjour") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "hola") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "ohayo") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
 
-    lfs2_dir_open(&lfs2, &dir[0], "a/hello") => LFS2_ERR_NOENT;
-    lfs2_dir_open(&lfs2, &dir[0], "b") => LFS2_ERR_NOENT;
-    lfs2_dir_open(&lfs2, &dir[0], "c") => LFS2_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "a/hello") => LFS_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "b") => LFS_ERR_NOENT;
+    lfs_dir_open(&lfs, &dir, "c") => LFS_ERR_NOENT;
 
-    lfs2_file_open(&lfs2, &file[0], "d/hello", LFS2_O_RDONLY) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, 5) => 5;
+    lfs_file_open(&lfs, &file, "d/hello", LFS_O_RDONLY) => 0;
+    lfs_file_read(&lfs, &file, buffer, 5) => 5;
     memcmp(buffer, "hola\n", 5) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, 8) => 8;
+    lfs_file_read(&lfs, &file, buffer, 8) => 8;
     memcmp(buffer, "bonjour\n", 8) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, 6) => 6;
+    lfs_file_read(&lfs, &file, buffer, 6) => 6;
     memcmp(buffer, "ohayo\n", 6) => 0;
-    lfs2_file_close(&lfs2, &file[0]) => 0;
+    lfs_file_close(&lfs, &file) => 0;
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 
-echo "--- Results ---"
-tests/stats.py
+scripts/results.py

tests/test_orphan.sh

@@ -1,45 +1,46 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
 
 echo "=== Orphan tests ==="
 rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 TEST
 
 echo "--- Orphan test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "parent") => 0;
-    lfs2_mkdir(&lfs2, "parent/orphan") => 0;
-    lfs2_mkdir(&lfs2, "parent/child") => 0;
-    lfs2_remove(&lfs2, "parent/orphan") => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "parent") => 0;
+    lfs_mkdir(&lfs, "parent/orphan") => 0;
+    lfs_mkdir(&lfs, "parent/child") => 0;
+    lfs_remove(&lfs, "parent/orphan") => 0;
 TEST
 # corrupt most recent commit, this should be the update to the previous
 # linked-list entry and should orphan the child
-tests/corrupt.py
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
+scripts/corrupt.py
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
 
-    lfs2_stat(&lfs2, "parent/orphan", &info) => LFS2_ERR_NOENT;
-    lfs2_ssize_t before = lfs2_fs_size(&lfs2);
+    lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT;
+    lfs_ssize_t before = lfs_fs_size(&lfs);
     before => 8;
 
-    lfs2_unmount(&lfs2) => 0;
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_unmount(&lfs) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
-    lfs2_stat(&lfs2, "parent/orphan", &info) => LFS2_ERR_NOENT;
-    lfs2_ssize_t orphaned = lfs2_fs_size(&lfs2);
+    lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT;
+    lfs_ssize_t orphaned = lfs_fs_size(&lfs);
     orphaned => 8;
 
-    lfs2_mkdir(&lfs2, "parent/otherchild") => 0;
+    lfs_mkdir(&lfs, "parent/otherchild") => 0;
 
-    lfs2_stat(&lfs2, "parent/orphan", &info) => LFS2_ERR_NOENT;
-    lfs2_ssize_t deorphaned = lfs2_fs_size(&lfs2);
+    lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT;
+    lfs_ssize_t deorphaned = lfs_fs_size(&lfs);
     deorphaned => 8;
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Results ---"
-tests/stats.py
+scripts/results.py

tests/test_paths.sh

@@ -1,169 +1,202 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
 
 echo "=== Path tests ==="
 rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 TEST
 
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "tea") => 0;
-    lfs2_mkdir(&lfs2, "coffee") => 0;
-    lfs2_mkdir(&lfs2, "soda") => 0;
-    lfs2_mkdir(&lfs2, "tea/hottea") => 0;
-    lfs2_mkdir(&lfs2, "tea/warmtea") => 0;
-    lfs2_mkdir(&lfs2, "tea/coldtea") => 0;
-    lfs2_mkdir(&lfs2, "coffee/hotcoffee") => 0;
-    lfs2_mkdir(&lfs2, "coffee/warmcoffee") => 0;
-    lfs2_mkdir(&lfs2, "coffee/coldcoffee") => 0;
-    lfs2_mkdir(&lfs2, "soda/hotsoda") => 0;
-    lfs2_mkdir(&lfs2, "soda/warmsoda") => 0;
-    lfs2_mkdir(&lfs2, "soda/coldsoda") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "tea") => 0;
+    lfs_mkdir(&lfs, "coffee") => 0;
+    lfs_mkdir(&lfs, "soda") => 0;
+    lfs_mkdir(&lfs, "tea/hottea") => 0;
+    lfs_mkdir(&lfs, "tea/warmtea") => 0;
+    lfs_mkdir(&lfs, "tea/coldtea") => 0;
+    lfs_mkdir(&lfs, "coffee/hotcoffee") => 0;
+    lfs_mkdir(&lfs, "coffee/warmcoffee") => 0;
+    lfs_mkdir(&lfs, "coffee/coldcoffee") => 0;
+    lfs_mkdir(&lfs, "soda/hotsoda") => 0;
+    lfs_mkdir(&lfs, "soda/warmsoda") => 0;
+    lfs_mkdir(&lfs, "soda/coldsoda") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Root path tests ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_stat(&lfs2, "tea/hottea", &info) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_stat(&lfs, "tea/hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "/tea/hottea", &info) => 0;
+    lfs_stat(&lfs, "/tea/hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
 
-    lfs2_mkdir(&lfs2, "/milk1") => 0;
-    lfs2_stat(&lfs2, "/milk1", &info) => 0;
+    lfs_mkdir(&lfs, "/milk1") => 0;
+    lfs_stat(&lfs, "/milk1", &info) => 0;
     strcmp(info.name, "milk1") => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Redundant slash path tests ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_stat(&lfs2, "/tea/hottea", &info) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_stat(&lfs, "/tea/hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "//tea//hottea", &info) => 0;
+    lfs_stat(&lfs, "//tea//hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "///tea///hottea", &info) => 0;
+    lfs_stat(&lfs, "///tea///hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
 
-    lfs2_mkdir(&lfs2, "///milk2") => 0;
-    lfs2_stat(&lfs2, "///milk2", &info) => 0;
+    lfs_mkdir(&lfs, "///milk2") => 0;
+    lfs_stat(&lfs, "///milk2", &info) => 0;
     strcmp(info.name, "milk2") => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Dot path tests ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_stat(&lfs2, "./tea/hottea", &info) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_stat(&lfs, "./tea/hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "/./tea/hottea", &info) => 0;
+    lfs_stat(&lfs, "/./tea/hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "/././tea/hottea", &info) => 0;
+    lfs_stat(&lfs, "/././tea/hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "/./tea/./hottea", &info) => 0;
+    lfs_stat(&lfs, "/./tea/./hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
 
-    lfs2_mkdir(&lfs2, "/./milk3") => 0;
-    lfs2_stat(&lfs2, "/./milk3", &info) => 0;
+    lfs_mkdir(&lfs, "/./milk3") => 0;
+    lfs_stat(&lfs, "/./milk3", &info) => 0;
     strcmp(info.name, "milk3") => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Dot dot path tests ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_stat(&lfs2, "coffee/../tea/hottea", &info) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_stat(&lfs, "coffee/../tea/hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "tea/coldtea/../hottea", &info) => 0;
+    lfs_stat(&lfs, "tea/coldtea/../hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "coffee/coldcoffee/../../tea/hottea", &info) => 0;
+    lfs_stat(&lfs, "coffee/coldcoffee/../../tea/hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "coffee/../soda/../tea/hottea", &info) => 0;
+    lfs_stat(&lfs, "coffee/../soda/../tea/hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
 
-    lfs2_mkdir(&lfs2, "coffee/../milk4") => 0;
-    lfs2_stat(&lfs2, "coffee/../milk4", &info) => 0;
+    lfs_mkdir(&lfs, "coffee/../milk4") => 0;
+    lfs_stat(&lfs, "coffee/../milk4", &info) => 0;
     strcmp(info.name, "milk4") => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Trailing dot path tests ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_stat(&lfs2, "tea/hottea/", &info) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_stat(&lfs, "tea/hottea/", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "tea/hottea/.", &info) => 0;
+    lfs_stat(&lfs, "tea/hottea/.", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "tea/hottea/./.", &info) => 0;
+    lfs_stat(&lfs, "tea/hottea/./.", &info) => 0;
     strcmp(info.name, "hottea") => 0;
-    lfs2_stat(&lfs2, "tea/hottea/..", &info) => 0;
+    lfs_stat(&lfs, "tea/hottea/..", &info) => 0;
     strcmp(info.name, "tea") => 0;
-    lfs2_stat(&lfs2, "tea/hottea/../.", &info) => 0;
+    lfs_stat(&lfs, "tea/hottea/../.", &info) => 0;
     strcmp(info.name, "tea") => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Root dot dot path tests ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_stat(&lfs2, "coffee/../../../../../../tea/hottea", &info) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_stat(&lfs, "coffee/../../../../../../tea/hottea", &info) => 0;
     strcmp(info.name, "hottea") => 0;
 
-    lfs2_mkdir(&lfs2, "coffee/../../../../../../milk5") => 0;
-    lfs2_stat(&lfs2, "coffee/../../../../../../milk5", &info) => 0;
+    lfs_mkdir(&lfs, "coffee/../../../../../../milk5") => 0;
+    lfs_stat(&lfs, "coffee/../../../../../../milk5", &info) => 0;
     strcmp(info.name, "milk5") => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Root tests ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_stat(&lfs2, "/", &info) => 0;
-    info.type => LFS2_TYPE_DIR;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_stat(&lfs, "/", &info) => 0;
+    info.type => LFS_TYPE_DIR;
     strcmp(info.name, "/") => 0;
 
-    lfs2_mkdir(&lfs2, "/") => LFS2_ERR_EXIST;
-    lfs2_file_open(&lfs2, &file[0], "/", LFS2_O_WRONLY | LFS2_O_CREAT)
-        => LFS2_ERR_ISDIR;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_mkdir(&lfs, "/") => LFS_ERR_EXIST;
+    lfs_file_open(&lfs, &file, "/", LFS_O_WRONLY | LFS_O_CREAT)
+        => LFS_ERR_ISDIR;
+
+    // more corner cases
+    lfs_remove(&lfs, "") => LFS_ERR_INVAL;
+    lfs_remove(&lfs, ".") => LFS_ERR_INVAL;
+    lfs_remove(&lfs, "..") => LFS_ERR_INVAL;
+    lfs_remove(&lfs, "/") => LFS_ERR_INVAL;
+    lfs_remove(&lfs, "//") => LFS_ERR_INVAL;
+    lfs_remove(&lfs, "./") => LFS_ERR_INVAL;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Sketchy path tests ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "dirt/ground") => LFS2_ERR_NOENT;
-    lfs2_mkdir(&lfs2, "dirt/ground/earth") => LFS2_ERR_NOENT;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "dirt/ground") => LFS_ERR_NOENT;
+    lfs_mkdir(&lfs, "dirt/ground/earth") => LFS_ERR_NOENT;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Superblock conflict test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "littlefs") => 0;
-    lfs2_remove(&lfs2, "littlefs") => 0;
-    lfs2_unmount(&lfs2) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "littlefs") => 0;
+    lfs_remove(&lfs, "littlefs") => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Max path test ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    memset(buffer, 'w', LFS2_NAME_MAX+1);
-    buffer[LFS2_NAME_MAX+2] = '\0';
-    lfs2_mkdir(&lfs2, (char*)buffer) => LFS2_ERR_NAMETOOLONG;
-    lfs2_file_open(&lfs2, &file[0], (char*)buffer,
-            LFS2_O_WRONLY | LFS2_O_CREAT) => LFS2_ERR_NAMETOOLONG;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(path, 'w', LFS_NAME_MAX+1);
+    path[LFS_NAME_MAX+2] = '\0';
+    lfs_mkdir(&lfs, path) => LFS_ERR_NAMETOOLONG;
+    lfs_file_open(&lfs, &file, path,
+            LFS_O_WRONLY | LFS_O_CREAT) => LFS_ERR_NAMETOOLONG;
 
-    memcpy(buffer, "coffee/", strlen("coffee/"));
-    memset(buffer+strlen("coffee/"), 'w', LFS2_NAME_MAX+1);
-    buffer[strlen("coffee/")+LFS2_NAME_MAX+2] = '\0';
-    lfs2_mkdir(&lfs2, (char*)buffer) => LFS2_ERR_NAMETOOLONG;
-    lfs2_file_open(&lfs2, &file[0], (char*)buffer,
-            LFS2_O_WRONLY | LFS2_O_CREAT) => LFS2_ERR_NAMETOOLONG;
-    lfs2_unmount(&lfs2) => 0;
+    memcpy(path, "coffee/", strlen("coffee/"));
+    memset(path+strlen("coffee/"), 'w', LFS_NAME_MAX+1);
+    path[strlen("coffee/")+LFS_NAME_MAX+2] = '\0';
+    lfs_mkdir(&lfs, path) => LFS_ERR_NAMETOOLONG;
+    lfs_file_open(&lfs, &file, path,
+            LFS_O_WRONLY | LFS_O_CREAT) => LFS_ERR_NAMETOOLONG;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Results ---"
-tests/stats.py
+echo "--- Really big path test ---"
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    memset(path, 'w', LFS_NAME_MAX);
+    path[LFS_NAME_MAX+1] = '\0';
+    lfs_mkdir(&lfs, path) => 0;
+    lfs_remove(&lfs, path) => 0;
+    lfs_file_open(&lfs, &file, path,
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_remove(&lfs, path) => 0;
+
+    memcpy(path, "coffee/", strlen("coffee/"));
+    memset(path+strlen("coffee/"), 'w', LFS_NAME_MAX);
+    path[strlen("coffee/")+LFS_NAME_MAX+1] = '\0';
+    lfs_mkdir(&lfs, path) => 0;
+    lfs_remove(&lfs, path) => 0;
+    lfs_file_open(&lfs, &file, path,
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_remove(&lfs, path) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+
+scripts/results.py

tests/test_seek.sh

@@ -1,361 +1,431 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
+
+echo "=== Seek tests ==="
 
 SMALLSIZE=4
 MEDIUMSIZE=128
 LARGESIZE=132
 
-echo "=== Seek tests ==="
 rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_mkdir(&lfs2, "hello") => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_mkdir(&lfs, "hello") => 0;
     for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "hello/kitty%03d", i);
-        lfs2_file_open(&lfs2, &file[0], (char*)buffer,
-                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+        sprintf(path, "hello/kitty%03d", i);
+        lfs_file_open(&lfs, &file, path,
+                LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
 
-        size = strlen("kittycatcat");
+        lfs_size_t size = strlen("kittycatcat");
         memcpy(buffer, "kittycatcat", size);
         for (int j = 0; j < $LARGESIZE; j++) {
-            lfs2_file_write(&lfs2, &file[0], buffer, size);
+            lfs_file_write(&lfs, &file, buffer, size);
         }
 
-        lfs2_file_close(&lfs2, &file[0]) => 0;
+        lfs_file_close(&lfs, &file) => 0;
     }
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Simple dir seek ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "hello") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "hello") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
 
-    lfs2_soff_t pos;
+    lfs_soff_t pos;
     int i;
     for (i = 0; i < $SMALLSIZE; i++) {
-        sprintf((char*)buffer, "kitty%03d", i);
-        lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-        strcmp(info.name, (char*)buffer) => 0;
-        pos = lfs2_dir_tell(&lfs2, &dir[0]);
+        sprintf(path, "kitty%03d", i);
+        lfs_dir_read(&lfs, &dir, &info) => 1;
+        strcmp(info.name, path) => 0;
+        pos = lfs_dir_tell(&lfs, &dir);
     }
     pos >= 0 => 1;
 
-    lfs2_dir_seek(&lfs2, &dir[0], pos) => 0;
-    sprintf((char*)buffer, "kitty%03d", i);
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
+    lfs_dir_seek(&lfs, &dir, pos) => 0;
+    sprintf(path, "kitty%03d", i);
+    lfs_dir_read(&lfs, &dir, &info) => 1;
+    strcmp(info.name, path) => 0;
 
-    lfs2_dir_rewind(&lfs2, &dir[0]) => 0;
-    sprintf((char*)buffer, "kitty%03d", 0);
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_rewind(&lfs, &dir) => 0;
+    sprintf(path, "kitty%03d", 0);
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
+    strcmp(info.name, path) => 0;
 
-    lfs2_dir_seek(&lfs2, &dir[0], pos) => 0;
-    sprintf((char*)buffer, "kitty%03d", i);
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
+    lfs_dir_seek(&lfs, &dir, pos) => 0;
+    sprintf(path, "kitty%03d", i);
+    lfs_dir_read(&lfs, &dir, &info) => 1;
+    strcmp(info.name, path) => 0;
 
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Large dir seek ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_dir_open(&lfs2, &dir[0], "hello") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_dir_open(&lfs, &dir, "hello") => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
 
-    lfs2_soff_t pos;
+    lfs_soff_t pos;
     int i;
     for (i = 0; i < $MEDIUMSIZE; i++) {
-        sprintf((char*)buffer, "kitty%03d", i);
-        lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-        strcmp(info.name, (char*)buffer) => 0;
-        pos = lfs2_dir_tell(&lfs2, &dir[0]);
+        sprintf(path, "kitty%03d", i);
+        lfs_dir_read(&lfs, &dir, &info) => 1;
+        strcmp(info.name, path) => 0;
+        pos = lfs_dir_tell(&lfs, &dir);
     }
     pos >= 0 => 1;
 
-    lfs2_dir_seek(&lfs2, &dir[0], pos) => 0;
-    sprintf((char*)buffer, "kitty%03d", i);
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
+    lfs_dir_seek(&lfs, &dir, pos) => 0;
+    sprintf(path, "kitty%03d", i);
+    lfs_dir_read(&lfs, &dir, &info) => 1;
+    strcmp(info.name, path) => 0;
 
-    lfs2_dir_rewind(&lfs2, &dir[0]) => 0;
-    sprintf((char*)buffer, "kitty%03d", 0);
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_rewind(&lfs, &dir) => 0;
+    sprintf(path, "kitty%03d", 0);
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, ".") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
     strcmp(info.name, "..") => 0;
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
+    lfs_dir_read(&lfs, &dir, &info) => 1;
+    strcmp(info.name, path) => 0;
 
-    lfs2_dir_seek(&lfs2, &dir[0], pos) => 0;
-    sprintf((char*)buffer, "kitty%03d", i);
-    lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
+    lfs_dir_seek(&lfs, &dir, pos) => 0;
+    sprintf(path, "kitty%03d", i);
+    lfs_dir_read(&lfs, &dir, &info) => 1;
+    strcmp(info.name, path) => 0;
 
-    lfs2_dir_close(&lfs2, &dir[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_dir_close(&lfs, &dir) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Simple file seek ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDONLY) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "hello/kitty042", LFS_O_RDONLY) => 0;
 
-    lfs2_soff_t pos;
-    size = strlen("kittycatcat");
+    lfs_soff_t pos;
+    lfs_size_t size = strlen("kittycatcat");
     for (int i = 0; i < $SMALLSIZE; i++) {
-        lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_read(&lfs, &file, buffer, size) => size;
         memcmp(buffer, "kittycatcat", size) => 0;
-        pos = lfs2_file_tell(&lfs2, &file[0]);
+        pos = lfs_file_tell(&lfs, &file);
     }
     pos >= 0 => 1;
 
-    lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, pos, LFS_SEEK_SET) => pos;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_rewind(&lfs2, &file[0]) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_rewind(&lfs, &file) => 0;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, 0, LFS_SEEK_CUR) => size;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], size, LFS2_SEEK_CUR) => 3*size;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, size, LFS_SEEK_CUR) => 3*size;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, pos, LFS_SEEK_SET) => pos;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_CUR) => pos;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, -size, LFS_SEEK_CUR) => pos;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_END) >= 0 => 1;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, -size, LFS_SEEK_END) >= 0 => 1;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    size = lfs2_file_size(&lfs2, &file[0]);
-    lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
+    size = lfs_file_size(&lfs, &file);
+    lfs_file_seek(&lfs, &file, 0, LFS_SEEK_CUR) => size;
 
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Large file seek ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDONLY) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "hello/kitty042", LFS_O_RDONLY) => 0;
 
-    lfs2_soff_t pos;
-    size = strlen("kittycatcat");
+    lfs_soff_t pos;
+    lfs_size_t size = strlen("kittycatcat");
     for (int i = 0; i < $MEDIUMSIZE; i++) {
-        lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_read(&lfs, &file, buffer, size) => size;
         memcmp(buffer, "kittycatcat", size) => 0;
-        pos = lfs2_file_tell(&lfs2, &file[0]);
+        pos = lfs_file_tell(&lfs, &file);
     }
     pos >= 0 => 1;
 
-    lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, pos, LFS_SEEK_SET) => pos;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_rewind(&lfs2, &file[0]) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_rewind(&lfs, &file) => 0;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, 0, LFS_SEEK_CUR) => size;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], size, LFS2_SEEK_CUR) => 3*size;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, size, LFS_SEEK_CUR) => 3*size;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, pos, LFS_SEEK_SET) => pos;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_CUR) => pos;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, -size, LFS_SEEK_CUR) => pos;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_END) >= 0 => 1;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, -size, LFS_SEEK_END) >= 0 => 1;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    size = lfs2_file_size(&lfs2, &file[0]);
-    lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
+    size = lfs_file_size(&lfs, &file);
+    lfs_file_seek(&lfs, &file, 0, LFS_SEEK_CUR) => size;
 
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Simple file seek and write ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDWR) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "hello/kitty042", LFS_O_RDWR) => 0;
 
-    lfs2_soff_t pos;
-    size = strlen("kittycatcat");
+    lfs_soff_t pos;
+    lfs_size_t size = strlen("kittycatcat");
     for (int i = 0; i < $SMALLSIZE; i++) {
-        lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_read(&lfs, &file, buffer, size) => size;
         memcmp(buffer, "kittycatcat", size) => 0;
-        pos = lfs2_file_tell(&lfs2, &file[0]);
+        pos = lfs_file_tell(&lfs, &file);
     }
     pos >= 0 => 1;
 
     memcpy(buffer, "doggodogdog", size);
-    lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
-    lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, pos, LFS_SEEK_SET) => pos;
+    lfs_file_write(&lfs, &file, buffer, size) => size;
 
-    lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, pos, LFS_SEEK_SET) => pos;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "doggodogdog", size) => 0;
 
-    lfs2_file_rewind(&lfs2, &file[0]) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_rewind(&lfs, &file) => 0;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, pos, LFS_SEEK_SET) => pos;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "doggodogdog", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_END) >= 0 => 1;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, -size, LFS_SEEK_END) >= 0 => 1;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    size = lfs2_file_size(&lfs2, &file[0]);
-    lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
+    size = lfs_file_size(&lfs, &file);
+    lfs_file_seek(&lfs, &file, 0, LFS_SEEK_CUR) => size;
 
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Large file seek and write ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDWR) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "hello/kitty042", LFS_O_RDWR) => 0;
 
-    lfs2_soff_t pos;
-    size = strlen("kittycatcat");
+    lfs_soff_t pos;
+    lfs_size_t size = strlen("kittycatcat");
     for (int i = 0; i < $MEDIUMSIZE; i++) {
-        lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_read(&lfs, &file, buffer, size) => size;
         if (i != $SMALLSIZE) {
             memcmp(buffer, "kittycatcat", size) => 0;
         }
-        pos = lfs2_file_tell(&lfs2, &file[0]);
+        pos = lfs_file_tell(&lfs, &file);
     }
     pos >= 0 => 1;
 
     memcpy(buffer, "doggodogdog", size);
-    lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
-    lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, pos, LFS_SEEK_SET) => pos;
+    lfs_file_write(&lfs, &file, buffer, size) => size;
 
-    lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, pos, LFS_SEEK_SET) => pos;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "doggodogdog", size) => 0;
 
-    lfs2_file_rewind(&lfs2, &file[0]) => 0;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_rewind(&lfs, &file) => 0;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, pos, LFS_SEEK_SET) => pos;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "doggodogdog", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_END) >= 0 => 1;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, -size, LFS_SEEK_END) >= 0 => 1;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "kittycatcat", size) => 0;
 
-    size = lfs2_file_size(&lfs2, &file[0]);
-    lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
+    size = lfs_file_size(&lfs, &file);
+    lfs_file_seek(&lfs, &file, 0, LFS_SEEK_CUR) => size;
 
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Boundary seek and write ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDWR) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "hello/kitty042", LFS_O_RDWR) => 0;
 
-    size = strlen("hedgehoghog");
-    const lfs2_soff_t offsets[] = {512, 1020, 513, 1021, 511, 1019};
+    lfs_size_t size = strlen("hedgehoghog");
+    const lfs_soff_t offsets[] = {512, 1020, 513, 1021, 511, 1019};
 
     for (unsigned i = 0; i < sizeof(offsets) / sizeof(offsets[0]); i++) {
-        lfs2_soff_t off = offsets[i];
+        lfs_soff_t off = offsets[i];
         memcpy(buffer, "hedgehoghog", size);
-        lfs2_file_seek(&lfs2, &file[0], off, LFS2_SEEK_SET) => off;
-        lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
-        lfs2_file_seek(&lfs2, &file[0], off, LFS2_SEEK_SET) => off;
-        lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_seek(&lfs, &file, off, LFS_SEEK_SET) => off;
+        lfs_file_write(&lfs, &file, buffer, size) => size;
+        lfs_file_seek(&lfs, &file, off, LFS_SEEK_SET) => off;
+        lfs_file_read(&lfs, &file, buffer, size) => size;
         memcmp(buffer, "hedgehoghog", size) => 0;
 
-        lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_SET) => 0;
-        lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+        lfs_file_seek(&lfs, &file, 0, LFS_SEEK_SET) => 0;
+        lfs_file_read(&lfs, &file, buffer, size) => size;
         memcmp(buffer, "kittycatcat", size) => 0;
 
-        lfs2_file_sync(&lfs2, &file[0]) => 0;
+        lfs_file_sync(&lfs, &file) => 0;
     }
 
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
 echo "--- Out-of-bounds seek ---"
-tests/test.py << TEST
-    lfs2_mount(&lfs2, &cfg) => 0;
-    lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDWR) => 0;
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "hello/kitty042", LFS_O_RDWR) => 0;
 
-    size = strlen("kittycatcat");
-    lfs2_file_size(&lfs2, &file[0]) => $LARGESIZE*size;
-    lfs2_file_seek(&lfs2, &file[0], ($LARGESIZE+$SMALLSIZE)*size,
-            LFS2_SEEK_SET) => ($LARGESIZE+$SMALLSIZE)*size;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => 0;
+    lfs_size_t size = strlen("kittycatcat");
+    lfs_file_size(&lfs, &file) => $LARGESIZE*size;
+    lfs_file_seek(&lfs, &file, ($LARGESIZE+$SMALLSIZE)*size,
+            LFS_SEEK_SET) => ($LARGESIZE+$SMALLSIZE)*size;
+    lfs_file_read(&lfs, &file, buffer, size) => 0;
 
     memcpy(buffer, "porcupineee", size);
-    lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_write(&lfs, &file, buffer, size) => size;
 
-    lfs2_file_seek(&lfs2, &file[0], ($LARGESIZE+$SMALLSIZE)*size,
-            LFS2_SEEK_SET) => ($LARGESIZE+$SMALLSIZE)*size;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, ($LARGESIZE+$SMALLSIZE)*size,
+            LFS_SEEK_SET) => ($LARGESIZE+$SMALLSIZE)*size;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "porcupineee", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], $LARGESIZE*size,
-            LFS2_SEEK_SET) => $LARGESIZE*size;
-    lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+    lfs_file_seek(&lfs, &file, $LARGESIZE*size,
+            LFS_SEEK_SET) => $LARGESIZE*size;
+    lfs_file_read(&lfs, &file, buffer, size) => size;
     memcmp(buffer, "\0\0\0\0\0\0\0\0\0\0\0", size) => 0;
 
-    lfs2_file_seek(&lfs2, &file[0], -(($LARGESIZE+$SMALLSIZE)*size),
-            LFS2_SEEK_CUR) => LFS2_ERR_INVAL;
-    lfs2_file_tell(&lfs2, &file[0]) => ($LARGESIZE+1)*size;
+    lfs_file_seek(&lfs, &file, -(($LARGESIZE+$SMALLSIZE)*size),
+            LFS_SEEK_CUR) => LFS_ERR_INVAL;
+    lfs_file_tell(&lfs, &file) => ($LARGESIZE+1)*size;
 
-    lfs2_file_seek(&lfs2, &file[0], -(($LARGESIZE+2*$SMALLSIZE)*size),
-            LFS2_SEEK_END) => LFS2_ERR_INVAL;
-    lfs2_file_tell(&lfs2, &file[0]) => ($LARGESIZE+1)*size;
+    lfs_file_seek(&lfs, &file, -(($LARGESIZE+2*$SMALLSIZE)*size),
+            LFS_SEEK_END) => LFS_ERR_INVAL;
+    lfs_file_tell(&lfs, &file) => ($LARGESIZE+1)*size;
 
-    lfs2_file_close(&lfs2, &file[0]) => 0;
-    lfs2_unmount(&lfs2) => 0;
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 
-echo "--- Results ---"
-tests/stats.py
+echo "--- Inline write and seek ---"
+for SIZE in $SMALLSIZE $MEDIUMSIZE $LARGESIZE
+do
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "hello/tinykitty$SIZE",
+            LFS_O_RDWR | LFS_O_CREAT) => 0;
+    int j = 0;
+    int k = 0;
+
+    memcpy(buffer, "abcdefghijklmnopqrstuvwxyz", 26);
+    for (unsigned i = 0; i < $SIZE; i++) {
+        lfs_file_write(&lfs, &file, &buffer[j++ % 26], 1) => 1;
+        lfs_file_tell(&lfs, &file) => i+1;
+        lfs_file_size(&lfs, &file) => i+1;
+    }
+
+    lfs_file_seek(&lfs, &file, 0, LFS_SEEK_SET) => 0;
+    lfs_file_tell(&lfs, &file) => 0;
+    lfs_file_size(&lfs, &file) => $SIZE;
+    for (unsigned i = 0; i < $SIZE; i++) {
+        uint8_t c;
+        lfs_file_read(&lfs, &file, &c, 1) => 1;
+        c => buffer[k++ % 26];
+    }
+
+    lfs_file_sync(&lfs, &file) => 0;
+    lfs_file_tell(&lfs, &file) => $SIZE;
+    lfs_file_size(&lfs, &file) => $SIZE;
+
+    lfs_file_seek(&lfs, &file, 0, LFS_SEEK_SET) => 0;
+    for (unsigned i = 0; i < $SIZE; i++) {
+        lfs_file_write(&lfs, &file, &buffer[j++ % 26], 1) => 1;
+        lfs_file_tell(&lfs, &file) => i+1;
+        lfs_file_size(&lfs, &file) => $SIZE;
+        lfs_file_sync(&lfs, &file) => 0;
+        lfs_file_tell(&lfs, &file) => i+1;
+        lfs_file_size(&lfs, &file) => $SIZE;
+        if (i < $SIZE-2) {
+            uint8_t c[3];
+            lfs_file_seek(&lfs, &file, -1, LFS_SEEK_CUR) => i;
+            lfs_file_read(&lfs, &file, &c, 3) => 3;
+            lfs_file_tell(&lfs, &file) => i+3;
+            lfs_file_size(&lfs, &file) => $SIZE;
+            lfs_file_seek(&lfs, &file, i+1, LFS_SEEK_SET) => i+1;
+            lfs_file_tell(&lfs, &file) => i+1;
+            lfs_file_size(&lfs, &file) => $SIZE;
+        }
+    }
+
+    lfs_file_seek(&lfs, &file, 0, LFS_SEEK_SET) => 0;
+    lfs_file_tell(&lfs, &file) => 0;
+    lfs_file_size(&lfs, &file) => $SIZE;
+    for (unsigned i = 0; i < $SIZE; i++) {
+        uint8_t c;
+        lfs_file_read(&lfs, &file, &c, 1) => 1;
+        c => buffer[k++ % 26];
+    }
+
+    lfs_file_sync(&lfs, &file) => 0;
+    lfs_file_tell(&lfs, &file) => $SIZE;
+    lfs_file_size(&lfs, &file) => $SIZE;
+
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+done
+
+scripts/results.py

tests/test_truncate.sh

@@ -1,114 +1,261 @@
 #!/bin/bash
 set -eu
+export TEST_FILE=$0
+trap 'export TEST_LINE=$LINENO' DEBUG
+
+echo "=== Truncate tests ==="
 
 SMALLSIZE=32
 MEDIUMSIZE=2048
 LARGESIZE=8192
 
-echo "=== Truncate tests ==="
 rm -rf blocks
-tests/test.py << TEST
-    lfs2_format(&lfs2, &cfg) => 0;
+scripts/test.py << TEST
+    lfs_format(&lfs, &cfg) => 0;
 TEST
 
+echo "--- Simple truncate ---"
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "baldynoop",
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
+
+    strcpy((char*)buffer, "hair");
+    lfs_size_t size = strlen((char*)buffer);
+    for (lfs_off_t j = 0; j < $LARGESIZE; j += size) {
+        lfs_file_write(&lfs, &file, buffer, size) => size;
+    }
+    lfs_file_size(&lfs, &file) => $LARGESIZE;
+
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "baldynoop", LFS_O_RDWR) => 0;
+    lfs_file_size(&lfs, &file) => $LARGESIZE;
+
+    lfs_file_truncate(&lfs, &file, $MEDIUMSIZE) => 0;
+    lfs_file_size(&lfs, &file) => $MEDIUMSIZE;
+
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "baldynoop", LFS_O_RDONLY) => 0;
+    lfs_file_size(&lfs, &file) => $MEDIUMSIZE;
+
+    lfs_size_t size = strlen("hair");
+    for (lfs_off_t j = 0; j < $MEDIUMSIZE; j += size) {
+        lfs_file_read(&lfs, &file, buffer, size) => size;
+        memcmp(buffer, "hair", size) => 0;
+    }
+    lfs_file_read(&lfs, &file, buffer, size) => 0;
+
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+
+echo "--- Truncate and read ---"
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "baldyread",
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
+
+    strcpy((char*)buffer, "hair");
+    lfs_size_t size = strlen((char*)buffer);
+    for (lfs_off_t j = 0; j < $LARGESIZE; j += size) {
+        lfs_file_write(&lfs, &file, buffer, size) => size;
+    }
+    lfs_file_size(&lfs, &file) => $LARGESIZE;
+
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "baldyread", LFS_O_RDWR) => 0;
+    lfs_file_size(&lfs, &file) => $LARGESIZE;
+
+    lfs_file_truncate(&lfs, &file, $MEDIUMSIZE) => 0;
+    lfs_file_size(&lfs, &file) => $MEDIUMSIZE;
+
+    lfs_size_t size = strlen("hair");
+    for (lfs_off_t j = 0; j < $MEDIUMSIZE; j += size) {
+        lfs_file_read(&lfs, &file, buffer, size) => size;
+        memcmp(buffer, "hair", size) => 0;
+    }
+    lfs_file_read(&lfs, &file, buffer, size) => 0;
+
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "baldyread", LFS_O_RDONLY) => 0;
+    lfs_file_size(&lfs, &file) => $MEDIUMSIZE;
+
+    lfs_size_t size = strlen("hair");
+    for (lfs_off_t j = 0; j < $MEDIUMSIZE; j += size) {
+        lfs_file_read(&lfs, &file, buffer, size) => size;
+        memcmp(buffer, "hair", size) => 0;
+    }
+    lfs_file_read(&lfs, &file, buffer, size) => 0;
+
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+
+echo "--- Truncate and write ---"
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "baldywrite",
+            LFS_O_WRONLY | LFS_O_CREAT) => 0;
+
+    strcpy((char*)buffer, "hair");
+    lfs_size_t size = strlen((char*)buffer);
+    for (lfs_off_t j = 0; j < $LARGESIZE; j += size) {
+        lfs_file_write(&lfs, &file, buffer, size) => size;
+    }
+    lfs_file_size(&lfs, &file) => $LARGESIZE;
+
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "baldywrite", LFS_O_RDWR) => 0;
+    lfs_file_size(&lfs, &file) => $LARGESIZE;
+
+    lfs_file_truncate(&lfs, &file, $MEDIUMSIZE) => 0;
+    lfs_file_size(&lfs, &file) => $MEDIUMSIZE;
+
+    strcpy((char*)buffer, "bald");
+    lfs_size_t size = strlen((char*)buffer);
+    for (lfs_off_t j = 0; j < $MEDIUMSIZE; j += size) {
+        lfs_file_write(&lfs, &file, buffer, size) => size;
+    }
+    lfs_file_size(&lfs, &file) => $MEDIUMSIZE;
+
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+scripts/test.py << TEST
+    lfs_mount(&lfs, &cfg) => 0;
+    lfs_file_open(&lfs, &file, "baldywrite", LFS_O_RDONLY) => 0;
+    lfs_file_size(&lfs, &file) => $MEDIUMSIZE;
+
+    lfs_size_t size = strlen("bald");
+    for (lfs_off_t j = 0; j < $MEDIUMSIZE; j += size) {
+        lfs_file_read(&lfs, &file, buffer, size) => size;
+        memcmp(buffer, "bald", size) => 0;
+    }
+    lfs_file_read(&lfs, &file, buffer, size) => 0;
+
+    lfs_file_close(&lfs, &file) => 0;
+    lfs_unmount(&lfs) => 0;
+TEST
+
+# More aggressive general truncation tests
 truncate_test() {
 STARTSIZES="$1"
 STARTSEEKS="$2"
 HOTSIZES="$3"
 COLDSIZES="$4"
-tests/test.py << TEST
-    static const lfs2_off_t startsizes[] = {$STARTSIZES};
-    static const lfs2_off_t startseeks[] = {$STARTSEEKS};
-    static const lfs2_off_t hotsizes[]   = {$HOTSIZES};
+scripts/test.py << TEST
+    static const lfs_off_t startsizes[] = {$STARTSIZES};
+    static const lfs_off_t startseeks[] = {$STARTSEEKS};
+    static const lfs_off_t hotsizes[]   = {$HOTSIZES};
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     for (unsigned i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) {
-        sprintf((char*)buffer, "hairyhead%d", i);
-        lfs2_file_open(&lfs2, &file[0], (const char*)buffer,
-                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+        sprintf(path, "hairyhead%d", i);
+        lfs_file_open(&lfs, &file, path,
+                LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0;
 
         strcpy((char*)buffer, "hair");
-        size = strlen((char*)buffer);
-        for (lfs2_off_t j = 0; j < startsizes[i]; j += size) {
-            lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
+        lfs_size_t size = strlen((char*)buffer);
+        for (lfs_off_t j = 0; j < startsizes[i]; j += size) {
+            lfs_file_write(&lfs, &file, buffer, size) => size;
         }
-        lfs2_file_size(&lfs2, &file[0]) => startsizes[i];
+        lfs_file_size(&lfs, &file) => startsizes[i];
 
         if (startseeks[i] != startsizes[i]) {
-            lfs2_file_seek(&lfs2, &file[0],
-                    startseeks[i], LFS2_SEEK_SET) => startseeks[i];
+            lfs_file_seek(&lfs, &file,
+                    startseeks[i], LFS_SEEK_SET) => startseeks[i];
         }
 
-        lfs2_file_truncate(&lfs2, &file[0], hotsizes[i]) => 0;
-        lfs2_file_size(&lfs2, &file[0]) => hotsizes[i];
+        lfs_file_truncate(&lfs, &file, hotsizes[i]) => 0;
+        lfs_file_size(&lfs, &file) => hotsizes[i];
 
-        lfs2_file_close(&lfs2, &file[0]) => 0;
+        lfs_file_close(&lfs, &file) => 0;
     }
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    static const lfs2_off_t startsizes[] = {$STARTSIZES};
-    static const lfs2_off_t hotsizes[]   = {$HOTSIZES};
-    static const lfs2_off_t coldsizes[]  = {$COLDSIZES};
+scripts/test.py << TEST
+    static const lfs_off_t startsizes[] = {$STARTSIZES};
+    static const lfs_off_t hotsizes[]   = {$HOTSIZES};
+    static const lfs_off_t coldsizes[]  = {$COLDSIZES};
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     for (unsigned i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) {
-        sprintf((char*)buffer, "hairyhead%d", i);
-        lfs2_file_open(&lfs2, &file[0], (const char*)buffer, LFS2_O_RDWR) => 0;
-        lfs2_file_size(&lfs2, &file[0]) => hotsizes[i];
+        sprintf(path, "hairyhead%d", i);
+        lfs_file_open(&lfs, &file, path, LFS_O_RDWR) => 0;
+        lfs_file_size(&lfs, &file) => hotsizes[i];
 
-        size = strlen("hair");
-        lfs2_off_t j = 0;
+        lfs_size_t size = strlen("hair");
+        lfs_off_t j = 0;
         for (; j < startsizes[i] && j < hotsizes[i]; j += size) {
-            lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+            lfs_file_read(&lfs, &file, buffer, size) => size;
             memcmp(buffer, "hair", size) => 0;
         }
 
         for (; j < hotsizes[i]; j += size) {
-            lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+            lfs_file_read(&lfs, &file, buffer, size) => size;
             memcmp(buffer, "\0\0\0\0", size) => 0;
         }
 
-        lfs2_file_truncate(&lfs2, &file[0], coldsizes[i]) => 0;
-        lfs2_file_size(&lfs2, &file[0]) => coldsizes[i];
+        lfs_file_truncate(&lfs, &file, coldsizes[i]) => 0;
+        lfs_file_size(&lfs, &file) => coldsizes[i];
 
-        lfs2_file_close(&lfs2, &file[0]) => 0;
+        lfs_file_close(&lfs, &file) => 0;
     }
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
-tests/test.py << TEST
-    static const lfs2_off_t startsizes[] = {$STARTSIZES};
-    static const lfs2_off_t hotsizes[]   = {$HOTSIZES};
-    static const lfs2_off_t coldsizes[]  = {$COLDSIZES};
+scripts/test.py << TEST
+    static const lfs_off_t startsizes[] = {$STARTSIZES};
+    static const lfs_off_t hotsizes[]   = {$HOTSIZES};
+    static const lfs_off_t coldsizes[]  = {$COLDSIZES};
 
-    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs_mount(&lfs, &cfg) => 0;
 
     for (unsigned i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) {
-        sprintf((char*)buffer, "hairyhead%d", i);
-        lfs2_file_open(&lfs2, &file[0], (const char*)buffer, LFS2_O_RDONLY) => 0;
-        lfs2_file_size(&lfs2, &file[0]) => coldsizes[i];
+        sprintf(path, "hairyhead%d", i);
+        lfs_file_open(&lfs, &file, path, LFS_O_RDONLY) => 0;
+        lfs_file_size(&lfs, &file) => coldsizes[i];
 
-        size = strlen("hair");
-        lfs2_off_t j = 0;
+        lfs_size_t size = strlen("hair");
+        lfs_off_t j = 0;
         for (; j < startsizes[i] && j < hotsizes[i] && j < coldsizes[i];
                 j += size) {
-            lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+            lfs_file_read(&lfs, &file, buffer, size) => size;
             memcmp(buffer, "hair", size) => 0;
         }
 
         for (; j < coldsizes[i]; j += size) {
-            lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
+            lfs_file_read(&lfs, &file, buffer, size) => size;
             memcmp(buffer, "\0\0\0\0", size) => 0;
         }
 
-        lfs2_file_close(&lfs2, &file[0]) => 0;
+        lfs_file_close(&lfs, &file) => 0;
     }
 
-    lfs2_unmount(&lfs2) => 0;
+    lfs_unmount(&lfs) => 0;
 TEST
 }
 
@@ -154,5 +301,4 @@ truncate_test \
     "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE" \
     "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE"
 
-echo "--- Results ---"
-tests/stats.py
+scripts/results.py