46 changed files with 522 additions and 1286 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,2 +0,0 @@
-github: [icculus]
-patreon: icculus
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -1,30 +0,0 @@
-name: Build
-
-on: [push, pull_request]
-
-jobs:
-  Build:
-    name: ${{ matrix.platform.name }}
-    runs-on: ${{ matrix.platform.os }}
-    strategy:
-      matrix:
-        platform:  # !!! FIXME: figure out an efficient way to get SDL2 on the Windows/Mac bots.
-        - { name: Linux,   os: ubuntu-20.04, flags: -GNinja }
-        - { name: MinGW,   os: windows-latest, flags: -GNinja -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_SYSTEM_NAME=Windows }
-        - { name: Windows, os: windows-latest }
-        - { name: MacOS,   os: macos-latest }
-    steps:
-    - name: Setup Linux dependencies
-      if: runner.os == 'Linux'
-      run: |
-        sudo apt-get update
-        sudo apt-get install ninja-build
-    - name: Setup MinGW dependencies
-      if: contains(matrix.platform.name, 'MinGW')
-      run:  choco install ninja
-    - name: Get PhysicsFS sources
-      uses: actions/checkout@v2
-    - name: Configure CMake
-      run: cmake -B build ${{ matrix.platform.flags }}
-    - name: Build
-      run: cmake --build build/
--- a/.github/workflows/os2.yml
+++ b/.github/workflows/os2.yml
@ -1,20 +0,0 @@
-name: Build (OS/2)
-
-on: [push, pull_request]
-
-jobs:
-  os2:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: open-watcom/setup-watcom@v0
-      - name: Build physfs.dll
-        run: |
-          cd src
-          wmake -f Makefile.os2
-          cd ..
-      - name: distclean
-        run: |
-          cd src
-          wmake -f Makefile.os2 distclean
-          cd ..
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
+syntax:glob
 cmake-build
-
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -9,29 +9,27 @@
 #  compile, using preprocessor checks for platform-specific bits instead of
 #  testing in here.

-set(PHYSFS_VERSION 3.3.0)
+cmake_minimum_required(VERSION 2.8.4)

-cmake_minimum_required(VERSION 3.0)
-
-project(PhysicsFS VERSION ${PHYSFS_VERSION} LANGUAGES C )
-
-include(GNUInstallDirs)
+project(PhysicsFS)
+set(PHYSFS_VERSION 3.0.0)

 # Increment this if/when we break backwards compatibility.
 set(PHYSFS_SOVERSION 1)

-set(PHYSFS_M_SRCS)
-set(PHYSFS_CPP_SRCS)
-
 # I hate that they define "WIN32" ... we're about to move to Win64...I hope!
+if(WIN32 AND NOT WINDOWS)
+    set(WINDOWS TRUE)
+endif()
+
+include_directories(./src)

 if(APPLE)
    set(OTHER_LDFLAGS ${OTHER_LDFLAGS} "-framework IOKit -framework Foundation")
-    list(APPEND PHYSFS_M_SRCS src/physfs_platform_apple.m)
+    set(PHYSFS_M_SRCS src/physfs_platform_apple.m)
 endif()

-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-    add_compile_options(-Wall)
+if(CMAKE_COMPILER_IS_GNUCC)
    # Don't use -rpath.
    set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
 endif()
@ -44,10 +42,10 @@ endif()
 if(HAIKU)
    # We add this explicitly, since we don't want CMake to think this
    #  is a C++ project unless we're on Haiku.
-    list(APPEND PHYSFS_CPP_SRCS src/physfs_platform_haiku.cpp)
+    set(PHYSFS_CPP_SRCS src/physfs_platform_haiku.cpp)
    find_library(BE_LIBRARY be)
    find_library(ROOT_LIBRARY root)
-    list(APPEND OPTIONAL_LIBRARY_LIBS ${BE_LIBRARY} ${ROOT_LIBRARY})
+    set(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${BE_LIBRARY} ${ROOT_LIBRARY})
 endif()

 if(CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@ -55,20 +53,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" OR CMAKE_SYSTEM_NAME STREQUAL "Wind
 endif()

 if(WINRT)
-    list(APPEND PHYSFS_CPP_SRCS src/physfs_platform_winrt.cpp)
+    set(PHYSFS_CPP_SRCS src/physfs_platform_winrt.cpp)
 endif()

-if(UNIX AND NOT WIN32 AND NOT APPLE)  # (MingW and such might be UNIX _and_ WINDOWS!)
+if(UNIX AND NOT WINDOWS AND NOT APPLE)  # (MingW and such might be UNIX _and_ WINDOWS!)
    find_library(PTHREAD_LIBRARY pthread)
    if(PTHREAD_LIBRARY)
        set(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${PTHREAD_LIBRARY})
    endif()
 endif()

-if(PHYSFS_CPP_SRCS)
-    enable_language(CXX)
-endif()
-
 # Almost everything is "compiled" here, but things that don't apply to the
 #  build are #ifdef'd out. This is to make it easy to embed PhysicsFS into
 #  another project or bring up a new build system: just compile all the source
@ -82,7 +76,6 @@ set(PHYSFS_SRCS
    src/physfs_platform_windows.c
    src/physfs_platform_os2.c
    src/physfs_platform_qnx.c
-    src/physfs_platform_android.c
    src/physfs_archiver_dir.c
    src/physfs_archiver_unpacked.c
    src/physfs_archiver_grp.c
@ -158,8 +151,6 @@ endif()
 option(PHYSFS_BUILD_STATIC "Build static library" TRUE)
 if(PHYSFS_BUILD_STATIC)
    add_library(physfs-static STATIC ${PHYSFS_SRCS})
-    add_library(PhysFS::PhysFS-static ALIAS physfs-static)
-    set_target_properties(physfs-static PROPERTIES EXPORT_NAME PhysFS-static)
    # Don't rename this on Windows, since DLLs will also produce an import
    #  library named "physfs.lib" which would conflict; Unix tend to like the
    #  same library name with a different extension for static libs, but
@ -172,34 +163,23 @@ if(PHYSFS_BUILD_STATIC)
 		set_target_properties(physfs-static PROPERTIES VS_WINRT_COMPONENT True)
        set_target_properties(physfs-static PROPERTIES STATIC_LIBRARY_FLAGS "/ignore:4264")
    endif()
-    if(WIN32 OR WINRT OR OS2)
-        # no dll exports from the static library
-        target_compile_definitions(physfs-static PRIVATE "PHYSFS_STATIC")
-    endif()
-    target_include_directories(physfs-static PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>")
-    target_link_libraries(physfs-static PRIVATE ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS})
+
    set(PHYSFS_LIB_TARGET physfs-static)
-    list(APPEND PHYSFS_INSTALL_TARGETS "physfs-static")
+    set(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs-static")
 endif()

 option(PHYSFS_BUILD_SHARED "Build shared library" TRUE)
 if(PHYSFS_BUILD_SHARED)
    add_library(physfs SHARED ${PHYSFS_SRCS})
-    add_library(PhysFS::PhysFS ALIAS physfs)
    set_target_properties(physfs PROPERTIES MACOSX_RPATH 1)
    set_target_properties(physfs PROPERTIES VERSION ${PHYSFS_VERSION})
    set_target_properties(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION})
-    set_target_properties(physfs PROPERTIES EXPORT_NAME PhysFS)
    if(WINRT)
 		set_target_properties(physfs PROPERTIES VS_WINRT_COMPONENT True)
    endif()
-    if(OS2) # OS/2 does not support a DLL name longer than 8 characters.
-        set_target_properties(physfs PROPERTIES OUTPUT_NAME "physfs")
-    endif()
-    target_include_directories(physfs PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>")
-    target_link_libraries(physfs PRIVATE ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS})
+    target_link_libraries(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS})
    set(PHYSFS_LIB_TARGET physfs)
-    list(APPEND PHYSFS_INSTALL_TARGETS "physfs")
+    set(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs")
 endif()

 if(NOT PHYSFS_BUILD_SHARED AND NOT PHYSFS_BUILD_STATIC)
@ -207,7 +187,7 @@ if(NOT PHYSFS_BUILD_SHARED AND NOT PHYSFS_BUILD_STATIC)
 endif()

 # CMake FAQ says I need this...
-if(PHYSFS_BUILD_SHARED AND PHYSFS_BUILD_STATIC AND NOT WIN32)
+if(PHYSFS_BUILD_SHARED AND PHYSFS_BUILD_STATIC AND NOT WINDOWS)
    set_target_properties(physfs PROPERTIES CLEAN_DIRECT_OUTPUT 1)
    set_target_properties(physfs-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 endif()
@ -219,101 +199,76 @@ if(PHYSFS_BUILD_TEST)
    find_path(HISTORY_H readline/history.h)
    if(READLINE_H AND HISTORY_H)
        find_library(CURSES_LIBRARY NAMES curses ncurses)
-        if(CURSES_LIBRARY)
-            set(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY})
-            find_library(READLINE_LIBRARY readline)
-            if(READLINE_LIBRARY)
-                set(HAVE_SYSTEM_READLINE TRUE)
-                list(APPEND TEST_PHYSFS_LIBS ${READLINE_LIBRARY} ${CURSES_LIBRARY})
-                include_directories(SYSTEM ${READLINE_H} ${HISTORY_H})
-                add_definitions(-DPHYSFS_HAVE_READLINE=1)
-            endif()
+        set(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY})
+        find_library(READLINE_LIBRARY readline)
+        if(READLINE_LIBRARY)
+            set(HAVE_SYSTEM_READLINE TRUE)
+            set(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY} ${CURSES_LIBRARY})
+            include_directories(SYSTEM ${READLINE_H} ${HISTORY_H})
+            add_definitions(-DPHYSFS_HAVE_READLINE=1)
        endif()
    endif()
    add_executable(test_physfs test/test_physfs.c)
-    target_link_libraries(test_physfs PRIVATE ${PHYSFS_LIB_TARGET} ${TEST_PHYSFS_LIBS} ${OTHER_LDFLAGS})
-    list(APPEND PHYSFS_INSTALL_TARGETS test_physfs)
+    target_link_libraries(test_physfs ${PHYSFS_LIB_TARGET} ${TEST_PHYSFS_LIBS} ${OTHER_LDFLAGS})
+    set(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";test_physfs")
 endif()

-option(PHYSFS_DISABLE_INSTALL "Disable installing PhysFS" OFF)
-if(NOT PHYSFS_DISABLE_INSTALL)
+install(TARGETS ${PHYSFS_INSTALL_TARGETS}
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib${LIB_SUFFIX}
+        ARCHIVE DESTINATION lib${LIB_SUFFIX})
+install(FILES src/physfs.h DESTINATION include)

-    install(TARGETS ${PHYSFS_INSTALL_TARGETS} EXPORT PhysFSExport
-            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-    install(FILES src/physfs.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-    install(EXPORT PhysFSExport
-            DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/PhysFS"
-            FILE PhysFSConfig.cmake
-            NAMESPACE PhysFS::
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+    set(PHYSFS_OUTPUT_DOXYFILE "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
+    configure_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile"
+        "${PHYSFS_OUTPUT_DOXYFILE}"
+        COPYONLY
    )
+    file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "\n\n# Below auto-generated by cmake...\n\n")
+    file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "PROJECT_NUMBER = \"${PHYSFS_VERSION}\"\n")
+    file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "OUTPUT_DIRECTORY = \"${CMAKE_CURRENT_BINARY_DIR}/docs\"\n")
+    file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "\n# End auto-generated section.\n\n")

-    if(NOT MSVC)
-        configure_file(
-            "extras/physfs.pc.in"
-            "extras/physfs.pc"
-            @ONLY
-        )
-
-        install(
-            FILES "${CMAKE_CURRENT_BINARY_DIR}/extras/physfs.pc"
-            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
-        )
-    endif()
-endif()
-
-option(PHYSFS_BUILD_DOCS "Build doxygen based documentation" TRUE)
-if(PHYSFS_BUILD_DOCS)
-    find_package(Doxygen)
-    if(DOXYGEN_FOUND)
-        set(PHYSFS_OUTPUT_DOXYFILE "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
-        configure_file(
-            "${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile"
-            "${PHYSFS_OUTPUT_DOXYFILE}"
-            COPYONLY
-        )
-        file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "\n\n# Below auto-generated by cmake...\n\n")
-        file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "PROJECT_NUMBER = \"${PHYSFS_VERSION}\"\n")
-        file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "OUTPUT_DIRECTORY = \"${CMAKE_CURRENT_BINARY_DIR}/docs\"\n")
-        file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "\n# End auto-generated section.\n\n")
-
-        set(PHYSFS_TARGETNAME_DOCS "docs" CACHE STRING "Name of 'docs' build target")
-
-        add_custom_target(
-            ${PHYSFS_TARGETNAME_DOCS}
-            ${DOXYGEN_EXECUTABLE} "${PHYSFS_OUTPUT_DOXYFILE}"
-            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-            COMMENT "Building documentation in 'docs' directory..."
-        )
-
-    else()
-        message(STATUS "Doxygen not found. You won't be able to build documentation.")
-    endif()
+    add_custom_target(
+        docs
+        ${DOXYGEN_EXECUTABLE} "${PHYSFS_OUTPUT_DOXYFILE}"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        COMMENT "Building documentation in 'docs' directory..."
+    )
+else()
+    message(STATUS "Doxygen not found. You won't be able to build documentation.")
 endif()

 if(UNIX)
-    set(PHYSFS_TARBALL "${CMAKE_CURRENT_SOURCE_DIR}/../physfs-${PHYSFS_VERSION}.tar.gz")
-
-    set(PHYSFS_TARGETNAME_DIST "dist" CACHE STRING "Name of 'dist' build target")
+    set(PHYSFS_TARBALL "${CMAKE_CURRENT_SOURCE_DIR}/../physfs-${PHYSFS_VERSION}.tar.bz2")
    add_custom_target(
-        ${PHYSFS_TARGETNAME_DIST}
-        git archive --prefix="physfs-${PHYSFS_VERSION}/" --output="${PHYSFS_TARBALL}" HEAD
+        dist
+        hg archive -t tbz2 "${PHYSFS_TARBALL}"
        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
        COMMENT "Building source tarball '${PHYSFS_TARBALL}'..."
    )
-
-    set(PHYSFS_TARGETNAME_UNINSTALL "uninstall" CACHE STRING "Name of 'uninstall' build target")
    add_custom_target(
-        ${PHYSFS_TARGETNAME_UNINSTALL}
+        uninstall
        "${CMAKE_CURRENT_SOURCE_DIR}/extras/uninstall.sh"
        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
        COMMENT "Uninstall the project..."
    )
 endif()

+if(NOT MSVC)
+    configure_file(
+        "extras/physfs.pc.in"
+        "extras/physfs.pc"
+        @ONLY
+    )
+    install(
+        FILES "${CMAKE_CURRENT_BINARY_DIR}/extras/physfs.pc"
+        DESTINATION "lib${LIB_SUFFIX}/pkgconfig"
+    )
+endif()

 macro(message_bool_option _NAME _VALUE)
    if(${_VALUE})
@ -337,9 +292,9 @@ message_bool_option("ISO9660 support" PHYSFS_ARCHIVE_ISO9660)
 message_bool_option("Build static library" PHYSFS_BUILD_STATIC)
 message_bool_option("Build shared library" PHYSFS_BUILD_SHARED)
 message_bool_option("Build stdio test program" PHYSFS_BUILD_TEST)
-message_bool_option("Build Doxygen documentation" PHYSFS_BUILD_DOCS)
 if(PHYSFS_BUILD_TEST)
    message_bool_option("  Use readline in test program" HAVE_SYSTEM_READLINE)
 endif()

 # end of CMakeLists.txt ...
+
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,17 +1,23 @@
-Copyright (c) 2001-2022 Ryan C. Gordon <icculus@icculus.org> and others.

-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+   Copyright (c) 2001-2017 Ryan C. Gordon and others.

-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+   This software is provided 'as-is', without any express or implied warranty.
+   In no event will the authors be held liable for any damages arising from
+   the use of this software.

-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
+   Permission is granted to anyone to use this software for any purpose,
+   including commercial applications, and to alter it and redistribute it
+   freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software in a
+   product, an acknowledgment in the product documentation would be
   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
+
+   2. Altered source versions must be plainly marked as such, and must not be
   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+
+   3. This notice may not be removed or altered from any source distribution.
+
+       Ryan C. Gordon <icculus@icculus.org>
+
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@ -6,6 +6,6 @@ The changelog is no longer maintained by hand. It made sense to have a single
 If you want a list of changes, updated in real time, just point your web
 browser here:

-    https://github.com/icculus/physfs/commits/
+    https://hg.icculus.org/icculus/physfs/


--- a/docs/CREDITS.txt
+++ b/docs/CREDITS.txt
@ -164,9 +164,6 @@ CMake fixes:
 Bug fixes,
    Rémi Verschelde

-Bug fixes:
-    Rob Loach
-
 Other stuff:
    Your name here! Patches go to icculus@icculus.org ...

--- a/docs/INSTALL.txt
+++ b/docs/INSTALL.txt
@ -37,7 +37,7 @@ If this all worked for your specific project, you can stop reading now.



-Unix:
+UNIX:

 You will need CMake (https://www.cmake.org/) 2.4 or later installed.

--- a/docs/README-API-documentation.txt
+++ b/docs/README-API-documentation.txt
@ -1,18 +0,0 @@
-The API documentation is readable in a few ways:
-
- Read physfs.h; it's _heavily_ documented and the primary source of reference
-  documentation for the library.
- Run Doxygen over the header, which produces nicer-to-browse documentation in
-  HTML, LaTeX, manpage, etc formats. This is done for you if Doxygen is
-  installed and you build the "docs" target in whatever project files CMake
-  generated for you.
- Too much trouble? We generated the HTML reference for you, online here:
-
-      https://icculus.org/physfs/docs/
-
- We would love well-written tutorials for the latest version of PhysicsFS!
-  If you write one, we would love to list it here. Drop me a line about it:
-  icculus@icculus.org ... Thanks!
-
--ryan.
-
--- a/extras/buildbot-checker.sh
+++ b/extras/buildbot-checker.sh
@ -1,14 +1,53 @@
 #!/bin/bash

-# This is a script used by some Buildbot workers to push the project
+# This is a script used by some Buildbot buildslaves to push the project
 #  through Clang's static analyzer and prepare the output to be uploaded
 #  back to the buildmaster. You might find it useful too.

 # Install Clang (you already have it on Mac OS X, apt-get install clang
-#  on Ubuntu, etc), Make sure "scan-build" is in your $PATH.
+#  on Ubuntu, etc),
+# or download checker at http://clang-analyzer.llvm.org/ and unpack it in
+#  /usr/local ... update CHECKERDIR as appropriate.

 FINALDIR="$1"

+CHECKERDIR="/usr/local/checker-279"
+if [ ! -d "$CHECKERDIR" ]; then
+    echo "$CHECKERDIR not found. Trying /usr/share/clang ..." 1>&2
+    CHECKERDIR="/usr/share/clang/scan-build"
+fi
+
+if [ ! -d "$CHECKERDIR" ]; then
+    echo "$CHECKERDIR not found. Giving up." 1>&2
+    exit 1
+fi
+
+if [ -z "$MAKE" ]; then
+    OSTYPE=`uname -s`
+    if [ "$OSTYPE" == "Linux" ]; then
+        NCPU=`cat /proc/cpuinfo |grep vendor_id |wc -l`
+        let NCPU=$NCPU+1
+    elif [ "$OSTYPE" = "Darwin" ]; then
+        NCPU=`sysctl -n hw.ncpu`
+    elif [ "$OSTYPE" = "SunOS" ]; then
+        NCPU=`/usr/sbin/psrinfo |wc -l |sed -e 's/^ *//g;s/ *$//g'`
+    else
+        NCPU=1
+    fi
+
+    if [ -z "$NCPU" ]; then
+        NCPU=1
+    elif [ "$NCPU" = "0" ]; then
+        NCPU=1
+    fi
+
+    MAKE="make -j$NCPU"
+fi
+
+echo "\$MAKE is '$MAKE'"
+MAKECMD="$MAKE"
+unset MAKE  # prevent warnings about jobserver mode.
+
 set -x
 set -e

@ -27,10 +66,13 @@ cd checker-buildbot
 # The -Wno-liblto is new since our checker-279 upgrade, I think; checker otherwise warns "libLTO.dylib relative to clang installed dir not found"

 # You might want to do this for CMake-backed builds instead...
-scan-build -o analysis cmake -G Ninja -Wno-dev -DPHYSFS_BUILD_SHARED=False -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wno-deprecated-declarations" -DCMAKE_EXE_LINKER_FLAGS="-Wno-liblto" ..
+PATH="$CHECKERDIR/bin:$PATH" scan-build -o analysis cmake -Wno-dev -DPHYSFS_BUILD_SHARED=False -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wno-deprecated-declarations" -DCMAKE_EXE_LINKER_FLAGS="-Wno-liblto" ..
+
+# ...or run configure without the scan-build wrapper...
+#CC="$CHECKERDIR/libexec/ccc-analyzer" CFLAGS="-O0 -Wno-deprecated-declarations" LDFLAGS="-Wno-liblto" ../configure --enable-assertions=enabled

 rm -rf analysis
-scan-build -o analysis cmake --build . --config Debug
+PATH="$CHECKERDIR/bin:$PATH" scan-build -o analysis $MAKECMD

 if [ `ls -A analysis |wc -l` == 0 ] ; then
    mkdir analysis/zarro
--- a/extras/buildbot-emscripten.sh
+++ b/extras/buildbot-emscripten.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 if [ -z "$SDKDIR" ]; then
-    SDKDIR="/emsdk"
+    SDKDIR="/emsdk_portable"
 fi

 ENVSCRIPT="$SDKDIR/emsdk_env.sh"
@ -20,6 +20,32 @@ cd `dirname "$0"`
 cd ..
 PHYSFSBASE=`pwd`

+if [ -z "$MAKE" ]; then
+    OSTYPE=`uname -s`
+    if [ "$OSTYPE" == "Linux" ]; then
+        NCPU=`cat /proc/cpuinfo |grep vendor_id |wc -l`
+        let NCPU=$NCPU+1
+    elif [ "$OSTYPE" = "Darwin" ]; then
+        NCPU=`sysctl -n hw.ncpu`
+    elif [ "$OSTYPE" = "SunOS" ]; then
+        NCPU=`/usr/sbin/psrinfo |wc -l |sed -e 's/^ *//g;s/ *$//g'`
+    else
+        NCPU=1
+    fi
+
+    if [ -z "$NCPU" ]; then
+        NCPU=1
+    elif [ "$NCPU" = "0" ]; then
+        NCPU=1
+    fi
+
+    MAKE="make -j$NCPU"
+fi
+
+echo "\$MAKE is '$MAKE'"
+MAKECMD="$MAKE"
+unset MAKE  # prevent warnings about jobserver mode.
+
 echo "Setting up Emscripten SDK environment..."
 source "$ENVSCRIPT"

@ -30,10 +56,10 @@ mkdir buildbot
 cd buildbot

 echo "Configuring..."
-emcmake cmake -G "Ninja" -DPHYSFS_BUILD_SHARED=False -DCMAKE_BUILD_TYPE=MinSizeRel .. || exit $?
+emcmake cmake -G "Unix Makefiles" -DPHYSFS_BUILD_SHARED=False -DCMAKE_BUILD_TYPE=MinSizeRel .. || exit $?

 echo "Building..."
-emmake cmake --build . --config MinSizeRel || exit $?
+emmake $MAKECMD || exit $?

 set -e
 rm -rf "$TARBALL" physfs-emscripten
--- a/extras/buildbot-raspberrypi.sh
+++ b/extras/buildbot-raspberrypi.sh
@ -15,7 +15,24 @@ if [ -z $1 ]; then
    TARBALL=physfs-raspberrypi.tar.xz
 fi

-BUILDBOTDIR="buildbot"
+OSTYPE=`uname -s`
+if [ "$OSTYPE" != "Linux" ]; then
+    # !!! FIXME
+    echo "This only works on x86 or x64-64 Linux at the moment." 1>&2
+    exit 1
+fi
+
+if [ "x$MAKE" == "x" ]; then
+    NCPU=`cat /proc/cpuinfo |grep vendor_id |wc -l`
+    let NCPU=$NCPU+1
+    MAKE="make -j$NCPU"
+fi
+
+echo "\$MAKE is '$MAKE'"
+MAKECMD="$MAKE"
+unset MAKE  # prevent warnings about jobserver mode.
+
+BUILDBOTDIR="raspberrypi-buildbot"
 PARENTDIR="$PWD"

 set -e
@ -25,9 +42,8 @@ rm -rf $BUILDBOTDIR
 mkdir -p $BUILDBOTDIR
 pushd $BUILDBOTDIR

-# the '-G "Ninja"' can be '-G "Unix Makefiles"' if you prefer to use GNU Make.
 SYSROOT="/opt/rpi-sysroot"
-cmake -G "Ninja" \
+cmake -G "Unix Makefiles" \
    -DCMAKE_C_COMPILER="/opt/rpi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-gcc" \
    -DCMAKE_BUILD_TYPE=MinSizeRel \
    -DCMAKE_SYSROOT="$SYSROOT" \
@ -39,7 +55,7 @@ cmake -G "Ninja" \
    -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
    ..

-cmake --build . --config MinSizeRel
+$MAKECMD

 rm -rf "$TARBALL" physfs-raspberrypi
 mkdir -p physfs-raspberrypi
--- a/extras/globbing.c
+++ b/extras/globbing.c
@ -208,13 +208,13 @@ int main(int argc, char **argv)

    if (!PHYSFS_init(argv[0]))
    {
-        fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getLastError());
        return 1;
    } /* if */

    if (!PHYSFS_addToSearchPath(".", 1))
    {
-        fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getLastError());
        PHYSFS_deinit();
        return 1;
    } /* if */
--- a/extras/ignorecase.c
+++ b/extras/ignorecase.c
@ -50,22 +50,18 @@ static int locateOneElement(char *buf)
        ptr++;  /* point past dirsep to entry itself. */
    } /* else */

-    if (rc != NULL)
+    for (i = rc; *i != NULL; i++)
    {
-        for (i = rc; *i != NULL; i++)
+        if (PHYSFS_utf8stricmp(*i, ptr) == 0)
        {
-            if (PHYSFS_utf8stricmp(*i, ptr) == 0)
-            {
-                strcpy(ptr, *i); /* found a match. Overwrite with this case. */
-                PHYSFS_freeList(rc);
-                return 1;
-            } /* if */
-        } /* for */
-
-        PHYSFS_freeList(rc);
-    } /* if */
+            strcpy(ptr, *i); /* found a match. Overwrite with this case. */
+            PHYSFS_freeList(rc);
+            return 1;
+        } /* if */
+    } /* for */

    /* no match at all... */
+    PHYSFS_freeList(rc);
    return 0;
 } /* locateOneElement */

@ -105,34 +101,34 @@ int main(int argc, char **argv)

    if (!PHYSFS_init(argv[0]))
    {
-        fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getLastError());
        return 1;
    } /* if */

    if (!PHYSFS_addToSearchPath(".", 1))
    {
-        fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getLastError());
        PHYSFS_deinit();
        return 1;
    } /* if */

    if (!PHYSFS_setWriteDir("."))
    {
-        fprintf(stderr, "PHYSFS_setWriteDir(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        fprintf(stderr, "PHYSFS_setWriteDir(): %s\n", PHYSFS_getLastError());
        PHYSFS_deinit();
        return 1;
    } /* if */

    if (!PHYSFS_mkdir("/a/b/c"))
    {
-        fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getLastError());
        PHYSFS_deinit();
        return 1;
    } /* if */

    if (!PHYSFS_mkdir("/a/b/C"))
    {
-        fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getLastError());
        PHYSFS_deinit();
        return 1;
    } /* if */
@ -141,7 +137,7 @@ int main(int argc, char **argv)
    PHYSFS_close(f);
    if (f == NULL)
    {
-        fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getLastError());
        PHYSFS_deinit();
        return 1;
    } /* if */
@ -150,7 +146,7 @@ int main(int argc, char **argv)
    PHYSFS_close(f);
    if (f == NULL)
    {
-        fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getLastError());
        PHYSFS_deinit();
        return 1;
    } /* if */
--- a/extras/physfs.pc.in
+++ b/extras/physfs.pc.in
@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include

 Name: PhysicsFS
 Description: PhysicsFS is a library to provide abstract access to various archives.
--- a/extras/physfsrwops.c
+++ b/extras/physfsrwops.c
@ -32,16 +32,10 @@
 #endif

 #if !TARGET_SDL2
-#ifndef RW_SEEK_SET
 #define RW_SEEK_SET SEEK_SET
-#endif
-#ifndef RW_SEEK_CUR
 #define RW_SEEK_CUR SEEK_CUR
-#endif
-#ifndef RW_SEEK_END
 #define RW_SEEK_END SEEK_END
 #endif
-#endif

 #if TARGET_SDL2
 static Sint64 SDLCALL physfsrwops_size(struct SDL_RWops *rw)
@ -70,7 +64,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
        if (current == -1)
        {
            SDL_SetError("Can't find position in file: %s",
-                          PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+                          PHYSFS_getLastError());
            return -1;
        } /* if */

@ -91,7 +85,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
        const PHYSFS_sint64 len = PHYSFS_fileLength(handle);
        if (len == -1)
        {
-            SDL_SetError("Can't find end of file: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+            SDL_SetError("Can't find end of file: %s", PHYSFS_getLastError());
            return -1;
        } /* if */

@ -112,7 +106,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
    
    if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos))
    {
-        SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
        return -1;
    } /* if */

@ -138,7 +132,7 @@ static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum)
    {
        if (!PHYSFS_eof(handle)) /* not EOF? Must be an error. */
        {
-            SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+            SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());

            #if TARGET_SDL2
            return 0;
@ -167,7 +161,7 @@ static int physfsrwops_write(SDL_RWops *rw, const void *ptr, int size, int num)
    const PHYSFS_uint64 writelen = (PHYSFS_uint64) (num * size);
    const PHYSFS_sint64 rc = PHYSFS_writeBytes(handle, ptr, writelen);
    if (rc != ((PHYSFS_sint64) writelen))
-        SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());

    #if TARGET_SDL2
    return (size_t) rc;
@ -182,7 +176,7 @@ static int physfsrwops_close(SDL_RWops *rw)
    PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1;
    if (!PHYSFS_close(handle))
    {
-        SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
        return -1;
    } /* if */

@ -196,7 +190,7 @@ static SDL_RWops *create_rwops(PHYSFS_File *handle)
    SDL_RWops *retval = NULL;

    if (handle == NULL)
-        SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
    else
    {
        retval = SDL_AllocRW();
--- a/extras/physfsunpack.c
+++ b/extras/physfsunpack.c
@ -28,7 +28,7 @@ static void modTimeToStr(PHYSFS_sint64 modtime, char *modstr, size_t strsize)
 static void fail(const char *what, const char *why)
 {
    if (why == NULL)
-        why = PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode());
+        why = PHYSFS_getLastError();
    fprintf(stderr, "%s failed: %s\n", what, why);
    failure = 1;
 } /* fail */
@ -150,21 +150,21 @@ int main(int argc, char **argv)

    if (!PHYSFS_init(argv[0]))
    {
-        fprintf(stderr, "PHYSFS_init() failed: %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        fprintf(stderr, "PHYSFS_init() failed: %s\n", PHYSFS_getLastError());
        return 2;
    } /* if */

    if (!PHYSFS_setWriteDir(argv[2]))
    {
        fprintf(stderr, "PHYSFS_setWriteDir('%s') failed: %s\n",
-                argv[2], PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+                argv[2], PHYSFS_getLastError());
        return 3;
    } /* if */

    if (!PHYSFS_mount(argv[1], NULL, 1))
    {
        fprintf(stderr, "PHYSFS_mount('%s') failed: %s\n",
-                argv[1], PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+                argv[1], PHYSFS_getLastError());
        return 4;
    } /* if */

--- a/extras/selfextract.c
+++ b/extras/selfextract.c
@ -40,14 +40,14 @@ int main(int argc, char **argv)

    if (!PHYSFS_init(argv[0]))
    {
-        printf("PHYSFS_init() failed: %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        printf("PHYSFS_init() failed: %s\n", PHYSFS_getLastError());
        return 42;
    } /* if */

    rc = PHYSFS_addToSearchPath(argv[0], 0);
    if (!rc)
    {
-        printf("Couldn't find self-extract data: %s\n", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+        printf("Couldn't find self-extract data: %s\n", PHYSFS_getLastError());
        printf("This might mean you didn't append a zipfile to the binary.\n");
        return 42;
    } /* if */
--- a/src/Makefile.os2
+++ b/src/Makefile.os2
@ -1,93 +0,0 @@
-# Open Watcom makefile to build PhysicsFS for OS/2
-# wmake -f Makefile.os2
-
-LIBNAME = physfs
-VERSION = 3.3.0
-
-LIBFILE = $(LIBNAME).lib
-DLLFILE = $(LIBNAME).dll
-LNKFILE = $(LIBNAME).lnk
-
-TITLENAME = $(LIBNAME) $(VERSION)
-
-SRCS = physfs.c                   &
-       physfs_byteorder.c         &
-       physfs_unicode.c           &
-       physfs_platform_os2.c      &
-       physfs_archiver_dir.c      &
-       physfs_archiver_unpacked.c &
-       physfs_archiver_grp.c      &
-       physfs_archiver_hog.c      &
-       physfs_archiver_7z.c       &
-       physfs_archiver_mvl.c      &
-       physfs_archiver_qpak.c     &
-       physfs_archiver_wad.c      &
-       physfs_archiver_zip.c      &
-       physfs_archiver_slb.c      &
-       physfs_archiver_iso9660.c  &
-       physfs_archiver_vdf.c
-
-
-OBJS = $(SRCS:.c=.obj)
-
-CFLAGS_BASE = -bt=os2 -d0 -q -bm -5s -fp5 -fpi87 -sg -oeatxh -ei -j
-CFLAGS_BASE+= -DNDEBUG
-# warnings:
-CFLAGS_BASE+= -wx
-# newer OpenWatcom versions enable W303 by default
-CFLAGS_BASE+= -wcd=303
-# include paths:
-CFLAGS_BASE+= -I"$(%WATCOM)/h/os2" -I"$(%WATCOM)/h"
-CFLAGS = $(CFLAGS_BASE)
-# to build a dll:
-CFLAGS+= -bd
-
-.extensions:
-.extensions: .lib .dll .obj .c
-
-all: $(DLLFILE) test_physfs.exe
-
-.c: decoders
-.c: examples
-
-$(LIBFILE): $(DLLFILE)
-  @echo * Create library: $@...
-  wlib -b -n -q -c -pa -s -t -zld -ii -io $@ $(DLLFILE)
-
-$(DLLFILE): $(OBJS) $(MODPLIB) $(TIMILIB) $(LNKFILE)
-  @echo * Link: $@
-  wlink @$(LNKFILE)
-
-$(LNKFILE):
-  @%create $@
-  @%append $@ SYSTEM os2v2_dll INITINSTANCE TERMINSTANCE
-  @%append $@ NAME $(LIBNAME)
-  @for %i in ($(OBJS)) do @%append $@ FILE %i
-  @%append $@ OPTION QUIET
-  @%append $@ OPTION DESCRIPTION '@$#icculus org:$(VERSION)$#@PhysicsFS'
-  @%append $@ OPTION MAP=$^&.map
-  @%append $@ OPTION ELIMINATE
-  @%append $@ OPTION MANYAUTODATA
-  @%append $@ OPTION OSNAME='OS/2 and eComStation'
-  @%append $@ OPTION SHOWDEAD
-
-.c.obj:
-  wcc386 $(CFLAGS) -fo=$^@ $<
-
-test_physfs.obj: "../test/test_physfs.c"
-  wcc386 $(CFLAGS_BASE) -fo=$^@ $<
-
-test_physfs.exe: $(LIBFILE) test_physfs.obj
-  @echo * Link: $@
-  wlink SYS os2v2 LIBR {$(LIBFILE)} op q op el F {test_physfs.obj} N test_physfs.exe
-
-clean: .SYMBOLIC
-  @echo * Clean: $(TITLENAME)
-  @if exist *.obj rm *.obj
-  @if exist *.err rm *.err
-  @if exist $(LNKFILE) rm $(LNKFILE)
-distclean: .SYMBOLIC clean
-  @if exist $(DLLFILE) rm $(DLLFILE)
-  @if exist $(LIBFILE) rm $(LIBFILE)
-  @if exist *.map rm *.map
-  @if exist *.exe rm *.exe
--- a/src/physfs.c
+++ b/src/physfs.c
@ -12,6 +12,8 @@
 #include "physfs_internal.h"

 #if defined(_MSC_VER)
+#include <stdarg.h>
+
 /* this code came from https://stackoverflow.com/a/8712996 */
 int __PHYSFS_msvc_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap)
 {
@ -44,8 +46,6 @@ typedef struct __PHYSFS_DIRHANDLE__
    void *opaque;  /* Instance data unique to the archiver. */
    char *dirName;  /* Path to archive in platform-dependent notation. */
    char *mountPoint; /* Mountpoint in virtual file tree. */
-    char *root;  /* subdirectory of archiver to use as root of archive (NULL for actual root) */
-    size_t rootlen;  /* subdirectory of archiver to use as root of archive (NULL for actual root) */
    const PHYSFS_Archiver *funcs;  /* Ptr to archiver info for this handle. */
    struct __PHYSFS_DIRHANDLE__ *next;  /* linked list stuff. */
 } DirHandle;
@ -86,7 +86,6 @@ static int allowSymLinks = 0;
 static PHYSFS_Archiver **archivers = NULL;
 static PHYSFS_ArchiveInfo **archiveInfo = NULL;
 static volatile size_t numArchivers = 0;
-static size_t longest_root = 0;

 /* mutexes ... */
 static void *errorLock = NULL;     /* protects error message list.        */
@ -102,8 +101,8 @@ static inline int __PHYSFS_atomicAdd(int *ptrval, const int val)
 {
    int retval;
    __PHYSFS_platformGrabMutex(stateLock);
-    *ptrval += val;
    retval = *ptrval;
+    *ptrval = retval + val;
    __PHYSFS_platformReleaseMutex(stateLock);
    return retval;
 } /* __PHYSFS_atomicAdd */
@ -880,20 +879,13 @@ static DirHandle *openDirectory(PHYSFS_Io *io, const char *d, int forWriting)

    if (io == NULL)
    {
-        /* file doesn't exist, etc? Just fail out. */
-        PHYSFS_Stat statbuf;
-        BAIL_IF_ERRPASS(!__PHYSFS_platformStat(d, &statbuf, 1), NULL);
-
        /* DIR gets first shot (unlike the rest, it doesn't deal with files). */
-        if (statbuf.filetype == PHYSFS_FILETYPE_DIRECTORY)
-        {
-            retval = tryOpenDir(io, &__PHYSFS_Archiver_DIR, d, forWriting, &claimed);
-            if (retval || claimed)
-                return retval;
-        } /* if */
+        retval = tryOpenDir(io, &__PHYSFS_Archiver_DIR, d, forWriting, &claimed);
+        if (retval || claimed)
+            return retval;

        io = __PHYSFS_createNativeIo(d, forWriting ? 'w' : 'r');
-        BAIL_IF_ERRPASS(!io, NULL);
+        BAIL_IF_ERRPASS(!io, 0);
        created_io = 1;
    } /* if */

@ -921,12 +913,12 @@ static DirHandle *openDirectory(PHYSFS_Io *io, const char *d, int forWriting)
            retval = tryOpenDir(io, *i, d, forWriting, &claimed);
    } /* else */

-    errcode = claimed ? currentErrorCode() : PHYSFS_ERR_UNSUPPORTED;
+    errcode = currentErrorCode();

    if ((!retval) && (created_io))
        io->destroy(io);

-    BAIL_IF(!retval, errcode, NULL);
+    BAIL_IF(!retval, claimed ? errcode : PHYSFS_ERR_UNSUPPORTED, NULL);
    return retval;
 } /* openDirectory */

@ -947,10 +939,6 @@ static int sanitizePlatformIndependentPath(const char *src, char *dst)
    while (*src == '/')  /* skip initial '/' chars... */
        src++;

-    /* Make sure the entire string isn't "." or ".." */
-    if ((strcmp(src, ".") == 0) || (strcmp(src, "..") == 0))
-        BAIL(PHYSFS_ERR_BAD_FILENAME, 0);
-
    prev = dst;
    do
    {
@ -981,18 +969,6 @@ static int sanitizePlatformIndependentPath(const char *src, char *dst)
 } /* sanitizePlatformIndependentPath */


-static inline size_t dirHandleRootLen(const DirHandle *h)
-{
-    return h ? h->rootlen : 0;
-} /* dirHandleRootLen */
-
-static inline int sanitizePlatformIndependentPathWithRoot(const DirHandle *h, const char *src, char *dst)
-{
-    return sanitizePlatformIndependentPath(src, dst + dirHandleRootLen(h));
-} /* sanitizePlatformIndependentPathWithRoot */
-
-
-
 /*
 * Figure out if (fname) is part of (h)'s mountpoint. (fname) must be an
 *  output from sanitizePlatformIndependentPath(), so that it is in a known
@ -1036,8 +1012,6 @@ static DirHandle *createDirHandle(PHYSFS_Io *io, const char *newDir,
    DirHandle *dirHandle = NULL;
    char *tmpmntpnt = NULL;

-    assert(newDir != NULL);  /* should have caught this higher up. */
-
    if (mountPoint != NULL)
    {
        const size_t len = strlen(mountPoint) + 1;
@ -1051,9 +1025,15 @@ static DirHandle *createDirHandle(PHYSFS_Io *io, const char *newDir,
    dirHandle = openDirectory(io, newDir, forWriting);
    GOTO_IF_ERRPASS(!dirHandle, badDirHandle);

-    dirHandle->dirName = (char *) allocator.Malloc(strlen(newDir) + 1);
-    GOTO_IF(!dirHandle->dirName, PHYSFS_ERR_OUT_OF_MEMORY, badDirHandle);
-    strcpy(dirHandle->dirName, newDir);
+    if (newDir == NULL)
+        dirHandle->dirName = NULL;
+    else
+    {
+        dirHandle->dirName = (char *) allocator.Malloc(strlen(newDir) + 1);
+        if (!dirHandle->dirName)
+            GOTO(PHYSFS_ERR_OUT_OF_MEMORY, badDirHandle);
+        strcpy(dirHandle->dirName, newDir);
+    } /* else */

    if ((mountPoint != NULL) && (*mountPoint != '\0'))
    {
@ -1093,8 +1073,6 @@ static int freeDirHandle(DirHandle *dh, FileHandle *openList)
        BAIL_IF(i->dirHandle == dh, PHYSFS_ERR_FILES_STILL_OPEN, 0);

    dh->funcs->closeArchive(dh->opaque);
-
-    if (dh->root) allocator.Free(dh->root);
    allocator.Free(dh->dirName);
    allocator.Free(dh->mountPoint);
    allocator.Free(dh);
@ -1233,9 +1211,7 @@ int PHYSFS_init(const char *argv0)
    if (!userDir) goto initFailed;

    /* Platform layer is required to append a dirsep. */
-    #ifndef __ANDROID__  /* it's an APK file, not a directory, on Android. */
    assert(baseDir[strlen(baseDir) - 1] == __PHYSFS_platformDirSeparator);
-    #endif
    assert(userDir[strlen(userDir) - 1] == __PHYSFS_platformDirSeparator);

    if (!initStaticArchivers()) goto initFailed;
@ -1395,7 +1371,6 @@ static int doDeinit(void)
        archivers = NULL;
    } /* if */

-    longest_root = 0;
    allowSymLinks = 0;
    initialized = 0;

@ -1435,60 +1410,15 @@ char *__PHYSFS_strdup(const char *str)
 } /* __PHYSFS_strdup */


-PHYSFS_uint32 __PHYSFS_hashString(const char *str)
+PHYSFS_uint32 __PHYSFS_hashString(const char *str, size_t len)
 {
    PHYSFS_uint32 hash = 5381;
-    while (1)
-    {
-        const char ch = *(str++);
-        if (ch == 0)
-            break;
-        hash = ((hash << 5) + hash) ^ ch;
-    } /* while */
+    while (len--)
+        hash = ((hash << 5) + hash) ^ *(str++);
    return hash;
 } /* __PHYSFS_hashString */


-PHYSFS_uint32 __PHYSFS_hashStringCaseFold(const char *str)
-{
-    PHYSFS_uint32 hash = 5381;
-    while (1)
-    {
-        const PHYSFS_uint32 cp = __PHYSFS_utf8codepoint(&str);
-        if (cp == 0)
-            break;
-        else
-        {
-            PHYSFS_uint32 folded[3];
-            const int numbytes = (int) (PHYSFS_caseFold(cp, folded) * sizeof (PHYSFS_uint32));
-            const char *bytes = (const char *) folded;
-            int i;
-            for (i = 0; i < numbytes; i++)
-                hash = ((hash << 5) + hash) ^ *(bytes++);
-        } /* else */
-    } /* while */
-
-    return hash;
-} /* __PHYSFS_hashStringCaseFold */
-
-
-PHYSFS_uint32 __PHYSFS_hashStringCaseFoldUSAscii(const char *str)
-{
-    PHYSFS_uint32 hash = 5381;
-    while (1)
-    {
-        char ch = *(str++);
-        if (ch == 0)
-            break;
-        else if ((ch >= 'A') && (ch <= 'Z'))
-            ch -= ('A' - 'a');
-
-        hash = ((hash << 5) + hash) ^ ch;
-    } /* while */
-    return hash;
-} /* __PHYSFS_hashStringCaseFoldUSAscii */
-
-
 /* MAKE SURE you hold stateLock before calling this! */
 static int doRegisterArchiver(const PHYSFS_Archiver *_archiver)
 {
@ -1669,7 +1599,7 @@ const char *PHYSFS_getPrefDir(const char *org, const char *app)
    assert(*endstr == dirsep);
    *endstr = '\0';  /* mask out the final dirsep for now. */

-    if (!__PHYSFS_platformStat(prefDir, &statbuf, 1))
+    if (!__PHYSFS_platformStat(prefDir, &statbuf))
    {
        for (ptr = strchr(prefDir, dirsep); ptr; ptr = strchr(ptr+1, dirsep))
        {
@ -1747,54 +1677,6 @@ int PHYSFS_setWriteDir(const char *newDir)
 } /* PHYSFS_setWriteDir */


-int PHYSFS_setRoot(const char *archive, const char *subdir)
-{
-    DirHandle *i;
-
-    BAIL_IF(!archive, PHYSFS_ERR_INVALID_ARGUMENT, 0);
-
-    __PHYSFS_platformGrabMutex(stateLock);
-
-    for (i = searchPath; i != NULL; i = i->next)
-    {
-        if ((i->dirName != NULL) && (strcmp(archive, i->dirName) == 0))
-        {
-            if (!subdir || (strcmp(subdir, "/") == 0))
-            {
-                if (i->root)
-                    allocator.Free(i->root);
-                i->root = NULL;
-                i->rootlen = 0;
-            } /* if */
-            else
-            {
-                const size_t len = strlen(subdir) + 1;
-                char *ptr = (char *) allocator.Malloc(len);
-                BAIL_IF_MUTEX(!ptr, PHYSFS_ERR_OUT_OF_MEMORY, stateLock, 0);
-                if (!sanitizePlatformIndependentPath(subdir, ptr))
-                {
-                    allocator.Free(ptr);
-                    BAIL_MUTEX_ERRPASS(stateLock, 0);
-                } /* if */
-
-                if (i->root)
-                    allocator.Free(i->root);
-                i->root = ptr;
-                i->rootlen = strlen(i->root);  /* in case sanitizePlatformIndependentPath changed subdir */
-
-                if (longest_root < i->rootlen)
-                    longest_root = i->rootlen;
-            } /* else */
-
-            break;
-        } /* if */
-    } /* for */
-
-    __PHYSFS_platformReleaseMutex(stateLock);
-    return 1;
-} /* PHYSFS_setRoot */
-
-
 static int doMount(PHYSFS_Io *io, const char *fname,
                   const char *mountPoint, int appendToPath)
 {
@ -1802,20 +1684,21 @@ static int doMount(PHYSFS_Io *io, const char *fname,
    DirHandle *prev = NULL;
    DirHandle *i;

-    BAIL_IF(!fname, PHYSFS_ERR_INVALID_ARGUMENT, 0);
-
    if (mountPoint == NULL)
        mountPoint = "/";

    __PHYSFS_platformGrabMutex(stateLock);

-    for (i = searchPath; i != NULL; i = i->next)
+    if (fname != NULL)
    {
-        /* already in search path? */
-        if ((i->dirName != NULL) && (strcmp(fname, i->dirName) == 0))
-            BAIL_MUTEX_ERRPASS(stateLock, 1);
-        prev = i;
-    } /* for */
+        for (i = searchPath; i != NULL; i = i->next)
+        {
+            /* already in search path? */
+            if ((i->dirName != NULL) && (strcmp(fname, i->dirName) == 0))
+                BAIL_MUTEX_ERRPASS(stateLock, 1);
+            prev = i;
+        } /* for */
+    } /* if */

    dh = createDirHandle(io, fname, mountPoint, 0);
    BAIL_IF_MUTEX_ERRPASS(!dh, stateLock, 0);
@ -1842,7 +1725,6 @@ int PHYSFS_mountIo(PHYSFS_Io *io, const char *fname,
                   const char *mountPoint, int appendToPath)
 {
    BAIL_IF(!io, PHYSFS_ERR_INVALID_ARGUMENT, 0);
-    BAIL_IF(!fname, PHYSFS_ERR_INVALID_ARGUMENT, 0);
    BAIL_IF(io->version != 0, PHYSFS_ERR_UNSUPPORTED, 0);
    return doMount(io, fname, mountPoint, appendToPath);
 } /* PHYSFS_mountIo */
@ -1856,7 +1738,6 @@ int PHYSFS_mountMemory(const void *buf, PHYSFS_uint64 len, void (*del)(void *),
    PHYSFS_Io *io = NULL;

    BAIL_IF(!buf, PHYSFS_ERR_INVALID_ARGUMENT, 0);
-    BAIL_IF(!fname, PHYSFS_ERR_INVALID_ARGUMENT, 0);

    io = __PHYSFS_createMemoryIo(buf, len, del);
    BAIL_IF_ERRPASS(!io, 0);
@ -1879,8 +1760,7 @@ int PHYSFS_mountHandle(PHYSFS_File *file, const char *fname,
    int retval = 0;
    PHYSFS_Io *io = NULL;

-    BAIL_IF(!file, PHYSFS_ERR_INVALID_ARGUMENT, 0);
-    BAIL_IF(!fname, PHYSFS_ERR_INVALID_ARGUMENT, 0);
+    BAIL_IF(file == NULL, PHYSFS_ERR_INVALID_ARGUMENT, 0);

    io = __PHYSFS_createHandleIo(file);
    BAIL_IF_ERRPASS(!io, 0);
@ -1905,7 +1785,7 @@ int PHYSFS_mount(const char *newDir, const char *mountPoint, int appendToPath)

 int PHYSFS_addToSearchPath(const char *newDir, int appendToPath)
 {
-    return PHYSFS_mount(newDir, NULL, appendToPath);
+    return doMount(NULL, newDir, NULL, appendToPath);
 } /* PHYSFS_addToSearchPath */


@ -2112,9 +1992,6 @@ int PHYSFS_symbolicLinksPermitted(void)
 *  like ".." which should be done once instead of once per archive. This also
 *  gives us license to treat (fname) as scratch space in this function.
 *
- * (fname)'s buffer must have enough space available before it for this
- *  function to prepend any root directory for this DirHandle.
- *
 * Returns non-zero if string is safe, zero if there's a security issue.
 *  PHYSFS_getLastError() will specify what was wrong. (*fname) will be
 *  updated to point past any mount point elements so it is prepared to
@ -2127,7 +2004,7 @@ static int verifyPath(DirHandle *h, char **_fname, int allowMissing)
    char *start;
    char *end;

-    if ((*fname == '\0') && (!h->root))  /* quick rejection. */
+    if (*fname == '\0')  /* quick rejection. */
        return 1;

    /* !!! FIXME: This codeblock sucks. */
@ -2150,17 +2027,6 @@ static int verifyPath(DirHandle *h, char **_fname, int allowMissing)
        retval = 1;  /* may be reset, below. */
    } /* if */

-    /* prepend the root directory, if any. */
-    if (h->root)
-    {
-        const int isempty = (*fname == '\0');
-        fname -= h->rootlen + (isempty ? 0 : 1);
-        strcpy(fname, h->root);
-        if (!isempty)
-            fname[h->rootlen] = '/';
-        *_fname = fname;
-    } /* if */
-
    start = fname;
    if (!allowSymLinks)
    {
@ -2206,19 +2072,20 @@ static int verifyPath(DirHandle *h, char **_fname, int allowMissing)
 } /* verifyPath */


-/* This must hold the stateLock before calling. */
 static int doMkdir(const char *_dname, char *dname)
 {
-    DirHandle *h = writeDir;
+    DirHandle *h;
    char *start;
    char *end;
    int retval = 0;
    int exists = 1;  /* force existance check on first path element. */

-    assert(h != NULL);
+    BAIL_IF_ERRPASS(!sanitizePlatformIndependentPath(_dname, dname), 0);

-    BAIL_IF_ERRPASS(!sanitizePlatformIndependentPathWithRoot(h, _dname, dname), 0);
-    BAIL_IF_ERRPASS(!verifyPath(h, &dname, 1), 0);
+    __PHYSFS_platformGrabMutex(stateLock);
+    BAIL_IF_MUTEX(!writeDir, PHYSFS_ERR_NO_WRITE_DIR, stateLock, 0);
+    h = writeDir;
+    BAIL_IF_MUTEX_ERRPASS(!verifyPath(h, &dname, 1), stateLock, 0);

    start = dname;
    while (1)
@ -2234,12 +2101,7 @@ static int doMkdir(const char *_dname, char *dname)
            const int rc = h->funcs->stat(h->opaque, dname, &statbuf);
            if ((!rc) && (currentErrorCode() == PHYSFS_ERR_NOT_FOUND))
                exists = 0;
-            /* verifyPath made sure that (dname) doesn't have symlinks if they aren't
-               allowed, but it's possible the mounted writeDir itself has symlinks in it,
-               (for example "/var" on iOS is a symlink, and the prefpath will be somewhere
-               under that)...if we mounted that writeDir, we must allow those symlinks here
-               unconditionally. */
-            retval = ( (rc) && ((statbuf.filetype == PHYSFS_FILETYPE_DIRECTORY) || (statbuf.filetype == PHYSFS_FILETYPE_SYMLINK)) );
+            retval = ((rc) && (statbuf.filetype == PHYSFS_FILETYPE_DIRECTORY));
        } /* if */

        if (!exists)
@ -2255,6 +2117,7 @@ static int doMkdir(const char *_dname, char *dname)
        start = end + 1;
    } /* while */

+    __PHYSFS_platformReleaseMutex(stateLock);
    return retval;
 } /* doMkdir */

@ -2266,26 +2129,30 @@ int PHYSFS_mkdir(const char *_dname)
    size_t len;

    BAIL_IF(!_dname, PHYSFS_ERR_INVALID_ARGUMENT, 0);
-
-    __PHYSFS_platformGrabMutex(stateLock);
-    BAIL_IF_MUTEX(!writeDir, PHYSFS_ERR_NO_WRITE_DIR, stateLock, 0);
-    len = strlen(_dname) + dirHandleRootLen(writeDir) + 1;
+    len = strlen(_dname) + 1;
    dname = (char *) __PHYSFS_smallAlloc(len);
-    BAIL_IF_MUTEX(!dname, PHYSFS_ERR_OUT_OF_MEMORY, stateLock, 0);
+    BAIL_IF(!dname, PHYSFS_ERR_OUT_OF_MEMORY, 0);
    retval = doMkdir(_dname, dname);
-    __PHYSFS_platformReleaseMutex(stateLock);
    __PHYSFS_smallFree(dname);
    return retval;
 } /* PHYSFS_mkdir */


-/* This must hold the stateLock before calling. */
 static int doDelete(const char *_fname, char *fname)
 {
-    DirHandle *h = writeDir;
-    BAIL_IF_ERRPASS(!sanitizePlatformIndependentPathWithRoot(h, _fname, fname), 0);
-    BAIL_IF_ERRPASS(!verifyPath(h, &fname, 0), 0);
-    return h->funcs->remove(h->opaque, fname);
+    int retval;
+    DirHandle *h;
+    BAIL_IF_ERRPASS(!sanitizePlatformIndependentPath(_fname, fname), 0);
+
+    __PHYSFS_platformGrabMutex(stateLock);
+
+    BAIL_IF_MUTEX(!writeDir, PHYSFS_ERR_NO_WRITE_DIR, stateLock, 0);
+    h = writeDir;
+    BAIL_IF_MUTEX_ERRPASS(!verifyPath(h, &fname, 0), stateLock, 0);
+    retval = h->funcs->remove(h->opaque, fname);
+
+    __PHYSFS_platformReleaseMutex(stateLock);
+    return retval;
 } /* doDelete */


@ -2295,13 +2162,11 @@ int PHYSFS_delete(const char *_fname)
    char *fname;
    size_t len;

-    __PHYSFS_platformGrabMutex(stateLock);
-    BAIL_IF_MUTEX(!writeDir, PHYSFS_ERR_NO_WRITE_DIR, stateLock, 0);
-    len = strlen(_fname) + dirHandleRootLen(writeDir) + 1;
+    BAIL_IF(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, 0);
+    len = strlen(_fname) + 1;
    fname = (char *) __PHYSFS_smallAlloc(len);
-    BAIL_IF_MUTEX(!fname, PHYSFS_ERR_OUT_OF_MEMORY, stateLock, 0);
+    BAIL_IF(!fname, PHYSFS_ERR_OUT_OF_MEMORY, 0);
    retval = doDelete(_fname, fname);
-    __PHYSFS_platformReleaseMutex(stateLock);
    __PHYSFS_smallFree(fname);
    return retval;
 } /* PHYSFS_delete */
@ -2310,20 +2175,17 @@ int PHYSFS_delete(const char *_fname)
 static DirHandle *getRealDirHandle(const char *_fname)
 {
    DirHandle *retval = NULL;
-    char *allocated_fname = NULL;
    char *fname = NULL;
    size_t len;

    BAIL_IF(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, NULL);
-
-    __PHYSFS_platformGrabMutex(stateLock);
-    len = strlen(_fname) + longest_root + 2;
-    allocated_fname = __PHYSFS_smallAlloc(len);
-    BAIL_IF_MUTEX(!allocated_fname, PHYSFS_ERR_OUT_OF_MEMORY, stateLock, NULL);
-    fname = allocated_fname + longest_root + 1;
+    len = strlen(_fname) + 1;
+    fname = __PHYSFS_smallAlloc(len);
+    BAIL_IF(!fname, PHYSFS_ERR_OUT_OF_MEMORY, NULL);
    if (sanitizePlatformIndependentPath(_fname, fname))
    {
        DirHandle *i;
+        __PHYSFS_platformGrabMutex(stateLock);
        for (i = searchPath; i != NULL; i = i->next)
        {
            char *arcfname = fname;
@ -2342,10 +2204,10 @@ static DirHandle *getRealDirHandle(const char *_fname)
                } /* if */
            } /* if */
        } /* for */
+        __PHYSFS_platformReleaseMutex(stateLock);
    } /* if */

-    __PHYSFS_platformReleaseMutex(stateLock);
-    __PHYSFS_smallFree(allocated_fname);
+    __PHYSFS_smallFree(fname);
    return retval;
 } /* getRealDirHandle */

@ -2540,18 +2402,15 @@ int PHYSFS_enumerate(const char *_fn, PHYSFS_EnumerateCallback cb, void *data)
 {
    PHYSFS_EnumerateCallbackResult retval = PHYSFS_ENUM_OK;
    size_t len;
-    char *allocated_fname;
    char *fname;

    BAIL_IF(!_fn, PHYSFS_ERR_INVALID_ARGUMENT, 0);
    BAIL_IF(!cb, PHYSFS_ERR_INVALID_ARGUMENT, 0);

-    __PHYSFS_platformGrabMutex(stateLock);
+    len = strlen(_fn) + 1;
+    fname = (char *) __PHYSFS_smallAlloc(len);
+    BAIL_IF(!fname, PHYSFS_ERR_OUT_OF_MEMORY, 0);

-    len = strlen(_fn) + longest_root + 2;
-    allocated_fname = (char *) __PHYSFS_smallAlloc(len);
-    BAIL_IF_MUTEX(!allocated_fname, PHYSFS_ERR_OUT_OF_MEMORY, stateLock, 0);
-    fname = allocated_fname + longest_root + 1;
    if (!sanitizePlatformIndependentPath(_fn, fname))
        retval = PHYSFS_ENUM_STOP;
    else
@ -2559,6 +2418,8 @@ int PHYSFS_enumerate(const char *_fn, PHYSFS_EnumerateCallback cb, void *data)
        DirHandle *i;
        SymlinkFilterData filterdata;

+        __PHYSFS_platformGrabMutex(stateLock);
+
        if (!allowSymLinks)
        {
            memset(&filterdata, '\0', sizeof (filterdata));
@ -2607,11 +2468,10 @@ int PHYSFS_enumerate(const char *_fn, PHYSFS_EnumerateCallback cb, void *data)
            } /* else if */
        } /* for */

+        __PHYSFS_platformReleaseMutex(stateLock);
    } /* if */

-    __PHYSFS_platformReleaseMutex(stateLock);
-
-    __PHYSFS_smallFree(allocated_fname);
+    __PHYSFS_smallFree(fname);

    return (retval == PHYSFS_ENUM_ERROR) ? 0 : 1;
 } /* PHYSFS_enumerate */
@ -2672,57 +2532,56 @@ int PHYSFS_isSymbolicLink(const char *fname)
 } /* PHYSFS_isSymbolicLink */


-static PHYSFS_File *doOpenWrite(const char *_fname, const int appending)
+static PHYSFS_File *doOpenWrite(const char *_fname, int appending)
 {
    FileHandle *fh = NULL;
-    DirHandle *h;
    size_t len;
    char *fname;

    BAIL_IF(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, 0);
-
-    __PHYSFS_platformGrabMutex(stateLock);
-
-    h = writeDir;
-    BAIL_IF_MUTEX(!h, PHYSFS_ERR_NO_WRITE_DIR, stateLock, 0);
-
-    len = strlen(_fname) + dirHandleRootLen(h) + 1;
+    len = strlen(_fname) + 1;
    fname = (char *) __PHYSFS_smallAlloc(len);
-    BAIL_IF_MUTEX(!fname, PHYSFS_ERR_OUT_OF_MEMORY, stateLock, 0);
+    BAIL_IF(!fname, PHYSFS_ERR_OUT_OF_MEMORY, 0);

-    if (sanitizePlatformIndependentPathWithRoot(h, _fname, fname))
+    if (sanitizePlatformIndependentPath(_fname, fname))
    {
        PHYSFS_Io *io = NULL;
-        char *arcfname = fname;
-        if (verifyPath(h, &arcfname, 0))
+        DirHandle *h = NULL;
+        const PHYSFS_Archiver *f;
+
+        __PHYSFS_platformGrabMutex(stateLock);
+
+        GOTO_IF(!writeDir, PHYSFS_ERR_NO_WRITE_DIR, doOpenWriteEnd);
+
+        h = writeDir;
+        GOTO_IF_ERRPASS(!verifyPath(h, &fname, 0), doOpenWriteEnd);
+
+        f = h->funcs;
+        if (appending)
+            io = f->openAppend(h->opaque, fname);
+        else
+            io = f->openWrite(h->opaque, fname);
+
+        GOTO_IF_ERRPASS(!io, doOpenWriteEnd);
+
+        fh = (FileHandle *) allocator.Malloc(sizeof (FileHandle));
+        if (fh == NULL)
        {
-            const PHYSFS_Archiver *f = h->funcs;
-            if (appending)
-                io = f->openAppend(h->opaque, arcfname);
-            else
-                io = f->openWrite(h->opaque, arcfname);
-
-            if (io)
-            {
-                fh = (FileHandle *) allocator.Malloc(sizeof (FileHandle));
-                if (fh == NULL)
-                {
-                    io->destroy(io);
-                    PHYSFS_setErrorCode(PHYSFS_ERR_OUT_OF_MEMORY);
-                } /* if */
-                else
-                {
-                    memset(fh, '\0', sizeof (FileHandle));
-                    fh->io = io;
-                    fh->dirHandle = h;
-                    fh->next = openWriteList;
-                    openWriteList = fh;
-                } /* else */
-            } /* if */
+            io->destroy(io);
+            GOTO(PHYSFS_ERR_OUT_OF_MEMORY, doOpenWriteEnd);
        } /* if */
-    } /* if */
+        else
+        {
+            memset(fh, '\0', sizeof (FileHandle));
+            fh->io = io;
+            fh->dirHandle = h;
+            fh->next = openWriteList;
+            openWriteList = fh;
+        } /* else */

-    __PHYSFS_platformReleaseMutex(stateLock);
+        doOpenWriteEnd:
+        __PHYSFS_platformReleaseMutex(stateLock);
+    } /* if */

    __PHYSFS_smallFree(fname);
    return ((PHYSFS_File *) fh);
@ -2744,25 +2603,22 @@ PHYSFS_File *PHYSFS_openAppend(const char *filename)
 PHYSFS_File *PHYSFS_openRead(const char *_fname)
 {
    FileHandle *fh = NULL;
-    char *allocated_fname;
    char *fname;
    size_t len;

    BAIL_IF(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, 0);
-
-    __PHYSFS_platformGrabMutex(stateLock);
-
-    BAIL_IF_MUTEX(!searchPath, PHYSFS_ERR_NOT_FOUND, stateLock, 0);
-
-    len = strlen(_fname) + longest_root + 2;
-    allocated_fname = (char *) __PHYSFS_smallAlloc(len);
-    BAIL_IF_MUTEX(!allocated_fname, PHYSFS_ERR_OUT_OF_MEMORY, stateLock, 0);
-    fname = allocated_fname + longest_root + 1;
+    len = strlen(_fname) + 1;
+    fname = (char *) __PHYSFS_smallAlloc(len);
+    BAIL_IF(!fname, PHYSFS_ERR_OUT_OF_MEMORY, 0);

    if (sanitizePlatformIndependentPath(_fname, fname))
    {
+        DirHandle *i = NULL;
        PHYSFS_Io *io = NULL;
-        DirHandle *i;
+
+        __PHYSFS_platformGrabMutex(stateLock);
+
+        GOTO_IF(!searchPath, PHYSFS_ERR_NOT_FOUND, openReadEnd);

        for (i = searchPath; i != NULL; i = i->next)
        {
@ -2775,28 +2631,27 @@ PHYSFS_File *PHYSFS_openRead(const char *_fname)
            } /* if */
        } /* for */

-        if (io)
+        GOTO_IF_ERRPASS(!io, openReadEnd);
+
+        fh = (FileHandle *) allocator.Malloc(sizeof (FileHandle));
+        if (fh == NULL)
        {
-            fh = (FileHandle *) allocator.Malloc(sizeof (FileHandle));
-            if (fh == NULL)
-            {
-                io->destroy(io);
-                PHYSFS_setErrorCode(PHYSFS_ERR_OUT_OF_MEMORY);
-            } /* if */
-            else
-            {
-                memset(fh, '\0', sizeof (FileHandle));
-                fh->io = io;
-                fh->forReading = 1;
-                fh->dirHandle = i;
-                fh->next = openReadList;
-                openReadList = fh;
-            } /* else */
+            io->destroy(io);
+            GOTO(PHYSFS_ERR_OUT_OF_MEMORY, openReadEnd);
        } /* if */
+
+        memset(fh, '\0', sizeof (FileHandle));
+        fh->io = io;
+        fh->forReading = 1;
+        fh->dirHandle = i;
+        fh->next = openReadList;
+        openReadList = fh;
+
+        openReadEnd:
+        __PHYSFS_platformReleaseMutex(stateLock);
    } /* if */

-    __PHYSFS_platformReleaseMutex(stateLock);
-    __PHYSFS_smallFree(allocated_fname);
+    __PHYSFS_smallFree(fname);
    return ((PHYSFS_File *) fh);
 } /* PHYSFS_openRead */

@ -2805,6 +2660,7 @@ static int closeHandleInOpenList(FileHandle **list, FileHandle *handle)
 {
    FileHandle *prev = NULL;
    FileHandle *i;
+    int rc = 1;

    for (i = *list; i != NULL; i = i->next)
    {
@ -2812,19 +2668,9 @@ static int closeHandleInOpenList(FileHandle **list, FileHandle *handle)
        {
            PHYSFS_Io *io = handle->io;
            PHYSFS_uint8 *tmp = handle->buffer;
-
-            /* send our buffer to io... */
-            if (!handle->forReading)
-            {
-                if (!PHYSFS_flush((PHYSFS_File *) handle))
-                    return -1;
-
-                /* ...then have io send it to the disk... */
-                else if (io->flush && !io->flush(io))
-                    return -1;
-            } /* if */
-
-            /* ...then close the underlying file. */
+            rc = PHYSFS_flush((PHYSFS_File *) handle);
+            if (!rc)
+                return -1;
            io->destroy(io);

            if (tmp != NULL)  /* free any associated buffer. */
@ -3122,19 +2968,21 @@ int PHYSFS_flush(PHYSFS_File *handle)
    rc = io->write(io, fh->buffer + fh->bufpos, fh->buffill - fh->bufpos);
    BAIL_IF_ERRPASS(rc <= 0, 0);
    fh->bufpos = fh->buffill = 0;
-    return 1;
+    return io->flush ? io->flush(io) : 1;
 } /* PHYSFS_flush */


 int PHYSFS_stat(const char *_fname, PHYSFS_Stat *stat)
 {
    int retval = 0;
-    char *allocated_fname;
    char *fname;
    size_t len;

    BAIL_IF(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, 0);
    BAIL_IF(!stat, PHYSFS_ERR_INVALID_ARGUMENT, 0);
+    len = strlen(_fname) + 1;
+    fname = (char *) __PHYSFS_smallAlloc(len);
+    BAIL_IF(!fname, PHYSFS_ERR_OUT_OF_MEMORY, 0);

    /* set some sane defaults... */
    stat->filesize = -1;
@ -3144,12 +2992,6 @@ int PHYSFS_stat(const char *_fname, PHYSFS_Stat *stat)
    stat->filetype = PHYSFS_FILETYPE_OTHER;
    stat->readonly = 1;

-    __PHYSFS_platformGrabMutex(stateLock);
-    len = strlen(_fname) + longest_root + 2;
-    allocated_fname = (char *) __PHYSFS_smallAlloc(len);
-    BAIL_IF_MUTEX(!allocated_fname, PHYSFS_ERR_OUT_OF_MEMORY, stateLock, 0);
-    fname = allocated_fname + longest_root + 1;
-
    if (sanitizePlatformIndependentPath(_fname, fname))
    {
        if (*fname == '\0')
@ -3162,6 +3004,7 @@ int PHYSFS_stat(const char *_fname, PHYSFS_Stat *stat)
        {
            DirHandle *i;
            int exists = 0;
+            __PHYSFS_platformGrabMutex(stateLock);
            for (i = searchPath; ((i != NULL) && (!exists)); i = i->next)
            {
                char *arcfname = fname;
@ -3179,11 +3022,11 @@ int PHYSFS_stat(const char *_fname, PHYSFS_Stat *stat)
                        exists = 1;
                } /* else if */
            } /* for */
+            __PHYSFS_platformReleaseMutex(stateLock);
        } /* else */
    } /* if */

-    __PHYSFS_platformReleaseMutex(stateLock);
-    __PHYSFS_smallFree(allocated_fname);
+    __PHYSFS_smallFree(fname);
    return retval;
 } /* PHYSFS_stat */

@ -3281,7 +3124,7 @@ static void setDefaultAllocator(void)
 } /* setDefaultAllocator */


-int __PHYSFS_DirTreeInit(__PHYSFS_DirTree *dt, const size_t entrylen, const int case_sensitive, const int only_usascii)
+int __PHYSFS_DirTreeInit(__PHYSFS_DirTree *dt, const size_t entrylen)
 {
    static char rootpath[2] = { '/', '\0' };
    size_t alloclen;
@ -3289,8 +3132,6 @@ int __PHYSFS_DirTreeInit(__PHYSFS_DirTree *dt, const size_t entrylen, const int
    assert(entrylen >= sizeof (__PHYSFS_DirTreeEntry));

    memset(dt, '\0', sizeof (*dt));
-    dt->case_sensitive = case_sensitive;
-    dt->only_usascii = only_usascii;

    dt->root = (__PHYSFS_DirTreeEntry *) allocator.Malloc(entrylen);
    BAIL_IF(!dt->root, PHYSFS_ERR_OUT_OF_MEMORY, 0);
@ -3311,10 +3152,9 @@ int __PHYSFS_DirTreeInit(__PHYSFS_DirTree *dt, const size_t entrylen, const int
 } /* __PHYSFS_DirTreeInit */


-static PHYSFS_uint32 hashPathName(__PHYSFS_DirTree *dt, const char *name)
+static inline PHYSFS_uint32 hashPathName(__PHYSFS_DirTree *dt, const char *name)
 {
-    const PHYSFS_uint32 hashval = dt->case_sensitive ? __PHYSFS_hashString(name) : dt->only_usascii ? __PHYSFS_hashStringCaseFoldUSAscii(name) : __PHYSFS_hashStringCaseFold(name);
-    return hashval % dt->hashBuckets;
+    return __PHYSFS_hashString(name, strlen(name)) % dt->hashBuckets;
 } /* hashPathName */


@ -3375,7 +3215,6 @@ void *__PHYSFS_DirTreeAdd(__PHYSFS_DirTree *dt, char *name, const int isdir)
 /* Find the __PHYSFS_DirTreeEntry for a path in platform-independent notation. */
 void *__PHYSFS_DirTreeFind(__PHYSFS_DirTree *dt, const char *path)
 {
-    const int cs = dt->case_sensitive;
    PHYSFS_uint32 hashval;
    __PHYSFS_DirTreeEntry *prev = NULL;
    __PHYSFS_DirTreeEntry *retval;
@ -3386,8 +3225,7 @@ void *__PHYSFS_DirTreeFind(__PHYSFS_DirTree *dt, const char *path)
    hashval = hashPathName(dt, path);
    for (retval = dt->hash[hashval]; retval; retval = retval->hashnext)
    {
-        const int cmp = cs ? strcmp(retval->name, path) : PHYSFS_utf8stricmp(retval->name, path);
-        if (cmp == 0)
+        if (strcmp(retval->name, path) == 0)
        {
            if (prev != NULL)  /* move this to the front of the list */
            {
--- a/src/physfs.h
+++ b/src/physfs.h
@ -145,7 +145,7 @@
 *   - .ISO (ISO9660 files, CD-ROM images)
 *   - .GRP (Build Engine groupfile archives)
 *   - .PAK (Quake I/II archive format)
- *   - .HOG (Descent I/II/III HOG file archives)
+ *   - .HOG (Descent I/II HOG file archives)
 *   - .MVL (Descent II movielib archives)
 *   - .WAD (DOOM engine archives)
 *   - .VDF (Gothic I/II engine archives)
@ -225,13 +225,11 @@ extern "C" {

 #if defined(PHYSFS_DECL)
 /* do nothing. */
-#elif defined(PHYSFS_STATIC)
-#define PHYSFS_DECL   /**/
-#elif defined(_WIN32) || defined(__OS2__)
+#elif (defined _MSC_VER)
 #define PHYSFS_DECL __declspec(dllexport)
-#elif defined(__SUNPRO_C)
+#elif (defined __SUNPRO_C)
 #define PHYSFS_DECL __global
-#elif ((__GNUC__ >= 3) && (!defined(__EMX__)) && (!defined(sun)))
+#elif ((__GNUC__ >= 3) && (!__EMX__) && (!sun))
 #define PHYSFS_DECL __attribute__((visibility("default")))
 #else
 #define PHYSFS_DECL
@ -435,7 +433,7 @@ typedef struct PHYSFS_Version

 #ifndef DOXYGEN_SHOULD_IGNORE_THIS
 #define PHYSFS_VER_MAJOR 3
-#define PHYSFS_VER_MINOR 3
+#define PHYSFS_VER_MINOR 0
 #define PHYSFS_VER_PATCH 0
 #endif  /* DOXYGEN_SHOULD_IGNORE_THIS */

@ -495,14 +493,6 @@ typedef struct PHYSFS_Version
 PHYSFS_DECL void PHYSFS_getLinkedVersion(PHYSFS_Version *ver);


-#ifdef __ANDROID__
-typedef struct PHYSFS_AndroidInit
-{
-    void *jnienv;
-    void *context;
-} PHYSFS_AndroidInit;
-#endif
-
 /**
 * \fn int PHYSFS_init(const char *argv0)
 * \brief Initialize the PhysicsFS library.
@ -512,22 +502,11 @@ typedef struct PHYSFS_AndroidInit
 * This should be called prior to any attempts to change your process's
 *  current working directory.
 *
- * \warning On Android, argv0 should be a non-NULL pointer to a
- *          PHYSFS_AndroidInit struct. This struct must hold a valid JNIEnv *
- *          and a JNI jobject of a Context (either the application context or
- *          the current Activity is fine). Both are cast to a void * so we
- *          don't need jni.h included wherever physfs.h is. PhysicsFS
- *          uses these objects to query some system details. PhysicsFS does
- *          not hold a reference to the JNIEnv or Context past the call to
- *          PHYSFS_init(). If you pass a NULL here, PHYSFS_init can still
- *          succeed, but PHYSFS_getBaseDir() and PHYSFS_getPrefDir() will be
- *          incorrect.
- *
 *   \param argv0 the argv[0] string passed to your program's mainline.
 *          This may be NULL on most platforms (such as ones without a
 *          standard main() function), but you should always try to pass
- *          something in here. Many Unix-like systems _need_ to pass argv[0]
- *          from main() in here. See warning about Android, too!
+ *          something in here. Unix-like systems such as Linux _need_ to
+ *          pass argv[0] from main() in here.
 *  \return nonzero on success, zero on error. Specifics of the error can be
 *          gleaned from PHYSFS_getLastError().
 *
@ -783,15 +762,6 @@ PHYSFS_DECL char **PHYSFS_getCdRomDirs(void);
 *
 * You should probably use the base dir in your search path.
 *
- * \warning On most platforms, this is a directory; on Android, this gives
- *          you the path to the app's package (APK) file. As APK files are
- *          just .zip files, you can mount them in PhysicsFS like regular
- *          directories. You'll probably want to call
- *          PHYSFS_setRoot(basedir, "/assets") after mounting to make your
- *          app's actual data available directly without all the Android
- *          metadata and directory offset. Note that if you passed a NULL to
- *          PHYSFS_init(), you will not get the APK file here.
- *
 *  \return READ ONLY string of base dir in platform-dependent notation.
 *
 * \sa PHYSFS_getPrefDir
@ -2206,15 +2176,11 @@ PHYSFS_DECL int PHYSFS_setAllocator(const PHYSFS_Allocator *allocator);
 *  or each other, for example.
 *
 * The mountpoint does not need to exist prior to mounting, which is different
- *  than those familiar with the Unix concept of "mounting" may expect.
+ *  than those familiar with the Unix concept of "mounting" may not expect.
 *  As well, more than one archive can be mounted to the same mountpoint, or
 *  mountpoints and archive contents can overlap...the interpolation mechanism
 *  still functions as usual.
 *
- * Specifying a symbolic link to an archive or directory is allowed here,
- *  regardless of the state of PHYSFS_permitSymbolicLinks(). That function
- *  only deals with symlinks inside the mounted directory or archive.
- *
 *   \param newDir directory or archive to add to the path, in
 *                   platform-dependent notation.
 *   \param mountPoint Location in the interpolated tree that this archive
@ -2732,10 +2698,10 @@ typedef PHYSFS_EnumerateCallbackResult (*PHYSFS_EnumerateCallback)(void *data,
 *
 * \code
 *
- * static PHYSFS_EnumerateCallbackResult printDir(void *data, const char *origdir, const char *fname)
+ * static int printDir(void *data, const char *origdir, const char *fname)
 * {
 *     printf(" * We've got [%s] in [%s].\n", fname, origdir);
- *     return PHYSFS_ENUM_OK;  // give me more data, please.
+ *     return 1;  // give me more data, please.
 * }
 *
 * // ...
@ -2794,12 +2760,6 @@ PHYSFS_DECL int PHYSFS_enumerate(const char *dir, PHYSFS_EnumerateCallback c,
 * This call will fail (and fail to remove from the path) if the element still
 *  has files open in it.
 *
- * \warning This function wants the path to the archive or directory that was
- *          mounted (the same string used for the "newDir" argument of
- *          PHYSFS_addToSearchPath or any of the mount functions), not the
- *          path where it is mounted in the tree (the "mountPoint" argument
- *          to any of the mount functions).
- *
 *    \param oldDir dir/archive to remove.
 *   \return nonzero on success, zero on failure. Use
 *           PHYSFS_getLastErrorCode() to obtain the specific error.
@ -3228,7 +3188,7 @@ typedef struct PHYSFS_Io


 /**
- * \fn int PHYSFS_mountIo(PHYSFS_Io *io, const char *newDir, const char *mountPoint, int appendToPath)
+ * \fn int PHYSFS_mountIo(PHYSFS_Io *io, const char *fname, const char *mountPoint, int appendToPath)
 * \brief Add an archive, built on a PHYSFS_Io, to the search path.
 *
 * \warning Unless you have some special, low-level need, you should be using
@ -3238,14 +3198,11 @@ typedef struct PHYSFS_Io
 *  instead of a pathname. Behind the scenes, PHYSFS_mount() calls this
 *  function with a physical-filesystem-based PHYSFS_Io.
 *
- * (newDir) must be a unique string to identify this archive. It is used
- *  to optimize archiver selection (if you name it XXXXX.zip, we might try
- *  the ZIP archiver first, for example, or directly choose an archiver that
- *  can only trust the data is valid by filename extension). It doesn't
- *  need to refer to a real file at all. If the filename extension isn't
- *  helpful, the system will try every archiver until one works or none
- *  of them do. This filename must be unique, as the system won't allow you
- *  to have two archives with the same name.
+ * (filename) is only used here to optimize archiver selection (if you name it
+ *  XXXXX.zip, we might try the ZIP archiver first, for example). It doesn't
+ *  need to refer to a real file at all, and can even be NULL. If the filename
+ *  isn't helpful, the system will try every archiver until one works or none
+ *  of them do.
 *
 * (io) must remain until the archive is unmounted. When the archive is
 *  unmounted, the system will call (io)->destroy(io), which will give you
@ -3254,7 +3211,7 @@ typedef struct PHYSFS_Io
 * If this function fails, (io)->destroy(io) is not called.
 *
 *   \param io i/o instance for archive to add to the path.
- *   \param newDir Filename that can represent this stream.
+ *   \param fname Filename that can represent this stream. Can be NULL.
 *   \param mountPoint Location in the interpolated tree that this archive
 *                     will be "mounted", in platform-independent notation.
 *                     NULL or "" is equivalent to "/".
@ -3267,12 +3224,12 @@ typedef struct PHYSFS_Io
 * \sa PHYSFS_getSearchPath
 * \sa PHYSFS_getMountPoint
 */
-PHYSFS_DECL int PHYSFS_mountIo(PHYSFS_Io *io, const char *newDir,
+PHYSFS_DECL int PHYSFS_mountIo(PHYSFS_Io *io, const char *fname,
                               const char *mountPoint, int appendToPath);


 /**
- * \fn int PHYSFS_mountMemory(const void *buf, PHYSFS_uint64 len, void (*del)(void *), const char *newDir, const char *mountPoint, int appendToPath)
+ * \fn int PHYSFS_mountMemory(const void *buf, PHYSFS_uint64 len, void (*del)(void *), const char *fname, const char *mountPoint, int appendToPath)
 * \brief Add an archive, contained in a memory buffer, to the search path.
 *
 * \warning Unless you have some special, low-level need, you should be using
@ -3282,14 +3239,11 @@ PHYSFS_DECL int PHYSFS_mountIo(PHYSFS_Io *io, const char *newDir,
 *  instead of a pathname. This buffer contains all the data of the archive,
 *  and is used instead of a real file in the physical filesystem.
 *
- * (newDir) must be a unique string to identify this archive. It is used
- *  to optimize archiver selection (if you name it XXXXX.zip, we might try
- *  the ZIP archiver first, for example, or directly choose an archiver that
- *  can only trust the data is valid by filename extension). It doesn't
- *  need to refer to a real file at all. If the filename extension isn't
- *  helpful, the system will try every archiver until one works or none
- *  of them do. This filename must be unique, as the system won't allow you
- *  to have two archives with the same name.
+ * (filename) is only used here to optimize archiver selection (if you name it
+ *  XXXXX.zip, we might try the ZIP archiver first, for example). It doesn't
+ *  need to refer to a real file at all, and can even be NULL. If the filename
+ *  isn't helpful, the system will try every archiver until one works or none
+ *  of them do.
 *
 * (ptr) must remain until the archive is unmounted. When the archive is
 *  unmounted, the system will call (del)(ptr), which will notify you that
@ -3302,7 +3256,7 @@ PHYSFS_DECL int PHYSFS_mountIo(PHYSFS_Io *io, const char *newDir,
 *   \param buf Address of the memory buffer containing the archive data.
 *   \param len Size of memory buffer, in bytes.
 *   \param del A callback that triggers upon unmount. Can be NULL.
- *   \param newDir Filename that can represent this stream.
+ *   \param fname Filename that can represent this stream. Can be NULL.
 *   \param mountPoint Location in the interpolated tree that this archive
 *                     will be "mounted", in platform-independent notation.
 *                     NULL or "" is equivalent to "/".
@ -3315,12 +3269,12 @@ PHYSFS_DECL int PHYSFS_mountIo(PHYSFS_Io *io, const char *newDir,
 * \sa PHYSFS_getMountPoint
 */
 PHYSFS_DECL int PHYSFS_mountMemory(const void *buf, PHYSFS_uint64 len,
-                                   void (*del)(void *), const char *newDir,
+                                   void (*del)(void *), const char *fname,
                                   const char *mountPoint, int appendToPath);


 /**
- * \fn int PHYSFS_mountHandle(PHYSFS_File *file, const char *newDir, const char *mountPoint, int appendToPath)
+ * \fn int PHYSFS_mountHandle(PHYSFS_File *file, const char *fname, const char *mountPoint, int appendToPath)
 * \brief Add an archive, contained in a PHYSFS_File handle, to the search path.
 *
 * \warning Unless you have some special, low-level need, you should be using
@ -3343,14 +3297,11 @@ PHYSFS_DECL int PHYSFS_mountMemory(const void *buf, PHYSFS_uint64 len,
 *  but isn't necessarily. The most popular use for this is likely to mount
 *  archives stored inside other archives.
 *
- * (newDir) must be a unique string to identify this archive. It is used
- *  to optimize archiver selection (if you name it XXXXX.zip, we might try
- *  the ZIP archiver first, for example, or directly choose an archiver that
- *  can only trust the data is valid by filename extension). It doesn't
- *  need to refer to a real file at all. If the filename extension isn't
- *  helpful, the system will try every archiver until one works or none
- *  of them do. This filename must be unique, as the system won't allow you
- *  to have two archives with the same name.
+ * (filename) is only used here to optimize archiver selection (if you name it
+ *  XXXXX.zip, we might try the ZIP archiver first, for example). It doesn't
+ *  need to refer to a real file at all, and can even be NULL. If the filename
+ *  isn't helpful, the system will try every archiver until one works or none
+ *  of them do.
 *
 * (file) must remain until the archive is unmounted. When the archive is
 *  unmounted, the system will call PHYSFS_close(file). If you need this
@ -3360,7 +3311,7 @@ PHYSFS_DECL int PHYSFS_mountMemory(const void *buf, PHYSFS_uint64 len,
 * If this function fails, PHYSFS_close(file) is not called.
 *
 *   \param file The PHYSFS_File handle containing archive data.
- *   \param newDir Filename that can represent this stream.
+ *   \param fname Filename that can represent this stream. Can be NULL.
 *   \param mountPoint Location in the interpolated tree that this archive
 *                     will be "mounted", in platform-independent notation.
 *                     NULL or "" is equivalent to "/".
@ -3372,7 +3323,7 @@ PHYSFS_DECL int PHYSFS_mountMemory(const void *buf, PHYSFS_uint64 len,
 * \sa PHYSFS_getSearchPath
 * \sa PHYSFS_getMountPoint
 */
-PHYSFS_DECL int PHYSFS_mountHandle(PHYSFS_File *file, const char *newDir,
+PHYSFS_DECL int PHYSFS_mountHandle(PHYSFS_File *file, const char *fname,
                                   const char *mountPoint, int appendToPath);


@ -3874,46 +3825,6 @@ PHYSFS_DECL int PHYSFS_deregisterArchiver(const char *ext);

 /* Everything above this line is part of the PhysicsFS 2.1 API. */

-
-/**
- * \fn int PHYSFS_setRoot(const char *archive, const char *subdir)
- * \brief Make a subdirectory of an archive its root directory.
- *
- * This lets you narrow down the accessible files in a specific archive. For
- *  example, if you have x.zip with a file in y/z.txt, mounted to /a, if you
- *  call PHYSFS_setRoot("x.zip", "/y"), then the call
- *  PHYSFS_openRead("/a/z.txt") will succeed.
- *
- * You can change an archive's root at any time, altering the interpolated
- *  file tree (depending on where paths shift, a different archive may be
- *  providing various files). If you set the root to NULL or "/", the
- *  archive will be treated as if no special root was set (as if the archive
- *  was just mounted normally).
- *
- * Changing the root only affects future operations on pathnames; a file
- *  that was opened from a path that changed due to a setRoot will not be
- *  affected.
- *
- * Setting a new root is not limited to archives in the search path; you may
- *  set one on the write dir, too, which might be useful if you have files
- *  open for write and thus can't change the write dir at the moment.
- *
- * It is not an error to set a subdirectory that does not exist to be the
- *  root of an archive; however, no files will be visible in this case. If
- *  the missing directories end up getting created (a mkdir to the physical
- *  filesystem, etc) then this will be reflected in the interpolated tree.
- *
- *    \param archive dir/archive on which to change root.
- *    \param subdir new subdirectory to make the root of this archive.
- *   \return nonzero on success, zero on failure. Use
- *           PHYSFS_getLastErrorCode() to obtain the specific error.
- */
-PHYSFS_DECL int PHYSFS_setRoot(const char *archive, const char *subdir);
-
-
-/* Everything above this line is part of the PhysicsFS 3.1 API. */
-
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/physfs_archiver_7z.c
+++ b/src/physfs_archiver_7z.c
@ -185,7 +185,7 @@ static int szipLoadEntries(SZIPinfo *info)
 {
    int retval = 0;

-    if (__PHYSFS_DirTreeInit(&info->tree, sizeof (SZIPentry), 1, 0))
+    if (__PHYSFS_DirTreeInit(&info->tree, sizeof (SZIPentry)))
    {
        const PHYSFS_uint32 count = info->db.NumFiles;
        PHYSFS_uint32 i;
@ -203,8 +203,6 @@ static void SZIP_closeArchive(void *opaque)
    SZIPinfo *info = (SZIPinfo *) opaque;
    if (info)
    {
-        if (info->io)
-            info->io->destroy(info->io);
        SzArEx_Free(&info->db, &SZIP_SzAlloc);
        __PHYSFS_DirTreeDeinit(&info->tree);
        allocator.Free(info);
@ -285,16 +283,13 @@ static PHYSFS_Io *SZIP_openRead(void *opaque, const char *path)
                        &blockIndex, &outBuffer, &outBufferSize, &offset,
                        &outSizeProcessed, alloc, alloc);
    GOTO_IF(rc != SZ_OK, szipErrorCode(rc), SZIP_openRead_failed);
-    GOTO_IF(outBuffer == NULL, PHYSFS_ERR_OUT_OF_MEMORY, SZIP_openRead_failed);

    io->destroy(io);
    io = NULL;

-    buf = allocator.Malloc(outSizeProcessed ? outSizeProcessed : 1);
-    GOTO_IF(buf == NULL, PHYSFS_ERR_OUT_OF_MEMORY, SZIP_openRead_failed);
-
-    if (outSizeProcessed > 0)
-        memcpy(buf, outBuffer + offset, outSizeProcessed);
+    buf = allocator.Malloc(outSizeProcessed);
+    GOTO_IF(rc != SZ_OK, PHYSFS_ERR_OUT_OF_MEMORY, SZIP_openRead_failed);
+    memcpy(buf, outBuffer + offset, outSizeProcessed);

    alloc->Free(alloc, outBuffer);
    outBuffer = NULL;
--- a/src/physfs_archiver_dir.c
+++ b/src/physfs_archiver_dir.c
@ -49,8 +49,7 @@ static void *DIR_openArchive(PHYSFS_Io *io, const char *name,
    const size_t seplen = 1;

    assert(io == NULL);  /* shouldn't create an Io for these. */
-    BAIL_IF_ERRPASS(!__PHYSFS_platformStat(name, &st, 1), NULL);
-
+    BAIL_IF_ERRPASS(!__PHYSFS_platformStat(name, &st), NULL);
    if (st.filetype != PHYSFS_FILETYPE_DIRECTORY)
        BAIL(PHYSFS_ERR_UNSUPPORTED, NULL);

@ -98,7 +97,7 @@ static PHYSFS_Io *doOpen(void *opaque, const char *name, const int mode)
    {
        const PHYSFS_ErrorCode err = PHYSFS_getLastErrorCode();
        PHYSFS_Stat statbuf;
-        __PHYSFS_platformStat(f, &statbuf, 0);  /* !!! FIXME: why are we stating here? */
+        __PHYSFS_platformStat(f, &statbuf);
        PHYSFS_setErrorCode(err);
    } /* if */

@ -165,7 +164,7 @@ static int DIR_stat(void *opaque, const char *name, PHYSFS_Stat *stat)

    CVT_TO_DEPENDENT(d, opaque, name);
    BAIL_IF_ERRPASS(!d, 0);
-    retval = __PHYSFS_platformStat(d, stat, 0);
+    retval = __PHYSFS_platformStat(d, stat);
    __PHYSFS_smallFree(d);
    return retval;
 } /* DIR_stat */
--- a/src/physfs_archiver_grp.c
+++ b/src/physfs_archiver_grp.c
@ -76,7 +76,7 @@ static void *GRP_openArchive(PHYSFS_Io *io, const char *name,
    BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &count, sizeof(count)), NULL);
    count = PHYSFS_swapULE32(count);

-    unpkarc = UNPK_openArchive(io, 0, 1);
+    unpkarc = UNPK_openArchive(io);
    BAIL_IF_ERRPASS(!unpkarc, NULL);

    if (!grpLoadEntries(io, count, unpkarc))
--- a/src/physfs_archiver_hog.c
+++ b/src/physfs_archiver_hog.c
@ -1,9 +1,9 @@
 /*
 * HOG support routines for PhysicsFS.
 *
- * This driver handles Descent I/II/III HOG archives.
+ * This driver handles Descent I/II HOG archives.
 *
- * The Descent I/II format is very simple:
+ * The format is very simple:
 *
 *   The file always starts with the 3-byte signature "DHF" (Descent
 *   HOG file). After that the files of a HOG are just attached after
@ -23,23 +23,10 @@
 *
 * (That info is from http://www.descent2.com/ddn/specs/hog/)
 *
- * Descent 3 moved to HOG2 format, which starts with the chars "HOG2",
- *  then 32-bits for the number of contained files, 32 bits for the offset
- *  to the first file's data, then 56 bytes of 0xFF (reserved?). Then for
- *  each file, there's 36 bytes for filename (null-terminated, rest of bytes
- *  are garbage), 32-bits unknown/reserved (always zero?), 32-bits of length
- *  of file data, 32-bits of time since Unix epoch. Then immediately following,
- *  for each file is their uncompressed content, you can find its offset
- *  by starting at the initial data offset and adding the filesize of each
- *  prior file.
- *
- * This information was found at:
- *  https://web.archive.org/web/20020213004051/http://descent-3.com/ddn/specs/hog/
- *
- *
 * Please see the file LICENSE.txt in the source's root directory.
 *
- * This file written by Bradley Bell and Ryan C. Gordon.
+ *  This file written by Bradley Bell.
+ *  Based on grp.c by Ryan C. Gordon.
 */

 #define __PHYSICSFS_INTERNAL__
@ -47,15 +34,7 @@

 #if PHYSFS_SUPPORTS_HOG

-static int readui32(PHYSFS_Io *io, PHYSFS_uint32 *val)
-{
-    PHYSFS_uint32 v;
-    BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &v, sizeof (v)), 0);
-    *val = PHYSFS_swapULE32(v);
-    return 1;
-} /* readui32 */
-
-static int hog1LoadEntries(PHYSFS_Io *io, void *arc)
+static int hogLoadEntries(PHYSFS_Io *io, void *arc)
 {
    const PHYSFS_uint64 iolen = io->length(io);
    PHYSFS_uint32 pos = 3;
@ -66,10 +45,11 @@ static int hog1LoadEntries(PHYSFS_Io *io, void *arc)
        char name[13];

        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, name, 13), 0);
-        BAIL_IF_ERRPASS(!readui32(io, &size), 0);
+        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &size, 4), 0);
        name[12] = '\0';  /* just in case. */
        pos += 13 + 4;

+        size = PHYSFS_swapULE32(size);
        BAIL_IF_ERRPASS(!UNPK_addEntry(arc, name, 0, -1, -1, pos, size), 0);
        pos += size;

@ -80,60 +60,24 @@ static int hog1LoadEntries(PHYSFS_Io *io, void *arc)
    return 1;
 } /* hogLoadEntries */

-static int hog2LoadEntries(PHYSFS_Io *io, void *arc)
-{
-    PHYSFS_uint32 numfiles;
-    PHYSFS_uint32 pos;
-    PHYSFS_uint32 i;
-
-    BAIL_IF_ERRPASS(!readui32(io, &numfiles), 0);
-    BAIL_IF_ERRPASS(!readui32(io, &pos), 0);
-    BAIL_IF_ERRPASS(!io->seek(io, 68), 0);  /* skip to end of header. */
-
-    for (i = 0; i < numfiles; i++) {
-        char name[37];
-        PHYSFS_uint32 reserved;
-        PHYSFS_uint32 size;
-        PHYSFS_uint32 mtime;
-        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, name, 36), 0);
-        BAIL_IF_ERRPASS(!readui32(io, &reserved), 0);
-        BAIL_IF_ERRPASS(!readui32(io, &size), 0);
-        BAIL_IF_ERRPASS(!readui32(io, &mtime), 0);
-        name[36] = '\0';  /* just in case */
-        BAIL_IF_ERRPASS(!UNPK_addEntry(arc, name, 0, mtime, mtime, pos, size), 0);
-        pos += size;
-    }
-
-    return 1;
-} /* hog2LoadEntries */
-

 static void *HOG_openArchive(PHYSFS_Io *io, const char *name,
                             int forWriting, int *claimed)
 {
    PHYSFS_uint8 buf[3];
    void *unpkarc = NULL;
-    int hog1 = 0;

    assert(io != NULL);  /* shouldn't ever happen. */
    BAIL_IF(forWriting, PHYSFS_ERR_READ_ONLY, NULL);
    BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, buf, 3), NULL);
-
-    if (memcmp(buf, "DHF", 3) == 0)
-        hog1 = 1;  /* original HOG (Descent 1 and 2) archive */
-    else
-    {
-        BAIL_IF(memcmp(buf, "HOG", 3) != 0, PHYSFS_ERR_UNSUPPORTED, NULL); /* Not HOG2 */
-        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, buf, 1), NULL);
-        BAIL_IF(buf[0] != '2', PHYSFS_ERR_UNSUPPORTED, NULL); /* Not HOG2 */
-    } /* else */
+    BAIL_IF(memcmp(buf, "DHF", 3) != 0, PHYSFS_ERR_UNSUPPORTED, NULL);

    *claimed = 1;

-    unpkarc = UNPK_openArchive(io, 0, 1);
+    unpkarc = UNPK_openArchive(io);
    BAIL_IF_ERRPASS(!unpkarc, NULL);

-    if (!(hog1 ? hog1LoadEntries(io, unpkarc) : hog2LoadEntries(io, unpkarc)))
+    if (!hogLoadEntries(io, unpkarc))
    {
        UNPK_abandonArchive(unpkarc);
        return NULL;
@ -148,7 +92,7 @@ const PHYSFS_Archiver __PHYSFS_Archiver_HOG =
    CURRENT_PHYSFS_ARCHIVER_API_VERSION,
    {
        "HOG",
-        "Descent I/II/III HOG file format",
+        "Descent I/II HOG file format",
        "Bradley Bell <btb@icculus.org>",
        "https://icculus.org/physfs/",
        0,  /* supportsSymlinks */
--- a/src/physfs_archiver_iso9660.c
+++ b/src/physfs_archiver_iso9660.c
@ -151,25 +151,18 @@ static int iso9660LoadEntries(PHYSFS_Io *io, const int joliet,

        /* recordlen = 0 -> no more entries or fill entry */
        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &recordlen, 1), 0);
-        if (recordlen > 0)
-            readpos += recordlen;  /* ready to seek to next record. */
-        else
+        if (recordlen == 0)
        {
-            PHYSFS_uint64 nextpos;
-
            /* if we are in the last sector of the directory & it's 0 -> end */
            if ((dirend - 2048) <= (readpos - 1))
                break; /* finished */

            /* else skip to the next sector & continue; */
-            nextpos = (((readpos - 1) / 2048) + 1) * 2048;
+            readpos = (((readpos - 1) / 2048) + 1) * 2048;
+            continue;
+        } /* if */

-            /* whoops, can't make forward progress! */
-            BAIL_IF(nextpos == readpos, PHYSFS_ERR_CORRUPT, 0);
-
-            readpos = nextpos;
-            continue;  /* start back at upper loop. */
-        } /* else */
+        readpos += recordlen;  /* ready to seek to next record. */

        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &extattrlen, 1), 0);
        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &extent, 4), 0);
@ -210,10 +203,6 @@ static int iso9660LoadEntries(PHYSFS_Io *io, const int joliet,
        timestamp = (PHYSFS_sint64) mktime(&t);

        extent += extattrlen;  /* skip extended attribute record. */
-
-        /* infinite loop, corrupt file? */
-        BAIL_IF((extent * 2048) == dirstart, PHYSFS_ERR_CORRUPT, 0);
-
        if (!iso9660AddEntry(io, joliet, isdir, base, fname, fnamelen,
                             timestamp, extent * 2048, datalen, unpkarc))
        {
@ -251,7 +240,7 @@ static int parseVolumeDescriptor(PHYSFS_Io *io, PHYSFS_uint64 *_rootpos,
        pos += 2048;  /* each volume descriptor is 2048 bytes */

        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &type, 1), 0);
-        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, identifier, 5), 0);
+        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &identifier, 5), 0);

        if (memcmp(identifier, "CD001", 5) != 0)  /* maybe not an iso? */
        {
@ -346,8 +335,7 @@ static void *ISO9660_openArchive(PHYSFS_Io *io, const char *filename,
    if (!parseVolumeDescriptor(io, &rootpos, &len, &joliet, claimed))
        return NULL;

-    /* !!! FIXME: check case_sensitive and only_usascii params for this archive. */
-    unpkarc = UNPK_openArchive(io, 1, 0);
+    unpkarc = UNPK_openArchive(io);
    BAIL_IF_ERRPASS(!unpkarc, NULL);

    if (!iso9660LoadEntries(io, joliet, "", rootpos, rootpos + len, unpkarc))
--- a/src/physfs_archiver_mvl.c
+++ b/src/physfs_archiver_mvl.c
@ -70,7 +70,7 @@ static void *MVL_openArchive(PHYSFS_Io *io, const char *name,
    BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &count, sizeof(count)), NULL);
    count = PHYSFS_swapULE32(count);

-    unpkarc = UNPK_openArchive(io, 0, 1);
+    unpkarc = UNPK_openArchive(io);
    BAIL_IF_ERRPASS(!unpkarc, NULL);

    if (!mvlLoadEntries(io, count, unpkarc))
--- a/src/physfs_archiver_qpak.c
+++ b/src/physfs_archiver_qpak.c
@ -86,8 +86,7 @@ static void *QPAK_openArchive(PHYSFS_Io *io, const char *name,

    BAIL_IF_ERRPASS(!io->seek(io, pos), NULL);

-    /* !!! FIXME: check case_sensitive and only_usascii params for this archive. */
-    unpkarc = UNPK_openArchive(io, 1, 0);
+    unpkarc = UNPK_openArchive(io);
    BAIL_IF_ERRPASS(!unpkarc, NULL);

    if (!qpakLoadEntries(io, count, unpkarc))
--- a/src/physfs_archiver_slb.c
+++ b/src/physfs_archiver_slb.c
@ -36,7 +36,7 @@ static int slbLoadEntries(PHYSFS_Io *io, const PHYSFS_uint32 count, void *arc)
        BAIL_IF(backslash != '\\', PHYSFS_ERR_CORRUPT, 0);

        /* read the rest of the buffer, 63 bytes */
-        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, name, 63), 0);
+        BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &name, 63), 0);
        name[63] = '\0'; /* in case the name lacks the null terminator */

        /* convert backslashes */
@ -94,8 +94,7 @@ static void *SLB_openArchive(PHYSFS_Io *io, const char *name,
    /* seek to the table of contents */
    BAIL_IF_ERRPASS(!io->seek(io, tocPos), NULL);

-    /* !!! FIXME: check case_sensitive and only_usascii params for this archive. */
-    unpkarc = UNPK_openArchive(io, 1, 0);
+    unpkarc = UNPK_openArchive(io);
    BAIL_IF_ERRPASS(!unpkarc, NULL);

    if (!slbLoadEntries(io, count, unpkarc))
--- a/src/physfs_archiver_unpacked.c
+++ b/src/physfs_archiver_unpacked.c
@ -285,12 +285,12 @@ void *UNPK_addEntry(void *opaque, char *name, const int isdir,
 } /* UNPK_addEntry */


-void *UNPK_openArchive(PHYSFS_Io *io, const int case_sensitive, const int only_usascii)
+void *UNPK_openArchive(PHYSFS_Io *io)
 {
    UNPKinfo *info = (UNPKinfo *) allocator.Malloc(sizeof (UNPKinfo));
    BAIL_IF(!info, PHYSFS_ERR_OUT_OF_MEMORY, NULL);

-    if (!__PHYSFS_DirTreeInit(&info->tree, sizeof (UNPKentry), case_sensitive, only_usascii))
+    if (!__PHYSFS_DirTreeInit(&info->tree, sizeof (UNPKentry)))
    {
        allocator.Free(info);
        return NULL;
--- a/src/physfs_archiver_vdf.c
+++ b/src/physfs_archiver_vdf.c
@ -129,8 +129,7 @@ static void *VDF_openArchive(PHYSFS_Io *io, const char *name,

    BAIL_IF_ERRPASS(!io->seek(io, rootCatOffset), NULL);

-    /* !!! FIXME: check case_sensitive and only_usascii params for this archive. */
-    unpkarc = UNPK_openArchive(io, 1, 0);
+    unpkarc = UNPK_openArchive(io);
    BAIL_IF_ERRPASS(!unpkarc, NULL);

    if (!vdfLoadEntries(io, count, vdfDosTimeToEpoch(timestamp), unpkarc))
--- a/src/physfs_archiver_wad.c
+++ b/src/physfs_archiver_wad.c
@ -95,7 +95,7 @@ static void *WAD_openArchive(PHYSFS_Io *io, const char *name,

    BAIL_IF_ERRPASS(!io->seek(io, directoryOffset), 0);

-    unpkarc = UNPK_openArchive(io, 0, 1);
+    unpkarc = UNPK_openArchive(io);
    BAIL_IF_ERRPASS(!unpkarc, NULL);

    if (!wadLoadEntries(io, count, unpkarc))
--- a/src/physfs_archiver_zip.c
+++ b/src/physfs_archiver_zip.c
@ -15,11 +15,6 @@
 #include <errno.h>
 #include <time.h>

-#if (PHYSFS_BYTEORDER == PHYSFS_LIL_ENDIAN)
-#define MINIZ_LITTLE_ENDIAN 1
-#else
-#define MINIZ_LITTLE_ENDIAN 0
-#endif
 #include "physfs_miniz.h"

 /*
@ -460,7 +455,6 @@ static PHYSFS_Io *ZIP_duplicate(PHYSFS_Io *io)
    finfo->io = zip_get_io(origfinfo->io, NULL, finfo->entry);
    GOTO_IF_ERRPASS(!finfo->io, failed);

-    initializeZStream(&finfo->stream);
    if (finfo->entry->compression_method != COMPMETH_NONE)
    {
        finfo->buffer = (PHYSFS_uint8 *) allocator.Malloc(ZIP_READBUFSIZE);
@ -573,7 +567,7 @@ static PHYSFS_sint64 zip_find_end_of_central_dir(PHYSFS_Io *io, PHYSFS_sint64 *l
        {
            if (!__PHYSFS_readAll(io, buf, maxread - 4))
                return -1;
-            memcpy(&buf[maxread - 4], extra, sizeof (extra));
+            memcpy(&buf[maxread - 4], &extra, sizeof (extra));
            totalread += maxread - 4;
        } /* if */
        else
@ -583,7 +577,7 @@ static PHYSFS_sint64 zip_find_end_of_central_dir(PHYSFS_Io *io, PHYSFS_sint64 *l
            totalread += maxread;
        } /* else */

-        memcpy(extra, buf, sizeof (extra));
+        memcpy(&extra, buf, sizeof (extra));

        for (i = maxread - 4; i > 0; i--)
        {
@ -838,10 +832,7 @@ static int zip_parse_local(PHYSFS_Io *io, ZIPentry *entry)
    BAIL_IF_ERRPASS(!readui32(io, &ui32), 0);
    BAIL_IF(ui32 != ZIP_LOCAL_FILE_SIG, PHYSFS_ERR_CORRUPT, 0);
    BAIL_IF_ERRPASS(!readui16(io, &ui16), 0);
-    /* Windows Explorer might rewrite the entire central directory, setting
-       this field to 2.0/MS-DOS for all files, so favor the local version,
-       which it leaves intact if it didn't alter that specific file. */
-    entry->version_needed = ui16;
+    BAIL_IF(ui16 != entry->version_needed, PHYSFS_ERR_CORRUPT, 0);
    BAIL_IF_ERRPASS(!readui16(io, &ui16), 0);  /* general bits. */
    BAIL_IF_ERRPASS(!readui16(io, &ui16), 0);
    BAIL_IF(ui16 != entry->compression_method, PHYSFS_ERR_CORRUPT, 0);
@ -1490,7 +1481,7 @@ static void *ZIP_openArchive(PHYSFS_Io *io, const char *name,

    if (!zip_parse_end_of_central_dir(info, &dstart, &cdir_ofs, &count))
        goto ZIP_openarchive_failed;
-    else if (!__PHYSFS_DirTreeInit(&info->tree, sizeof (ZIPentry), 1, 0))
+    else if (!__PHYSFS_DirTreeInit(&info->tree, sizeof (ZIPentry)))
        goto ZIP_openarchive_failed;

    root = (ZIPentry *) info->tree.root;
--- a/src/physfs_internal.h
+++ b/src/physfs_internal.h
@ -38,7 +38,7 @@
 #include <malloc.h>
 #endif

-#if defined(PHYSFS_PLATFORM_SOLARIS) || defined(PHYSFS_PLATFORM_LINUX)
+#ifdef PHYSFS_PLATFORM_SOLARIS
 #include <alloca.h>
 #endif

@ -69,7 +69,7 @@ extern "C" {
   All file-private symbols need to be marked "static".
   Everything shared between PhysicsFS sources needs to be in this
   file between the visibility pragma blocks. */
-#if !defined(_WIN32) && (PHYSFS_MINIMUM_GCC_VERSION(4,0) || defined(__clang__))
+#if PHYSFS_MINIMUM_GCC_VERSION(4,0) || defined(__clang__)
 #define PHYSFS_HAVE_PRAGMA_VISIBILITY 1
 #endif

@ -95,7 +95,6 @@ extern const PHYSFS_Archiver __PHYSFS_Archiver_VDF;
 /* a real C99-compliant snprintf() is in Visual Studio 2015,
   but just use this everywhere for binary compatibility. */
 #if defined(_MSC_VER)
-#include <stdarg.h>
 int __PHYSFS_msvc_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap);
 int __PHYSFS_msvc_snprintf(char *outBuf, size_t size, const char *format, ...);
 #define vsnprintf __PHYSFS_msvc_vsnprintf
@ -109,24 +108,14 @@ const void *__PHYSFS_winrtCalcPrefDir(void);
 #endif

 /* atomic operations. */
-/* increment/decrement operations return the final incremented/decremented value. */
 #if defined(_MSC_VER) && (_MSC_VER >= 1500)
 #include <intrin.h>
 __PHYSFS_COMPILE_TIME_ASSERT(LongEqualsInt, sizeof (int) == sizeof (long));
 #define __PHYSFS_ATOMIC_INCR(ptrval) _InterlockedIncrement((long*)(ptrval))
 #define __PHYSFS_ATOMIC_DECR(ptrval) _InterlockedDecrement((long*)(ptrval))
 #elif defined(__clang__) || (defined(__GNUC__) && (((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100)) >= 40100))
-#define __PHYSFS_ATOMIC_INCR(ptrval) __sync_add_and_fetch(ptrval, 1)
-#define __PHYSFS_ATOMIC_DECR(ptrval) __sync_add_and_fetch(ptrval, -1)
-#elif defined(__WATCOMC__) && defined(__386__)
-extern __inline int _xadd_watcom(volatile int *a, int v);
-#pragma aux _xadd_watcom = \
-  "lock xadd [ecx], eax" \
-  parm [ecx] [eax] \
-  value [eax] \
-  modify exact [eax];
-#define __PHYSFS_ATOMIC_INCR(ptrval) (_xadd_watcom(ptrval, 1)+1)
-#define __PHYSFS_ATOMIC_DECR(ptrval) (_xadd_watcom(ptrval, -1)-1)
+#define __PHYSFS_ATOMIC_INCR(ptrval) __sync_fetch_and_add(ptrval, 1)
+#define __PHYSFS_ATOMIC_DECR(ptrval) __sync_fetch_and_add(ptrval, -1)
 #else
 #define PHYSFS_NEED_ATOMIC_OP_FALLBACK 1
 int __PHYSFS_ATOMIC_INCR(int *ptrval);
@ -173,44 +162,35 @@ void __PHYSFS_smallFree(void *ptr);
 #define free(x) Do not use free() directly.
 /* !!! FIXME: add alloca check here. */

-
-/* by default, enable things, so builds can opt out of a few things they
-   want to avoid. But you can build with this #defined to 0 if you would
-   like to turn off everything except a handful of things you opt into. */
-#ifndef PHYSFS_SUPPORTS_DEFAULT
-#define PHYSFS_SUPPORTS_DEFAULT 1
-#endif
-
-
 #ifndef PHYSFS_SUPPORTS_ZIP
-#define PHYSFS_SUPPORTS_ZIP PHYSFS_SUPPORTS_DEFAULT
+#define PHYSFS_SUPPORTS_ZIP 1
 #endif
 #ifndef PHYSFS_SUPPORTS_7Z
-#define PHYSFS_SUPPORTS_7Z PHYSFS_SUPPORTS_DEFAULT
+#define PHYSFS_SUPPORTS_7Z 1
 #endif
 #ifndef PHYSFS_SUPPORTS_GRP
-#define PHYSFS_SUPPORTS_GRP PHYSFS_SUPPORTS_DEFAULT
+#define PHYSFS_SUPPORTS_GRP 1
 #endif
 #ifndef PHYSFS_SUPPORTS_HOG
-#define PHYSFS_SUPPORTS_HOG PHYSFS_SUPPORTS_DEFAULT
+#define PHYSFS_SUPPORTS_HOG 1
 #endif
 #ifndef PHYSFS_SUPPORTS_MVL
-#define PHYSFS_SUPPORTS_MVL PHYSFS_SUPPORTS_DEFAULT
+#define PHYSFS_SUPPORTS_MVL 1
 #endif
 #ifndef PHYSFS_SUPPORTS_WAD
-#define PHYSFS_SUPPORTS_WAD PHYSFS_SUPPORTS_DEFAULT
+#define PHYSFS_SUPPORTS_WAD 1
 #endif
 #ifndef PHYSFS_SUPPORTS_QPAK
-#define PHYSFS_SUPPORTS_QPAK PHYSFS_SUPPORTS_DEFAULT
+#define PHYSFS_SUPPORTS_QPAK 1
 #endif
 #ifndef PHYSFS_SUPPORTS_SLB
-#define PHYSFS_SUPPORTS_SLB PHYSFS_SUPPORTS_DEFAULT
+#define PHYSFS_SUPPORTS_SLB 1
 #endif
 #ifndef PHYSFS_SUPPORTS_ISO9660
-#define PHYSFS_SUPPORTS_ISO9660 PHYSFS_SUPPORTS_DEFAULT
+#define PHYSFS_SUPPORTS_ISO9660 1
 #endif
 #ifndef PHYSFS_SUPPORTS_VDF
-#define PHYSFS_SUPPORTS_VDF PHYSFS_SUPPORTS_DEFAULT
+#define PHYSFS_SUPPORTS_VDF 1
 #endif

 #if PHYSFS_SUPPORTS_7Z
@ -224,7 +204,6 @@ extern void SZIP_global_init(void);
 /* The latest supported PHYSFS_Archiver::version value. */
 #define CURRENT_PHYSFS_ARCHIVER_API_VERSION 0

-
 /* This byteorder stuff was lifted from SDL. https://www.libsdl.org/ */
 #define PHYSFS_LIL_ENDIAN  1234
 #define PHYSFS_BIG_ENDIAN  4321
@ -232,26 +211,11 @@ extern void SZIP_global_init(void);
 #ifdef __linux__
 #include <endian.h>
 #define PHYSFS_BYTEORDER  __BYTE_ORDER
-#elif defined(__OpenBSD__) || defined(__DragonFly__)
-#include <endian.h>
-#define PHYSFS_BYTEORDER  BYTE_ORDER
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
-#include <sys/endian.h>
-#define PHYSFS_BYTEORDER  BYTE_ORDER
-/* predefs from newer gcc and clang versions: */
-#elif defined(__ORDER_LITTLE_ENDIAN__) && defined(__ORDER_BIG_ENDIAN__) && defined(__BYTE_ORDER__)
-#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#define PHYSFS_BYTEORDER   PHYSFS_LIL_ENDIAN
-#elif (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-#define PHYSFS_BYTEORDER   PHYSFS_BIG_ENDIAN
-#else
-#error Unsupported endianness
-#endif /**/
-#else
+#else /* __linux__ */
 #if defined(__hppa__) || \
    defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
-    (defined(__MIPS__) && defined(__MIPSEB__)) || \
-    defined(__ppc__) || defined(__POWERPC__) || defined(__powerpc__) || defined(__PPC__) || \
+    (defined(__MIPS__) && defined(__MISPEB__)) || \
+    defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
    defined(__sparc__)
 #define PHYSFS_BYTEORDER   PHYSFS_BIG_ENDIAN
 #else
@ -339,18 +303,7 @@ char *__PHYSFS_strdup(const char *str);
 /*
 * Give a hash value for a C string (uses djb's xor hashing algorithm).
 */
-PHYSFS_uint32 __PHYSFS_hashString(const char *str);
-
-/*
- * Give a hash value for a C string (uses djb's xor hashing algorithm), case folding as it goes.
- */
-PHYSFS_uint32 __PHYSFS_hashStringCaseFold(const char *str);
-
-/*
- * Give a hash value for a C string (uses djb's xor hashing algorithm), case folding as it goes,
- *  assuming that this is only US-ASCII chars (one byte per char, only 'A' through 'Z' need folding).
- */
-PHYSFS_uint32 __PHYSFS_hashStringCaseFoldUSAscii(const char *str);
+PHYSFS_uint32 __PHYSFS_hashString(const char *str, size_t len);


 /*
@ -386,10 +339,9 @@ int __PHYSFS_readAll(PHYSFS_Io *io, void *buf, const size_t len);

 /* These are shared between some archivers. */

-/* LOTS of legacy formats that only use US ASCII, not actually UTF-8, so let them optimize here. */
-void *UNPK_openArchive(PHYSFS_Io *io, const int case_sensitive, const int only_usascii);
 void UNPK_abandonArchive(void *opaque);
 void UNPK_closeArchive(void *opaque);
+void *UNPK_openArchive(PHYSFS_Io *io);
 void *UNPK_addEntry(void *opaque, char *name, const int isdir,
                    const PHYSFS_sint64 ctime, const PHYSFS_sint64 mtime,
                    const PHYSFS_uint64 pos, const PHYSFS_uint64 len);
@ -421,13 +373,10 @@ typedef struct __PHYSFS_DirTree
    __PHYSFS_DirTreeEntry **hash;  /* all entries hashed for fast lookup. */
    size_t hashBuckets;            /* number of buckets in hash.          */
    size_t entrylen;    /* size in bytes of entries (including subclass). */
-    int case_sensitive;  /* non-zero to treat entries as case-sensitive in DirTreeFind */
-    int only_usascii;  /* non-zero to treat paths as US ASCII only (one byte per char, only 'A' through 'Z' are considered for case folding). */
 } __PHYSFS_DirTree;


-/* LOTS of legacy formats that only use US ASCII, not actually UTF-8, so let them optimize here. */
-int __PHYSFS_DirTreeInit(__PHYSFS_DirTree *dt, const size_t entrylen, const int case_sensitive, const int only_usascii);
+int __PHYSFS_DirTreeInit(__PHYSFS_DirTree *dt, const size_t entrylen);
 void *__PHYSFS_DirTreeAdd(__PHYSFS_DirTree *dt, char *name, const int isdir);
 void *__PHYSFS_DirTreeFind(__PHYSFS_DirTree *dt, const char *path);
 PHYSFS_EnumerateCallbackResult __PHYSFS_DirTreeEnumerate(void *opaque,
@ -600,12 +549,11 @@ PHYSFS_sint64 __PHYSFS_platformFileLength(void *handle);
 *
 * This needs to fill in all the fields of (stat). For fields that might not
 *  mean anything on a platform (access time, perhaps), choose a reasonable
- *  default. if (follow), we want to follow symlinks and stat what they
- *  link to and not the link itself.
+ *  default.
 *
 *  Return zero on failure, non-zero on success.
 */
-int __PHYSFS_platformStat(const char *fn, PHYSFS_Stat *stat, const int follow);
+int __PHYSFS_platformStat(const char *fn, PHYSFS_Stat *stat);

 /*
 * Flush any pending writes to disk. (opaque) should be cast to whatever data
@ -757,11 +705,6 @@ int __PHYSFS_platformGrabMutex(void *mutex);
 */
 void __PHYSFS_platformReleaseMutex(void *mutex);

-
-/* !!! FIXME: move to public API? */
-PHYSFS_uint32 __PHYSFS_utf8codepoint(const char **_str);
-
-
 #if PHYSFS_HAVE_PRAGMA_VISIBILITY
 #pragma GCC visibility pop
 #endif
--- a/src/physfs_lzmasdk.h
+++ b/src/physfs_lzmasdk.h
@ -506,7 +506,6 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem
 #endif

 #if defined(MY_CPU_AMD64) \
-    || defined(_M_ARM64) \
    || defined(_M_IA64) \
    || defined(__AARCH64EL__) \
    || defined(__AARCH64EB__)
@ -532,8 +531,6 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem

 #if defined(_WIN32) && defined(_M_ARM)
 #define MY_CPU_ARM_LE
-#elif defined(_WIN64) && defined(_M_ARM64)
-#define MY_CPU_ARM_LE
 #endif

 #if defined(_WIN32) && defined(_M_IA64)
--- a/src/physfs_miniz.h
+++ b/src/physfs_miniz.h
@ -22,14 +22,12 @@ typedef unsigned long mz_ulong;
 typedef void *(*mz_alloc_func)(void *opaque, unsigned int items, unsigned int size);
 typedef void (*mz_free_func)(void *opaque, void *address);

-#ifndef MINIZ_LITTLE_ENDIAN /* if not defined by PHYSFS */
 #if defined(_M_IX86) || defined(_M_X64)
 /* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 if integer loads and stores to unaligned addresses are acceptable on the target platform (slightly faster). */
 #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
 /* Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. */
 #define MINIZ_LITTLE_ENDIAN 1
 #endif
-#endif /**/

 #if defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__)
 /* Set MINIZ_HAS_64BIT_REGISTERS to 1 if the processor has 64-bit general purpose registers (enables 64-bit bitbuffer in inflator) */
@ -119,8 +117,6 @@ struct tinfl_decompressor_tag
 #define MZ_MAX(a,b) (((a)>(b))?(a):(b))
 #define MZ_MIN(a,b) (((a)<(b))?(a):(b))
 #define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj))
-#define MZ_CLEAR_ARR(obj) memset((obj), 0, sizeof(obj))
-#define MZ_CLEAR_PTR(obj) memset((obj), 0, sizeof(*obj))

 #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
  #define MZ_READ_LE16(p) *((const mz_uint16 *)(p))
@ -170,17 +166,13 @@ struct tinfl_decompressor_tag
    if (temp >= 0) { \
      code_len = temp >> 9; \
      if ((code_len) && (num_bits >= code_len)) \
-          break; \
+      break; \
    } else if (num_bits > TINFL_FAST_LOOKUP_BITS) { \
       code_len = TINFL_FAST_LOOKUP_BITS; \
       do { \
          temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; \
-       } while ((temp < 0) && (num_bits >= (code_len + 1))); \
-       if (temp >= 0) break; \
-    } \
-    TINFL_GET_BYTE(state_index, c); \
-    bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); \
-    num_bits += 8; \
+       } while ((temp < 0) && (num_bits >= (code_len + 1))); if (temp >= 0) break; \
+    } TINFL_GET_BYTE(state_index, c); bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); num_bits += 8; \
  } while (num_bits < 15);

 /* TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex than you would initially expect because the zlib API expects the decompressor to never read */
@ -282,13 +274,13 @@ static tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_
      else
      {
        for (counter = 0; counter < 3; counter++) { TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]); r->m_table_sizes[counter] += s_min_table_sizes[counter]; }
-        MZ_CLEAR_ARR(r->m_tables[2].m_code_size); for (counter = 0; counter < r->m_table_sizes[2]; counter++) { mz_uint s; TINFL_GET_BITS(14, s, 3); r->m_tables[2].m_code_size[s_length_dezigzag[counter]] = (mz_uint8)s; }
+        MZ_CLEAR_OBJ(r->m_tables[2].m_code_size); for (counter = 0; counter < r->m_table_sizes[2]; counter++) { mz_uint s; TINFL_GET_BITS(14, s, 3); r->m_tables[2].m_code_size[s_length_dezigzag[counter]] = (mz_uint8)s; }
        r->m_table_sizes[2] = 19;
      }
      for ( ; (int)r->m_type >= 0; r->m_type--)
      {
        int tree_next, tree_cur; tinfl_huff_table *pTable;
-        mz_uint i, j, used_syms, total, sym_index, next_code[17], total_syms[16]; pTable = &r->m_tables[r->m_type]; MZ_CLEAR_ARR(total_syms); MZ_CLEAR_ARR(pTable->m_look_up); MZ_CLEAR_ARR(pTable->m_tree);
+        mz_uint i, j, used_syms, total, sym_index, next_code[17], total_syms[16]; pTable = &r->m_tables[r->m_type]; MZ_CLEAR_OBJ(total_syms); MZ_CLEAR_OBJ(pTable->m_look_up); MZ_CLEAR_OBJ(pTable->m_tree);
        for (i = 0; i < r->m_table_sizes[r->m_type]; ++i) total_syms[pTable->m_code_size[i]]++;
        used_syms = 0, total = 0; next_code[0] = next_code[1] = 0;
        for (i = 1; i <= 15; ++i) { used_syms += total_syms[i]; next_code[i + 1] = (total = ((total + total_syms[i]) << 1)); }
@ -707,4 +699,3 @@ static int mz_inflateEnd(mz_streamp pStream)

  For more information, please refer to <https://unlicense.org/>
 */
-
--- a/src/physfs_platform_android.c
+++ b/src/physfs_platform_android.c
@ -1,117 +0,0 @@
-/*
- * Android support routines for PhysicsFS.
- *
- * Please see the file LICENSE.txt in the source's root directory.
- *
- *  This file written by Ryan C. Gordon.
- */
-
-#define __PHYSICSFS_INTERNAL__
-#include "physfs_platforms.h"
-
-#ifdef PHYSFS_PLATFORM_ANDROID
-
-#include <jni.h>
-#include <android/log.h>
-#include "physfs_internal.h"
-
-static char *prefpath = NULL;
-
-
-int __PHYSFS_platformInit(void)
-{
-    return 1;  /* always succeed. */
-} /* __PHYSFS_platformInit */
-
-
-void __PHYSFS_platformDeinit(void)
-{
-    if (prefpath)
-    {
-        allocator.Free(prefpath);
-        prefpath = NULL;
-    } /* if */
-} /* __PHYSFS_platformDeinit */
-
-
-void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data)
-{
-    /* no-op. */
-} /* __PHYSFS_platformDetectAvailableCDs */
-
-
-char *__PHYSFS_platformCalcBaseDir(const char *argv0)
-{
-    /* as a cheat, we expect argv0 to be a PHYSFS_AndroidInit* on Android. */
-    PHYSFS_AndroidInit *ainit = (PHYSFS_AndroidInit *) argv0;
-    char *retval = NULL;
-    JNIEnv *jenv = NULL;
-    jobject jcontext;
-
-    if (ainit == NULL)
-        return __PHYSFS_strdup("/");  /* oh well. */
-
-    jenv = (JNIEnv *) ainit->jnienv;
-    jcontext = (jobject) ainit->context;
-
-    if ((*jenv)->PushLocalFrame(jenv, 16) >= 0)
-    {
-        jobject jfileobj = 0;
-        jmethodID jmeth = 0;
-        jthrowable jexception = 0;
-        jstring jstr = 0;
-
-        jmeth = (*jenv)->GetMethodID(jenv, (*jenv)->GetObjectClass(jenv, jcontext), "getPackageResourcePath", "()Ljava/lang/String;");
-        jstr = (jstring)(*jenv)->CallObjectMethod(jenv, jcontext, jmeth);
-        jexception = (*jenv)->ExceptionOccurred(jenv);  /* this can't throw an exception, right? Just in case. */
-        if (jexception != NULL)
-            (*jenv)->ExceptionClear(jenv);
-        else
-        {
-            const char *path = (*jenv)->GetStringUTFChars(jenv, jstr, NULL);
-            retval = __PHYSFS_strdup(path);
-            (*jenv)->ReleaseStringUTFChars(jenv, jstr, path);
-        } /* else */
-
-        /* We only can rely on the Activity being valid during this function call,
-           so go ahead and grab the prefpath too. */
-        jmeth = (*jenv)->GetMethodID(jenv, (*jenv)->GetObjectClass(jenv, jcontext), "getFilesDir", "()Ljava/io/File;");
-        jfileobj = (*jenv)->CallObjectMethod(jenv, jcontext, jmeth);
-        if (jfileobj)
-        {
-            jmeth = (*jenv)->GetMethodID(jenv, (*jenv)->GetObjectClass(jenv, jfileobj), "getCanonicalPath", "()Ljava/lang/String;");
-            jstr = (jstring)(*jenv)->CallObjectMethod(jenv, jfileobj, jmeth);
-            jexception = (*jenv)->ExceptionOccurred(jenv);
-            if (jexception != NULL)
-                (*jenv)->ExceptionClear(jenv);
-            else
-            {
-                const char *path = (*jenv)->GetStringUTFChars(jenv, jstr, NULL);
-                const size_t len = strlen(path) + 2;
-                prefpath = allocator.Malloc(len);
-                if (prefpath)
-                    snprintf(prefpath, len, "%s/", path);
-                (*jenv)->ReleaseStringUTFChars(jenv, jstr, path);
-            } /* else */
-        } /* if */
-
-        (*jenv)->PopLocalFrame(jenv, NULL);
-    } /* if */
-
-    /* we can't return NULL because then PhysicsFS will treat argv0 as a string, but it's a non-NULL jobject! */
-    if (retval == NULL)
-        retval = __PHYSFS_strdup("/");   /* we pray this works. */
-
-    return retval;
-} /* __PHYSFS_platformCalcBaseDir */
-
-
-char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app)
-{
-    return __PHYSFS_strdup(prefpath ? prefpath : "/");
-} /* __PHYSFS_platformCalcPrefDir */
-
-#endif /* PHYSFS_PLATFORM_ANDROID */
-
-/* end of physfs_platform_android.c ... */
-
--- a/src/physfs_platform_apple.m
+++ b/src/physfs_platform_apple.m
@ -12,7 +12,6 @@
 #ifdef PHYSFS_PLATFORM_APPLE

 #include <Foundation/Foundation.h>
-#include <dlfcn.h>

 #include "physfs_internal.h"

@ -51,7 +50,7 @@ char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app)
    {
        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, TRUE);
        BAIL_IF(!paths, PHYSFS_ERR_OS_ERROR, NULL);
-        NSString *path = (NSString *) [paths objectAtIndex:0];
+        NSString *path = (NSString *) paths[0];
        BAIL_IF(!path, PHYSFS_ERR_OS_ERROR, NULL);
        size_t len = [path lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
        const size_t applen = strlen(app);
@ -100,7 +99,7 @@ static int darwinIsWholeMedia(io_service_t service)
 } /* darwinIsWholeMedia */


-static int darwinIsMountedDisc(char *bsdName, mach_port_t mainPort)
+static int darwinIsMountedDisc(char *bsdName, mach_port_t masterPort)
 {
    int retval = 0;
    CFMutableDictionaryRef matchingDict;
@ -108,10 +107,10 @@ static int darwinIsMountedDisc(char *bsdName, mach_port_t mainPort)
    io_iterator_t iter;
    io_service_t service;

-    if ((matchingDict = IOBSDNameMatching(mainPort, 0, bsdName)) == NULL)
+    if ((matchingDict = IOBSDNameMatching(masterPort, 0, bsdName)) == NULL)
        return 0;

-    rc = IOServiceGetMatchingServices(mainPort, matchingDict, &iter);
+    rc = IOServiceGetMatchingServices(masterPort, matchingDict, &iter);
    if ((rc != KERN_SUCCESS) || (!iter))
        return 0;

@ -159,25 +158,13 @@ static int darwinIsMountedDisc(char *bsdName, mach_port_t mainPort)
 void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data)
 {
 #if !defined(PHYSFS_NO_CDROM_SUPPORT)
-    /* macOS 12.0 changed "master" names to "main". */
-    typedef kern_return_t (*ioMainPortFn)(mach_port_t, mach_port_t *);
-    static ioMainPortFn ioMainPort = NULL;
    const char *devPrefix = "/dev/";
    const int prefixLen = strlen(devPrefix);
-    mach_port_t mainPort = 0;
+    mach_port_t masterPort = 0;
    struct statfs *mntbufp;
    int i, mounts;

-    if (ioMainPort == NULL)
-    {
-        ioMainPort = (ioMainPortFn) dlsym(RTLD_DEFAULT, "IOMainPort");
-        if (!ioMainPort)
-            ioMainPort = (ioMainPortFn) dlsym(RTLD_DEFAULT, "IOMasterPort");
-        if (!ioMainPort)
-            return; /* oh well, no CD-ROMs for you. */
-    } /* if */
-
-    if (ioMainPort(MACH_PORT_NULL, &mainPort) != KERN_SUCCESS)
+    if (IOMasterPort(MACH_PORT_NULL, &masterPort) != KERN_SUCCESS)
        BAIL(PHYSFS_ERR_OS_ERROR, ) /*return void*/;

    mounts = getmntinfo(&mntbufp, MNT_WAIT);  /* NOT THREAD SAFE! */
@ -189,7 +176,7 @@ void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data)
            continue;

        dev += prefixLen;
-        if (darwinIsMountedDisc(dev, mainPort))
+        if (darwinIsMountedDisc(dev, masterPort))
            cb(data, mnt);
    } /* for */
 #endif /* !defined(PHYSFS_NO_CDROM_SUPPORT) */
--- a/src/physfs_platform_os2.c
+++ b/src/physfs_platform_os2.c
@ -222,7 +222,7 @@ static char *cvtPathToCorrectCase(char *buf)
        if (ptr != NULL)  /* isolate element to find (fname is the start). */
            *ptr = '\0';

-        rc = DosFindFirst(spec, &hdir, FILE_DIRECTORY,
+        rc = DosFindFirst((unsigned char *) spec, &hdir, FILE_DIRECTORY,
                          &fb, sizeof (fb), &count, FIL_STANDARD);
        if (rc == NO_ERROR)
        {
@ -331,7 +331,7 @@ static int isCdRomDrive(ULONG drive)
    ULONG ul1, ul2;
    APIRET rc;
    HFILE hfile = NULLHANDLE;
-    char drivename[3] = { 0, ':', '\0' };
+    unsigned char drivename[3] = { 0, ':', '\0' };

    drivename[0] = 'A' + drive;

@ -443,7 +443,7 @@ PHYSFS_EnumerateCallbackResult __PHYSFS_platformEnumerate(const char *dirname,
    __PHYSFS_smallFree(utf8);
    BAIL_IF_ERRPASS(!cpspec, PHYSFS_ENUM_ERROR);

-    rc = DosFindFirst(cpspec, &hdir,
+    rc = DosFindFirst((unsigned char *) cpspec, &hdir,
                      FILE_DIRECTORY | FILE_ARCHIVED |
                      FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM,
                      &fb, sizeof (fb), &count, FIL_STANDARD);
@ -535,7 +535,7 @@ int __PHYSFS_platformMkDir(const char *filename)
    APIRET rc;
    char *cpstr = cvtUtf8ToCodepage(filename);
    BAIL_IF_ERRPASS(!cpstr, 0);
-    rc = DosCreateDir(cpstr, NULL);
+    rc = DosCreateDir((unsigned char *) cpstr, NULL);
    allocator.Free(cpstr);
    BAIL_IF(rc != NO_ERROR, errcodeFromAPIRET(rc), 0);
    return 1;
@ -721,7 +721,7 @@ PHYSFS_sint64 os2TimeToUnixTime(const FDATE *date, const FTIME *time)
 } /* os2TimeToUnixTime */


-int __PHYSFS_platformStat(const char *filename, PHYSFS_Stat *stat, const int follow)
+int __PHYSFS_platformStat(const char *filename, PHYSFS_Stat *stat)
 {
    char *cpfname = cvtUtf8ToCodepage(filename);
    FILESTATUS3 fs;
--- a/src/physfs_platform_posix.c
+++ b/src/physfs_platform_posix.c
@ -6,6 +6,8 @@
 *  This file written by Ryan C. Gordon.
 */

+/* !!! FIXME: check for EINTR? */
+
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_platforms.h"

@ -155,41 +157,19 @@ int __PHYSFS_platformMkDir(const char *path)
 } /* __PHYSFS_platformMkDir */


-#if !defined(O_CLOEXEC) && defined(FD_CLOEXEC)
-static inline void set_CLOEXEC(int fildes)
-{
-    int flags = fcntl(fildes, F_GETFD);
-    if (flags != -1) {
-        fcntl(fildes, F_SETFD, flags | FD_CLOEXEC);
-    }
-}
-#endif
-
 static void *doOpen(const char *filename, int mode)
 {
    const int appending = (mode & O_APPEND);
    int fd;
    int *retval;
-
    errno = 0;

    /* O_APPEND doesn't actually behave as we'd like. */
    mode &= ~O_APPEND;

-#ifdef O_CLOEXEC
-    /* Add O_CLOEXEC if defined */
-    mode |= O_CLOEXEC;
-#endif
-
-    do {
-        fd = open(filename, mode, S_IRUSR | S_IWUSR);
-    } while ((fd < 0) && (errno == EINTR));
+    fd = open(filename, mode, S_IRUSR | S_IWUSR);
    BAIL_IF(fd < 0, errcodeFromErrno(), NULL);

-#if !defined(O_CLOEXEC) && defined(FD_CLOEXEC)
-    set_CLOEXEC(fd);
-#endif
-
    if (appending)
    {
        if (lseek(fd, 0, SEEK_END) < 0)
@ -239,9 +219,7 @@ PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer,
    if (!__PHYSFS_ui64FitsAddressSpace(len))
        BAIL(PHYSFS_ERR_INVALID_ARGUMENT, -1);

-    do {
-        rc = read(fd, buffer, (size_t) len);
-    } while ((rc == -1) && (errno == EINTR));
+    rc = read(fd, buffer, (size_t) len);
    BAIL_IF(rc == -1, errcodeFromErrno(), -1);
    assert(rc >= 0);
    assert(rc <= len);
@ -258,9 +236,7 @@ PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer,
    if (!__PHYSFS_ui64FitsAddressSpace(len))
        BAIL(PHYSFS_ERR_INVALID_ARGUMENT, -1);

-    do {
-        rc = write(fd, (void *) buffer, (size_t) len);
-    } while ((rc == -1) && (errno == EINTR));
+    rc = write(fd, (void *) buffer, (size_t) len);
    BAIL_IF(rc == -1, errcodeFromErrno(), rc);
    assert(rc >= 0);
    assert(rc <= len);
@ -299,13 +275,8 @@ PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque)
 int __PHYSFS_platformFlush(void *opaque)
 {
    const int fd = *((int *) opaque);
-    int rc = -1;
-    if ((fcntl(fd, F_GETFL) & O_ACCMODE) != O_RDONLY) {
-        do {
-            rc = fsync(fd);
-        } while ((rc == -1) && (errno == EINTR));
-        BAIL_IF(rc == -1, errcodeFromErrno(), 0);
-    }
+    if ((fcntl(fd, F_GETFL) & O_ACCMODE) != O_RDONLY)
+        BAIL_IF(fsync(fd) == -1, errcodeFromErrno(), 0);
    return 1;
 } /* __PHYSFS_platformFlush */

@ -313,10 +284,7 @@ int __PHYSFS_platformFlush(void *opaque)
 void __PHYSFS_platformClose(void *opaque)
 {
    const int fd = *((int *) opaque);
-    int rc = -1;
-    do {
-        rc = close(fd);  /* we don't check this. You should have used flush! */
-    } while ((rc == -1) && (errno == EINTR));
+    (void) close(fd);  /* we don't check this. You should have used flush! */
    allocator.Free(opaque);
 } /* __PHYSFS_platformClose */

@ -328,11 +296,11 @@ int __PHYSFS_platformDelete(const char *path)
 } /* __PHYSFS_platformDelete */


-int __PHYSFS_platformStat(const char *fname, PHYSFS_Stat *st, const int follow)
+int __PHYSFS_platformStat(const char *filename, PHYSFS_Stat *st)
 {
    struct stat statbuf;
-    const int rc = follow ? stat(fname, &statbuf) : lstat(fname, &statbuf);
-    BAIL_IF(rc == -1, errcodeFromErrno(), 0);
+
+    BAIL_IF(lstat(filename, &statbuf) == -1, errcodeFromErrno(), 0);

    if (S_ISREG(statbuf.st_mode))
    {
@ -362,7 +330,7 @@ int __PHYSFS_platformStat(const char *fname, PHYSFS_Stat *st, const int follow)
    st->createtime = statbuf.st_ctime;
    st->accesstime = statbuf.st_atime;

-    st->readonly = (access(fname, W_OK) == -1);
+    st->readonly = (access(filename, W_OK) == -1);
    return 1;
 } /* __PHYSFS_platformStat */

--- a/src/physfs_platform_unix.c
+++ b/src/physfs_platform_unix.c
@ -261,6 +261,12 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0)
        if (sysctl(mib, 4, fullpath, &buflen, NULL, 0) != -1)
            retval = __PHYSFS_strdup(fullpath);
    }
+    #elif defined(PHYSFS_PLATFORM_SOLARIS)
+    {
+        const char *path = getexecname();
+        if ((path != NULL) && (path[0] == '/'))  /* must be absolute path... */
+            retval = __PHYSFS_strdup(path);
+    }
    #endif

    /* If there's a Linux-like /proc filesystem, you can get the full path to
@ -272,7 +278,6 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0)
        retval = readSymLink("/proc/self/exe");
        if (!retval) retval = readSymLink("/proc/curproc/file");
        if (!retval) retval = readSymLink("/proc/curproc/exe");
-        if (!retval) retval = readSymLink("/proc/self/path/a.out");
        if (retval == NULL)
        {
            /* older kernels don't have /proc/self ... try PID version... */
@ -284,15 +289,6 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0)
        } /* if */
    } /* if */

-    #if defined(PHYSFS_PLATFORM_SOLARIS)
-    if (!retval)  /* try getexecname() if /proc didn't pan out. This may not be an absolute path! */
-    {
-        const char *path = getexecname();
-        if ((path != NULL) && (path[0] == '/'))  /* must be absolute path... */
-            retval = __PHYSFS_strdup(path);
-    } /* if */
-    #endif
-
    if (retval != NULL)  /* chop off filename. */
    {
        char *ptr = strrchr(retval, '/');
--- a/src/physfs_platform_windows.c
+++ b/src/physfs_platform_windows.c
@ -101,7 +101,7 @@ static char *unicodeToUtf8Heap(const WCHAR *w_str)

 static inline HANDLE winFindFirstFileW(const WCHAR *path, LPWIN32_FIND_DATAW d)
 {
-    #if defined(PHYSFS_PLATFORM_WINRT) || (_WIN32_WINNT >= 0x0501) // Windows XP+
+    #ifdef PHYSFS_PLATFORM_WINRT
    return FindFirstFileExW(path, FindExInfoStandard, d,
                            FindExSearchNameMatch, NULL, 0);
    #else
@ -111,7 +111,7 @@ static inline HANDLE winFindFirstFileW(const WCHAR *path, LPWIN32_FIND_DATAW d)

 static inline BOOL winInitializeCriticalSection(LPCRITICAL_SECTION lpcs)
 {
-    #if defined(PHYSFS_PLATFORM_WINRT) || (_WIN32_WINNT >= 0x0600) // Windows Vista+
+    #ifdef PHYSFS_PLATFORM_WINRT
    return InitializeCriticalSectionEx(lpcs, 2000, 0);
    #else
    InitializeCriticalSection(lpcs);
@ -123,7 +123,7 @@ static inline HANDLE winCreateFileW(const WCHAR *wfname, const DWORD mode,
                                    const DWORD creation)
 {
    const DWORD share = FILE_SHARE_READ | FILE_SHARE_WRITE;
-    #if defined(PHYSFS_PLATFORM_WINRT) || (_WIN32_WINNT >= 0x0602) // Windows 8+
+    #ifdef PHYSFS_PLATFORM_WINRT
    return CreateFile2(wfname, mode, share, creation, NULL);
    #else
    return CreateFileW(wfname, mode, share, NULL, creation,
@ -134,7 +134,7 @@ static inline HANDLE winCreateFileW(const WCHAR *wfname, const DWORD mode,
 static BOOL winSetFilePointer(HANDLE h, const PHYSFS_sint64 pos,
                              PHYSFS_sint64 *_newpos, const DWORD whence)
 {
-    #if defined(PHYSFS_PLATFORM_WINRT) || (_WIN32_WINNT >= 0x0501) // Windows XP+
+    #ifdef PHYSFS_PLATFORM_WINRT
    LARGE_INTEGER lipos;
    LARGE_INTEGER linewpos;
    BOOL rc;
@ -158,7 +158,7 @@ static BOOL winSetFilePointer(HANDLE h, const PHYSFS_sint64 pos,

 static PHYSFS_sint64 winGetFileSize(HANDLE h)
 {
-    #if defined(PHYSFS_PLATFORM_WINRT) || (_WIN32_WINNT >= 0x0600) // Windows Vista+
+    #ifdef PHYSFS_PLATFORM_WINRT
    FILE_STANDARD_INFO info;
    const BOOL rc = GetFileInformationByHandleEx(h, FileStandardInfo,
                                                 &info, sizeof (info));
@ -566,26 +566,18 @@ char *__PHYSFS_platformCalcUserDir(void)
    else
    {
        DWORD psize = 0;
+        WCHAR dummy = 0;
        LPWSTR wstr = NULL;
        BOOL rc = 0;

        /*
         * Should fail. Will write the size of the profile path in
         *  psize. Also note that the second parameter can't be
-         *  NULL or the function fails on Windows XP, but has to be NULL on
-         *  Windows 10 or it will fail.  :(
+         *  NULL or the function fails.
         */
-        rc = pGetDir(accessToken, NULL, &psize);
+        rc = pGetDir(accessToken, &dummy, &psize);
        GOTO_IF(rc, PHYSFS_ERR_OS_ERROR, done);  /* should have failed! */

-        if (psize == 0)  /* probably on Windows XP, try a different way. */
-        {
-            WCHAR x = 0;
-            rc = pGetDir(accessToken, &x, &psize);
-            GOTO_IF(rc, PHYSFS_ERR_OS_ERROR, done);  /* should have failed! */
-            GOTO_IF(!psize, PHYSFS_ERR_OS_ERROR, done);  /* Uhoh... */
-        } /* if */
-
        /* Allocate memory for the profile directory */
        wstr = (LPWSTR) __PHYSFS_smallAlloc((psize + 1) * sizeof (WCHAR));
        if (wstr != NULL)
@ -968,7 +960,7 @@ static int isSymlink(const WCHAR *wpath, const DWORD attr)
 } /* isSymlink */


-int __PHYSFS_platformStat(const char *filename, PHYSFS_Stat *st, const int follow)
+int __PHYSFS_platformStat(const char *filename, PHYSFS_Stat *st)
 {
    WIN32_FILE_ATTRIBUTE_DATA winstat;
    WCHAR *wstr = NULL;
@ -983,7 +975,7 @@ int __PHYSFS_platformStat(const char *filename, PHYSFS_Stat *st, const int follo
    if (!rc)
        err = GetLastError();
    else  /* check for symlink while wstr is still available */
-        issymlink = !follow && isSymlink(wstr, winstat.dwFileAttributes);
+        issymlink = isSymlink(wstr, winstat.dwFileAttributes);

    __PHYSFS_smallFree(wstr);
    BAIL_IF(!rc, errcodeFromWinApiError(err), 0);
--- a/src/physfs_platforms.h
+++ b/src/physfs_platforms.h
@ -40,11 +40,11 @@
 #  define PHYSFS_PLATFORM_POSIX 1
 #elif defined(macintosh)
 #  error Classic Mac OS support was dropped from PhysicsFS 2.0. Move to OS X.
-#elif defined(__ANDROID__)
- #  define PHYSFS_PLATFORM_LINUX 1
- #  define PHYSFS_PLATFORM_ANDROID 1
- #  define PHYSFS_PLATFORM_POSIX 1
- #  define PHYSFS_NO_CDROM_SUPPORT 1
+#elif defined(ANDROID)
+#  define PHYSFS_PLATFORM_LINUX 1
+#  define PHYSFS_PLATFORM_UNIX 1
+#  define PHYSFS_PLATFORM_POSIX 1
+#  define PHYSFS_NO_CDROM_SUPPORT 1
 #elif defined(__linux)
 #  define PHYSFS_PLATFORM_LINUX 1
 #  define PHYSFS_PLATFORM_UNIX 1
--- a/src/physfs_unicode.c
+++ b/src/physfs_unicode.c
@ -21,8 +21,8 @@
 /*
 * This may not be the best value, but it's one that isn't represented
 *  in Unicode (0x10FFFF is the largest codepoint value). We return this
- *  value from __PHYSFS_utf8codepoint() if there's bogus bits in the
- *  stream. __PHYSFS_utf8codepoint() will turn this value into something
+ *  value from utf8codepoint() if there's bogus bits in the
+ *  stream. utf8codepoint() will turn this value into something
 *  reasonable (like a question mark), for text that wants to try to recover,
 *  whereas utf8valid() will use the value to determine if a string has bad
 *  bits.
@ -35,7 +35,7 @@
 */
 #define UNICODE_BOGUS_CHAR_CODEPOINT '?'

-PHYSFS_uint32 __PHYSFS_utf8codepoint(const char **_str)
+static PHYSFS_uint32 utf8codepoint(const char **_str)
 {
    const char *str = *_str;
    PHYSFS_uint32 retval = 0;
@ -188,11 +188,6 @@ PHYSFS_uint32 __PHYSFS_utf8codepoint(const char **_str)
    } /* else if */

    return UNICODE_BOGUS_CHAR_VALUE;
-} /* __PHYSFS_utf8codepoint */
-
-static inline PHYSFS_uint32 utf8codepoint(const char **_str)
-{
-    return __PHYSFS_utf8codepoint(_str);
 } /* utf8codepoint */

 static PHYSFS_uint32 utf16codepoint(const PHYSFS_uint16 **_str)
@ -215,7 +210,7 @@ static PHYSFS_uint32 utf16codepoint(const PHYSFS_uint16 **_str)
        else
        {
            src++;  /* eat the other surrogate. */
-            cp = 0x10000 + (((cp - 0xD800) << 10) | (pair - 0xDC00));
+            cp = (((cp - 0xD800) << 10) | (pair - 0xDC00));
        } /* else */
    } /* else if */

@ -243,7 +238,7 @@ void PHYSFS_utf8ToUcs4(const char *src, PHYSFS_uint32 *dst, PHYSFS_uint64 len)
    len -= sizeof (PHYSFS_uint32);   /* save room for null char. */
    while (len >= sizeof (PHYSFS_uint32))
    {
-        PHYSFS_uint32 cp = __PHYSFS_utf8codepoint(&src);
+        PHYSFS_uint32 cp = utf8codepoint(&src);
        if (cp == 0)
            break;
        else if (cp == UNICODE_BOGUS_CHAR_VALUE)
@ -261,7 +256,7 @@ void PHYSFS_utf8ToUcs2(const char *src, PHYSFS_uint16 *dst, PHYSFS_uint64 len)
    len -= sizeof (PHYSFS_uint16);   /* save room for null char. */
    while (len >= sizeof (PHYSFS_uint16))
    {
-        PHYSFS_uint32 cp = __PHYSFS_utf8codepoint(&src);
+        PHYSFS_uint32 cp = utf8codepoint(&src);
        if (cp == 0)
            break;
        else if (cp == UNICODE_BOGUS_CHAR_VALUE)
@ -283,7 +278,7 @@ void PHYSFS_utf8ToUtf16(const char *src, PHYSFS_uint16 *dst, PHYSFS_uint64 len)
    len -= sizeof (PHYSFS_uint16);   /* save room for null char. */
    while (len >= sizeof (PHYSFS_uint16))
    {
-        PHYSFS_uint32 cp = __PHYSFS_utf8codepoint(&src);
+        PHYSFS_uint32 cp = utf8codepoint(&src);
        if (cp == 0)
            break;
        else if (cp == UNICODE_BOGUS_CHAR_VALUE)
--- a/test/test_physfs.c
+++ b/test/test_physfs.c
@ -31,7 +31,7 @@
 #include "physfs.h"

 #define TEST_VERSION_MAJOR  3
-#define TEST_VERSION_MINOR  3
+#define TEST_VERSION_MINOR  0
 #define TEST_VERSION_PATCH  0

 static FILE *history_file = NULL;
@ -288,53 +288,6 @@ static int cmd_getmountpoint(char *args)
    return 1;
 } /* cmd_getmountpoint */

-
-static int cmd_setroot(char *args)
-{
-    char *archive;
-    char *subdir;
-    char *ptr;
-
-    archive = args;
-    if (*archive == '\"')
-    {
-        archive++;
-        ptr = strchr(archive, '\"');
-        if (ptr == NULL)
-        {
-            printf("missing string terminator in argument.\n");
-            return 1;
-        } /* if */
-        *(ptr) = '\0';
-    } /* if */
-    else
-    {
-        ptr = strchr(archive, ' ');
-        *ptr = '\0';
-    } /* else */
-
-    subdir = ptr + 1;
-    if (*subdir == '\"')
-    {
-        subdir++;
-        ptr = strchr(subdir, '\"');
-        if (ptr == NULL)
-        {
-            printf("missing string terminator in argument.\n");
-            return 1;
-        } /* if */
-        *(ptr) = '\0';
-    } /* if */
-
-    if (PHYSFS_setRoot(archive, subdir))
-        printf("Successful.\n");
-    else
-        printf("Failure. reason: %s.\n", PHYSFS_getLastError());
-
-    return 1;
-} /* cmd_setroot */
-
-
 static int cmd_removearchive(char *args)
 {
    if (*args == '\"')
@ -1387,7 +1340,6 @@ static const command_info commands[] =
    { "stressbuffer",   cmd_stressbuffer,   1, "<bufferSize>"               },
    { "crc32",          cmd_crc32,          1, "<fileToHash>"               },
    { "getmountpoint",  cmd_getmountpoint,  1, "<dir>"                      },
-    { "setroot",        cmd_setroot,        2, "<archiveLocation> <root>"   },
    { NULL,             NULL,              -1, NULL                         }
 };