diff --git a/.buildconfig b/.buildconfig
index d364fdcd5..6e888f1d9 100644
--- a/.buildconfig
+++ b/.buildconfig
@@ -1,4 +1,6 @@
-PG_VERSION=16.4
+PG_VERSION=REL_16_STABLE
 SDK_VERSION=3.1.74.2bi
 WASI_SDK_VERSION=24.0.5
 SDKROOT=/opt/python-wasm-sdk
+PG_GIT_COMMIT=8e6af359aabdf0b687dfdb8e42b489fb7d27ce0a
+COPTS="-O2 -g0"
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 6ed238e68..013c6ec0f 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -207,7 +207,7 @@ jobs:
 
       - name: Build demo site
         run: |
-          NO_SDK_CHECK=true SDKROOT=/opt/python-wasm-sdk bash ./cibuild.sh demo-site
+          bash ./cibuild/demo-site.sh
 
       - name: Build docs
         working-directory: ./docs
diff --git a/.github/workflows/build_wasm_postgres.yml b/.github/workflows/build_wasm_postgres.yml
index 2739f8660..295b5c03e 100644
--- a/.github/workflows/build_wasm_postgres.yml
+++ b/.github/workflows/build_wasm_postgres.yml
@@ -19,13 +19,13 @@ jobs:
       SDKROOT: /opt/python-wasm-sdk
       SYS_PYTHON: /usr/bin/python3
       PGROOT: /tmp/pglite
-      TOTAL_MEMORY: 128MB
+      TOTAL_MEMORY: 192MB
       CMA_MB: 16
-      DEBUG: false
       OBJDUMP: true
       contrib: contrib
       extra: extra
       EXTRA_EXT: vector
+      DEBUG: false
 
     steps:
       - uses: actions/checkout@v4
@@ -84,6 +84,11 @@ jobs:
         run: |
           bash ./cibuild.sh linkweb
 
+      - name: Build and Link postgres WASI for wasi/native
+        if: steps.cache-restore.outputs.cache-hit != 'true'
+        run: |
+          bash ./extra/native/wip.sh
+
       - name: Copy release for PGlite build
         run: |
           bash ./cibuild.sh pglite-prep
diff --git a/cibuild.sh b/cibuild.sh
index aca25ef9a..695e421dc 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+#set -x;
+#set -e;
+
 # data transfer zone this is == (wire query size + result size ) + 2
 # expressed in EMSDK MB
 export CMA_MB=${CMA_MB:-64}
@@ -10,9 +13,8 @@ chmod +x ./extra/*.sh cibuild/*.sh
 
 . .buildconfig
 
-export PG_VERSION SDK_VERSION WASI_SDK_VERSION SDKROOT
+export PG_VERSION SDK_VERSION WASI_SDK_VERSION SDKROOT COPTS
 
-export PG_VERSION=${PG_VERSION:-16.4}
 export WORKSPACE=${GITHUB_WORKSPACE:-$(pwd)}
 export PGROOT=${PGROOT:-/tmp/pglite}
 export WEBROOT=${WEBROOT:-/tmp/web}
@@ -30,10 +32,10 @@ EOE=false
 
 if ./cibuild/sdk.sh
 then
-    echo "sdk check passed (emscripten)"
+    echo "sdk check passed (emscripten+wasi)"
 else
     echo sdk failed
-    exit 44
+    exit 39
 fi
 
 
@@ -82,8 +84,39 @@ System node/pnpm ( may interfer) :
 if ${WASI:-false}
 then
     echo "Wasi build (experimental)"
-    . /opt/python-wasm-sdk/wasm32-wasi-shell.sh
+    export WASI_SDK=24.0
+    export WASI_SDK_PREFIX=/opt/python-wasm-sdk/wasisdk/wasi-sdk-${WASI_SDK}-x86_64-linux
+    export WASI_SYSROOT=${WASI_SDK_PREFIX}/share/wasi-sysroot
 
+    if [ -f ${WASI_SYSROOT}/extra ]
+    then
+        echo -n
+    else
+        pushd ${WASI_SYSROOT}
+            VMLABS="https://github.com/vmware-labs/webassembly-language-runtimes/releases/download"
+            wget -q "${VMLABS}/libs%2Flibpng%2F1.6.39%2B20230629-ccb4cb0/libpng-1.6.39-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
+            wget -q "${VMLABS}/libs%2Fzlib%2F1.2.13%2B20230623-2993864/libz-1.2.13-wasi-sdk-20.0.tar.gz"  -O-| tar xfz -
+            wget -q "${VMLABS}/libs%2Fsqlite%2F3.42.0%2B20230623-2993864/libsqlite-3.42.0-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
+            wget -q "${VMLABS}/libs%2Flibxml2%2F2.11.4%2B20230623-2993864/libxml2-2.11.4-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
+            wget -q "${VMLABS}/libs%2Fbzip2%2F1.0.8%2B20230623-2993864/libbzip2-1.0.8-wasi-sdk-20.0.tar.gz"  -O-| tar xfz -
+            wget -q "${VMLABS}/libs%2Flibuuid%2F1.0.3%2B20230623-2993864/libuuid-1.0.3-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
+        popd
+        touch ${WASI_SYSROOT}/extra
+    fi
+
+
+    if false
+    then
+        . /opt/python-wasm-sdk/wasisdk/wasisdk_env.sh
+        env|grep WASI
+        export CC=${WASI_SDK_DIR}/bin/clang
+        export CPP=${WASI_SDK_DIR}/bin/clang-cpp
+        export CXX=${WASI_SDK_DIR}/bin/clang++
+        export CFLAGS="-D_WASI_EMULATED_SIGNAL"
+        export LDFLAGS="-lwasi-emulated-signal"
+    else
+        . ${SDKROOT}/wasm32-wasi-shell.sh
+    fi
 else
     if which emcc
     then
@@ -173,6 +206,8 @@ if $OBJDUMP
 then
     mkdir -p patches/imports patches/imports.pgcore
 else
+    mkdir -p patches/imports
+    touch patches/imports/plpgsql
     echo "
 
     WARNING:    wasm-objdump not found or OBJDUMP disabled, some extensions may not load properly
@@ -231,9 +266,10 @@ END
     fi
 
     mkdir -p ${PGROOT}/include/postgresql/server
-    cp ${PG_DEBUG_HEADER} ${PGROOT}/include/
-    cp ${PG_DEBUG_HEADER} ${PGROOT}/include/postgresql
-    cp ${PG_DEBUG_HEADER} ${PGROOT}/include/postgresql/server
+    for dest in ${PGROOT}/include ${PGROOT}/include/postgresql ${PGROOT}/include/postgresql/server
+    do
+        [ -f $dest/pg_debug.h ] || cp ${PG_DEBUG_HEADER} $dest/
+    done
 
     # store all pg options that have impact on cmd line initdb/boot
     cat > ${PGROOT}/pgopts.sh <<END
@@ -279,16 +315,23 @@ END
     # to get same path for wasm shared link tools in the path
     # for extensions building.
     # we always symlink in-tree build to "postgresql" folder
-    if echo $PG_VERSION|grep -q ^16
+    if echo $PG_VERSION|grep -q git
     then
-        . cibuild/pg-16.x.sh
-    else
+        echo "building from git"
         . cibuild/pg-git.sh
+    else
+        echo "  * building from stable repo"
+        . cibuild/pg-16.x.sh
     fi
 
-    # install emsdk-shared along with pg config  tool
-    # for building user ext.
-    cp build/postgres/bin/emsdk-shared $PGROOT/bin/
+#    # install emsdk-shared along with pg config  tool
+#    # for building user ext.
+#    if [ -f $PGROOT/bin/emsdk-shared ]
+#    then
+#        echo emsdk-shared already installed
+#    else
+#        cp -vf build/postgres/bin/emsdk-shared $PGROOT/bin/
+#    fi
 
     export PGLITE=$(pwd)/packages/pglite
 
@@ -318,14 +361,26 @@ export PATH=${WORKSPACE}/build/postgres/bin:${PGROOT}/bin:$PATH
 
 if echo " $*"|grep -q " contrib"
 then
-    # TEMP FIX for SDK
-    SSL_INCDIR=$EMSDK/upstream/emscripten/cache/sysroot/include/openssl
-    [ -f $SSL_INCDIR/evp.h ] || ln -s $PREFIX/include/openssl $SSL_INCDIR
-    SKIP="\
+
+    if $WASI
+    then
+        echo " ========= TODO WASI openssl ============== "
+        SKIP="\
  [\
  sslinfo bool_plperl hstore_plperl hstore_plpython jsonb_plperl jsonb_plpython\
  ltree_plpython sepgsql bool_plperl start-scripts\
+ pgcrypto uuid-ossp xml2\
  ]"
+    else
+        # TEMP FIX for SDK
+        SSL_INCDIR=$EMSDK/upstream/emscripten/cache/sysroot/include/openssl
+        [ -f $SSL_INCDIR/evp.h ] || ln -s $PREFIX/include/openssl $SSL_INCDIR
+        SKIP="\
+ [\
+ sslinfo bool_plperl hstore_plperl hstore_plpython jsonb_plperl jsonb_plpython\
+ ltree_plpython sepgsql bool_plperl start-scripts\
+ ]"
+    fi
 
     for extdir in postgresql/contrib/*
     do
@@ -479,19 +534,6 @@ ________________________________________________________________________________
 
                 mv $packed /tmp/sdk/pg${PG_VERSION}-${packed}
 
-                # for repl demo
-#                mkdir -p /tmp/web/pglite
-
-                #cp -r ${PGLITE}/dist ${WEBROOT}/pglite/
-                #cp -r ${PGLITE}/examples ${WEBROOT}/pglite/
-
-#                for dir in /tmp/web ${WEBROOT}/pglite/examples
-#                do
-#                    pushd "$dir"
-#                    cp ${PGLITE}/dist/postgres.data ./
-#                    popd
-#                done
-
                 echo "<html>
                 <body>
                     <ul>
@@ -518,7 +560,7 @@ ________________________________________________________________________________
                 tar -cpRz ${PGROOT} > /tmp/sdk/pglite-pg${PG_VERSION}.tar.gz
 
                 # build sdk (node)
-                cp /tmp/sdk/postgres-${PG_VERSION}.tar.gz ${WEBROOT}/
+                cp /tmp/sdk/postgres-${PG_VERSION}-*.tar.gz ${WEBROOT}/
 
                 # pglite (web)
                 cp /tmp/sdk/pglite-pg${PG_VERSION}.tar.gz ${WEBROOT}/
@@ -560,18 +602,7 @@ ________________________________________________________________________________
         ;;
 
         demo-site) echo "==================== demo-site =========================="
-            # Move all existing files to a subfolder
-            mkdir -p /tmp/web/x-term-repl
-            mv /tmp/web/* /tmp/web/x-term-repl/
-
-            mkdir -p /tmp/web/dist
-            mkdir -p /tmp/web/examples
-            mkdir -p /tmp/web/benchmark
-
-            PGLITE=$(pwd)/packages/pglite
-            cp -r ${PGLITE}/dist/* /tmp/web/dist/
-            cp -r ${PGLITE}/examples/* /tmp/web/examples/
-            cp -r ${WORKSPACE}/packages/benchmark/dist/* /tmp/web/benchmark/
+            ./cibuild/demo-site.sh
         ;;
     esac
     shift
diff --git a/cibuild/demo-site.sh b/cibuild/demo-site.sh
new file mode 100755
index 000000000..2586a6f35
--- /dev/null
+++ b/cibuild/demo-site.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Move all existing files to a subfolder
+mkdir -p /tmp/web/x-term-repl
+mv /tmp/web/* /tmp/web/x-term-repl/
+
+mkdir -p /tmp/web/dist
+mkdir -p /tmp/web/examples
+mkdir -p /tmp/web/benchmark
+
+PGLITE=$(pwd)/packages/pglite
+cp -r ${PGLITE}/dist/* /tmp/web/dist/
+cp -r ${PGLITE}/examples/* /tmp/web/examples/
+cp -r ${WORKSPACE:-$GITHUB_WORKSPACE}/packages/benchmark/dist/* /tmp/web/benchmark/
+
diff --git a/cibuild/linkimports.sh b/cibuild/linkimports.sh
index 0f706f2ae..217027580 100755
--- a/cibuild/linkimports.sh
+++ b/cibuild/linkimports.sh
@@ -8,6 +8,7 @@ echo "============= link imports : begin ==============="
 
 pushd ${WORKSPACE}
     > patches/imports/pgcore
+
     for extra_pg_so in $(find $PGROOT/lib/postgresql/|grep \.so$)
     do
         SOBASE=patches/imports.pgcore/$(basename $extra_pg_so .so)
@@ -50,6 +51,7 @@ matches = list( imports.intersection(exports) )
 
 # ?
 for sym in """
+_ErrorContext
 _check_function_bodies
 _clock_gettime
 _CurrentMemoryContext
@@ -61,9 +63,7 @@ _interactive_read
 _interactive_write
 _lowerstr
 _main
-_main_repl
 _pg_initdb
-_pg_repl_raf
 _pg_shutdown
 _readstoplist
 _searchstoplist
@@ -76,8 +76,6 @@ _TopMemoryContext
     if sym and not sym in matches:
         matches.append(sym)
 
-#__ZNSt13runtime_errorD1Ev
-
 matches.sort()
 
 for sym in matches:
diff --git a/cibuild/linkwasi.sh b/cibuild/linkwasi.sh
index b17980553..046412fbd 100755
--- a/cibuild/linkwasi.sh
+++ b/cibuild/linkwasi.sh
@@ -2,11 +2,11 @@
 . /opt/python-wasm-sdk/wasisdk/wasisdk_env.sh
 # dlfcn emulation
 
-WASI_CFLAGS="-DPATCH_PG_DEBUG=/tmp/pglite/include/pg_debug.h -DPREFIX=/tmp/pglite -DPYDK=1" wasi-c -fPIC \
+WASI_CFLAGS="-DPATCH_PG_DEBUG=/tmp/pglite/include/pg_debug.h -DPREFIX=${PGROOT} -DPYDK=1" wasi-c -fPIC \
  -Ipostgresql/src/include \
  -Ipostgresql/src/backend \
  -c -o build/postgres/wasi_dlfcn.o \
- -Ibuild/postgres/src/include patches/wasi_dlfcn.c || exit 8
+ -Ibuild/postgres/src/include patches/wasi_dlfcn.c || exit 9
 
 #  -L./build/postgres/src/backend/snowball -ldict_snowball
 # ./build/postgres/src/backend/snowball/dict_snowball.o
@@ -789,11 +789,12 @@ $CC -o postgres \
  -Wl,--export=loop \
  -Wl,--export=interactive_one \
  -Wl,--export=use_socketfile \
+ -Wl,--export=use_wire \
  -Wl,--export=interactive_write \
  -Wl,--export=interactive_read \
  -Wl,--global-base=33333333
 
-cp -vf postgres postgres.wasi || exit 192
+cp -vf postgres postgres.wasi || exit 796
 #cp -vf postgres.wasi /tmp/pglite/bin/postgres.wasi
 
 popd
diff --git a/cibuild/linkweb.sh b/cibuild/linkweb.sh
index 6cf6c893b..3e0bf6324 100755
--- a/cibuild/linkweb.sh
+++ b/cibuild/linkweb.sh
@@ -99,10 +99,10 @@ pushd src/backend
     if ${PGES6:-true}
     then
         # es6
-        MODULE="$LDEBUG --closure 0 -sMODULARIZE=1 -sEXPORT_ES6=1 -sEXPORT_NAME=Module"
-        export COPTS="-O2 -g0"
+        MODULE="$LDEBUG -sMODULARIZE=1 -sEXPORT_ES6=1 -sEXPORT_NAME=Module"
+        export COPTS=${COPTS:-"-O2 -g0"}
     else
-        export COPTS="-O0 -g3"
+        export COPTS="-O2 -g3"
         # local debug always fast build
         MODULE="-sMODULARIZE=0 -sEXPORT_ES6=0"
     fi
@@ -193,7 +193,7 @@ _________________________________________________________
     # LINKER="-sMAIN_MODULE=1 -sEXPORTED_FUNCTIONS=@exports"
 
 
-    emcc $EMCC_WEB $LINKER $MODULE  \
+    emcc $EMCC_WEB $LINKER $MODULE --closure 0 \
      -sTOTAL_MEMORY=${TOTAL_MEMORY} -sSTACK_SIZE=4MB -sGLOBAL_BASE=${CMA_MB}MB \
      -fPIC -D__PYDK__=1 -DPREFIX=${PGROOT} \
      -sALLOW_TABLE_GROWTH -sALLOW_MEMORY_GROWTH -sERROR_ON_UNDEFINED_SYMBOLS -sASSERTIONS=0 \
diff --git a/cibuild/pack_extension.py b/cibuild/pack_extension.py
index 79b26640f..7f95b55e5 100644
--- a/cibuild/pack_extension.py
+++ b/cibuild/pack_extension.py
@@ -73,6 +73,9 @@ async def archive(target_folder):
                 if asp.startswith('/base/'):
                     continue
 
+                if asp.startswith('/dump.'):
+                    continue
+
                 fp = PGROOT / asp[1:]
                 if fp.is_symlink():
                     continue
@@ -107,8 +110,8 @@ async def archive(target_folder):
 print("="*80)
 
 if not EXTNAME:
-    print("ERROR: no new installed extension found, is it builtin ?")
-    sys.exit(105)
+    print("MAYBE ERROR: no new installed extension found, is it builtin ?")
+    sys.exit(0)
 
 print(f"""
 PG installed in : {PGROOT=}
diff --git a/cibuild/pg-16.x.sh b/cibuild/pg-16.x.sh
index a576580d6..d643c334c 100755
--- a/cibuild/pg-16.x.sh
+++ b/cibuild/pg-16.x.sh
@@ -1,46 +1,37 @@
-ARCHIVE=postgresql-${PG_VERSION}.tar.gz
-
-if echo ${PG_VERSION} | grep -q 16.5
-then
-    PG_PREREL=true
-    ARCHIVE_URL=https://github.com/postgres/postgres/archive/refs/tags/REL_16_5.tar.gz
-else
-    PG_PREREL=false
-    ARCHIVE_URL=https://ftp.postgresql.org/pub/source/v${PG_VERSION}/${ARCHIVE}
-fi
-
-
 if [ -f postgresql/postgresql-${PG_VERSION}.patched ]
 then
-    echo "
-
-    Version ${PG_VERSION} already selected and patch stage already done
-
-"
+    echo version already selected and patch stage already done
 else
-    [ -f ${ARCHIVE} ] || wget -q -c -O${ARCHIVE} ${ARCHIVE_URL}
-
-    tar xfz ${ARCHIVE}
-
-    if $PG_PREREL
-    then
-        ln -sf $(pwd)/postgres-REL_16_? postgresql-${PG_VERSION}
-    fi
+    git clone --no-tags --depth 1 --single-branch --branch ${PG_VERSION} https://github.com/electric-sql/postgres-pglite postgresql-${PG_VERSION}
 
     if pushd postgresql-${PG_VERSION}
     then
             echo
-        > ./src/template/emscripten
-        > ./src/include/port/emscripten.h
-        > ./src/makefiles/Makefile.emscripten
+        touch ./src/template/emscripten
+        touch ./src/include/port/emscripten.h
+        touch ./src/include/port/wasi.h
+        touch ./src/include/port/wasm_common.h
+        touch ./src/makefiles/Makefile.emscripten
         for patchdir in \
+            postgresql-debug \
             postgresql-emscripten \
-            postgresql-wasm postgresql-wasm-${PG_VERSION} \
-            postgresql-pglite postgresql-pglite-${PG_VERSION}
+            postgresql-pglite
         do
             if [ -d ../patches/$patchdir ]
             then
-                cat ../patches/$patchdir/*.diff | patch -p1 || exit 24
+                for one in ../patches/$patchdir/*.diff
+                do
+                    if cat $one | patch -p1
+                    then
+                        echo applied $one
+                    else
+                        echo "
+
+Fatal: failed to apply patch : $one
+"
+                        exit 30
+                    fi
+                done
             fi
         done
         touch postgresql-${PG_VERSION}.patched
@@ -48,23 +39,21 @@ else
     fi
 
     # either a submodule dir or a symlink.
-    # release only use symlink
+    # currently release only use symlink
+    [ -f postgresql/configure ] && rm postgresql 2>/dev/null
 
-    rm postgresql 2>/dev/null
-    ln -s postgresql-${PG_VERSION} postgresql
+    # do nothing if it is a submodule
+    [ -d postgresql ] || ln -s postgresql-${PG_VERSION} postgresql
 
 fi
 
-export PGSRC=$(realpath postgresql-${PG_VERSION})
+export PGSRC=$(realpath postgresql)
 
 if [ -f ${PGROOT}/pg.installed ]
 then
-    echo "
-        skipping pg build, using previous install because ${PGROOT}/pg.installed
-
-"
+    echo "skipping pg build, using previous install from ${PGROOT}"
 else
-    echo "Building $ARCHIVE (patched) from $PGSRC"
+    echo "Building $ARCHIVE (patched) from $PGSRC WASI=$WASI"
     . cibuild/pgbuild.sh
 fi
 
diff --git a/cibuild/pg-git.sh b/cibuild/pg-git.sh
index 879f76b74..beb7d0950 100755
--- a/cibuild/pg-git.sh
+++ b/cibuild/pg-git.sh
@@ -27,8 +27,8 @@ else
 
     # either a submodule dir or a symlink.
     # release only use symlink
+    [ -f postgresql/configure ] && rm postgresql 2>/dev/null
 
-    rm postgresql 2>/dev/null
     ln -s postgresql-${PG_VERSION} postgresql
 
 fi
@@ -42,7 +42,35 @@ else
     if $WASI
     then
 
-    CNF="${PGSRC}/configure --prefix=${PGROOT} \
+        cat > $PGROOT/bin/wasi-shared <<END
+#!/bin/bash
+echo "[\$(pwd)] $0 \$@" >> /tmp/disable-shared.log
+# shared build
+echo ===================================================================================
+wasi-c -L${PREFIX}/lib -DPREFIX=${PGROOT} -shared \$@ -Wno-unused-function
+echo ===================================================================================
+END
+
+        chmod +x $PGROOT/bin/wasi-shared
+        chmod +x $PGROOT/bin/wasi-shared $PGROOT/bin/emsdk-shared
+
+        # for zic and emsdk-shared/wasi-shared called from makefile
+        export PATH=$(pwd)/bin:$PGROOT/bin:$PATH
+
+        FLAGS="${CC_PGLITE} -DPREFIX=${PGROOT} -DPYDK=1 -Wno-declaration-after-statement -Wno-macro-redefined -Wno-unused-function -Wno-missing-prototypes -Wno-incompatible-pointer-types"
+        echo "
+
+WASI_CFLAGS=$FLAGS
+
+
+TODO: wasi zic
+
+
+"
+
+        read
+
+        CNF="${PGSRC}/configure --prefix=${PGROOT} \
  --disable-spinlocks --disable-atomics \
  --without-zlib --disable-largefile --without-llvm \
  --without-pam --disable-largefile --without-zlib --with-openssl=no \
@@ -50,22 +78,24 @@ else
  ${PGDEBUG}"
 
 #  --cache-file=${PGROOT}/config.cache.wasi
-    if \
-     ZIC=/usr/sbin/zic \
-     CC=wasi-c \
-     CXX=wasi-c++ \
-     CONFIG_SITE=${PGDATA}/config.site \
-     $CNF \
-     --host=$(arch) --target=wasm32-unknown-wasi --with-template=wasi
-    then
-        echo configure ok
-        make -j 1
-    else
-        echo configure failed
-        exit 57
-    fi
+#  -lwasi-emulated-mman -lwasi-emulated-signal -lwasi-emulated-process-clocks"
 
-        read
+        if \
+         LDFLAGS="-lwasi-emulated-getpid -lwasi-emulated-mman -lwasi-emulated-signal -lwasi-emulated-process-clocks" \
+         CFLAGS="$FLAGS -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_GETPID" \
+         ZIC=/usr/sbin/zic \
+         CC=wasi-c \
+         CXX=wasi-c++ \
+         CONFIG_SITE=${PGDATA}/config.site \
+         $CNF \
+         --host=$(arch) --target=wasm32-unknown-wasi --with-template=wasi
+        then
+            echo configure ok
+            make -j 1
+        else
+            echo configure failed
+            exit 57
+        fi
 
     else
         echo "Building $ARCHIVE (patched) from $PGSRC"
diff --git a/cibuild/pgbuild.sh b/cibuild/pgbuild.sh
index 8e3e01aa1..742fb7104 100755
--- a/cibuild/pgbuild.sh
+++ b/cibuild/pgbuild.sh
@@ -6,8 +6,8 @@ pgbuild:begin
 
 CC_PGLITE=$CC_PGLITE
 
-"
 
+"
 
     mkdir -p build/postgres
     pushd build/postgres
@@ -40,7 +40,10 @@ CC_PGLITE=$CC_PGLITE
         XML2=""
         UUID=""
         BUILD=wasi
-        export MAIN_MODULE="-lwasi-emulated-getpid -lwasi-emulated-mman -lwasi-emulated-signal -lwasi-emulated-process-clocks"
+        export WASI_CFLAGS="${CC_PGLITE} -DPREFIX=${PGROOT} -DPYDK=1 -Wno-declaration-after-statement -Wno-macro-redefined -Wno-unused-function -Wno-missing-prototypes -Wno-incompatible-pointer-types"
+        WASM_LDFLAGS="-lwasi-emulated-getpid -lwasi-emulated-mman -lwasi-emulated-signal -lwasi-emulated-process-clocks"
+        WASM_CFLAGS="-D_WASI_EMULATED_MMAN -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_GETPID"
+        export MAIN_MODULE=""
     else
         # --with-libxml does not fit with --without-zlib
         if $CI
@@ -52,11 +55,11 @@ CC_PGLITE=$CC_PGLITE
         fi
         UUID="--with-uuid=ossp"
         BUILD=emscripten
+        WASM_CFLAGS=""
+        WASM_LDFLAGS=""
         export MAIN_MODULE="-sMAIN_MODULE=1"
     fi
 
-
-
     export XML2_CONFIG=$PREFIX/bin/xml2-config
     export ZIC=$(pwd)/bin/zic
 
@@ -92,6 +95,7 @@ CC_PGLITE=$CC_PGLITE
 
     if $WASI
     then
+
         export EXT=wasi
         cat > ${PGROOT}/config.site <<END
 ac_cv_exeext=.wasi
@@ -121,7 +125,12 @@ END
         fi
     fi
 
-    if EM_PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig CONFIG_SITE=${PGROOT}/config.site emconfigure $CNF --with-template=$BUILD
+    if \
+     EM_PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" \
+     CONFIG_SITE="${PGROOT}/config.site" \
+     CFLAGS="$WASM_CFLAGS" \
+     LDFLAGS="$WASM_LDFLAGS" \
+     emconfigure $CNF --with-template=$BUILD
     then
         echo configure ok
     else
@@ -187,15 +196,14 @@ END
     EMCC_ENV="${EMCC_NODE} -sERROR_ON_UNDEFINED_SYMBOLS"
 
     # PREFIX only required for static initdb
-    EMCC_CFLAGS="-sERROR_ON_UNDEFINED_SYMBOLS=1 ${CC_PGLITE} -DPREFIX=${PGROOT} -Wno-macro-redefined -Wno-unused-function"
-
-    WASI_CFLAGS="${CC_PGLITE} -DPREFIX=${PGROOT} -DPYDK=1 -Wno-declaration-after-statement -Wno-macro-redefined -Wno-unused-function -Wno-missing-prototypes -Wno-incompatible-pointer-types"
+    EMCC_CFLAGS="-sERROR_ON_UNDEFINED_SYMBOLS=1 ${CC_PGLITE} -DPREFIX=${PGROOT} -Wno-macro-redefined -Wno-unused-function -Wno-missing-prototypes"
 
     ZIC=${ZIC:-$(realpath bin/zic)}
 
-
-
-	if EMCC_CFLAGS="${EMCC_ENV} ${EMCC_CFLAGS}" WASI_CFLAGS="$WASI_CFLAGS" emmake make $BUILD=1 -j $(nproc) 2>&1 > /tmp/build.log
+	if \
+     EMCC_CFLAGS="${EMCC_ENV} ${EMCC_CFLAGS}" \
+     WASI_CFLAGS="$WASI_CFLAGS" \
+     emmake make $BUILD=1 -j $(nproc) 2>&1 > /tmp/build.log
 	then
         echo build ok
         if $WASI
@@ -215,7 +223,11 @@ END
             if $WASI
             then
                 # remove unlinked server
-                rm src/backend/postgres src/backend/postgres.wasi $PGROOT/bin/postgres $PGROOT/bin/postgres.wasi
+                for todel in src/backend/postgres src/backend/postgres.wasi $PGROOT/bin/postgres $PGROOT/bin/postgres.wasi
+                do
+                    [ -f $todel ] && rm $todel
+                done
+
                 pushd ../..
                     chmod +x ./cibuild/linkwasi.sh
                     WASI_CFLAGS="$WASI_CFLAGS" ./cibuild/linkwasi.sh || exit 190
@@ -240,7 +252,7 @@ END
         else
             cat /tmp/install.log
             echo "install failed"
-            exit 225
+            exit 247
         fi
     else
         cat /tmp/build.log
@@ -276,25 +288,31 @@ END
     then
         echo pg_config installed
     else
-        echo "pg_config build failed"; exit 243
+        echo "pg_config build failed"; exit 283
     fi
 
-    cat > ${PGROOT}/bin/pg_config <<END
+    if $WASI
+    then
+        echo "TODO:  wasi-run wrappers for bin/*"
+        cat > ${PGROOT}/bin/pg_config <<END
+#!/bin/bash
+$(which wasi-run) ${PGROOT}/bin/pg_config.wasi \$@
+END
+
+    else
+        cat > ${PGROOT}/bin/pg_config <<END
 #!/bin/bash
 $(which node) ${PGROOT}/bin/pg_config.cjs \$@
 END
 
-    cat  > ${PGROOT}/postgres <<END
+        cat  > ${PGROOT}/postgres <<END
 #!/bin/bash
 . /opt/python-wasm-sdk/wasm32-bi-emscripten-shell.sh
 TZ=UTC PGTZ=UTC PGDATA=${PGDATA} $(which node) ${PGROOT}/bin/postgres.cjs \$@
 END
 
-# remove the abort but stall prompt
-#  2>&1 | grep --line-buffered -v ^var\\ Module
-
-    # force node wasm version
-    cp -vf ${PGROOT}/postgres ${PGROOT}/bin/postgres
+        # force node wasm version
+        cp -vf ${PGROOT}/postgres ${PGROOT}/bin/postgres
 
 	cat  > ${PGROOT}/initdb <<END
 #!/bin/bash
@@ -302,55 +320,59 @@ END
 TZ=UTC PGTZ=UTC $(which node) ${PGROOT}/bin/initdb.cjs \$@
 END
 
-    chmod +x ${PGROOT}/postgres ${PGROOT}/bin/postgres
-	chmod +x ${PGROOT}/initdb ${PGROOT}/bin/initdb
+        chmod +x ${PGROOT}/postgres ${PGROOT}/bin/postgres
+    	# chmod +x ${PGROOT}/initdb ${PGROOT}/bin/initdb
+
+
+
+    fi
 
     # for extensions building
     chmod +x ${PGROOT}/bin/pg_config
 
 
-	echo "initdb for PGDATA=${PGDATA} "
+	echo "TODO: node/wasi cmdline initdb for PGDATA=${PGDATA} "
 
     # create empty db hack
 
-	cat >$PGROOT/initdb.sh <<END
-#!/bin/bash
-rm -rf ${PGDATA} /tmp/initdb-* ${PGROOT}/wal/*
-export TZ=UTC
-export PGTZ=UTC
-SQL=/tmp/initdb-\$\$
-# TODO: --waldir=${PGROOT}/wal
-> /tmp/initdb.txt
+#	cat >$PGROOT/initdb.sh <<END
+##!/bin/bash
+#rm -rf ${PGDATA} /tmp/initdb-* ${PGROOT}/wal/*
+#export TZ=UTC
+#export PGTZ=UTC
+#SQL=/tmp/initdb-\$\$
+## TODO: --waldir=${PGROOT}/wal
+#> /tmp/initdb.txt
 
-${PGROOT}/initdb --no-clean --wal-segsize=1 -g $LANG $CRED --pgdata=${PGDATA}
+#${PGROOT}/initdb --no-clean --wal-segsize=1 -g $LANG $CRED --pgdata=${PGDATA}
 
-mv /tmp/initdb.boot.txt \${SQL}.boot.sql
-mv /tmp/initdb.single.txt \${SQL}.single.sql
+#mv /tmp/initdb.boot.txt \${SQL}.boot.sql
+#mv /tmp/initdb.single.txt \${SQL}.single.sql
 
-if \${CI:-false}
-then
-    cp -vf \$SQL ${PGROOT}/\$(md5sum \$SQL|cut -c1-32).sql
-fi
+#if \${CI:-false}
+#then
+#    cp -vf \$SQL ${PGROOT}/\$(md5sum \$SQL|cut -c1-32).sql
+#fi
 
-# --wal-segsize=1  -> -X 1048576
+## --wal-segsize=1  -> -X 1048576
 
-# CKSUM_B -k --data-checksums
-# 2024-04-24 05:53:28.121 GMT [42] WARNING:  page verification failed, calculated checksum 5487 but expected 0
-# 2024-04-24 05:53:28.121 GMT [42] FATAL:  invalid page in block 0 of relation base/1/1259
+## CKSUM_B -k --data-checksums
+## 2024-04-24 05:53:28.121 GMT [42] WARNING:  page verification failed, calculated checksum 5487 but expected 0
+## 2024-04-24 05:53:28.121 GMT [42] FATAL:  invalid page in block 0 of relation base/1/1259
 
-CMD="${PGROOT}/postgres --boot -D ${PGDATA} -d 3 $PGOPTS -X 1048576"
-echo "\$CMD < \$SQL.boot.sql"
-\$CMD < \$SQL.boot.sql 2>&1 \\
- | grep -v --line-buffered 'bootstrap> boot' \\
- | grep -v --line-buffered 'index'
+#CMD="${PGROOT}/postgres --boot -D ${PGDATA} -d 3 $PGOPTS -X 1048576"
+#echo "\$CMD < \$SQL.boot.sql"
+#\$CMD < \$SQL.boot.sql 2>&1 \\
+# | grep -v --line-buffered 'bootstrap> boot' \\
+# | grep -v --line-buffered 'index'
 
-echo "
+#echo "
 
-\$(md5sum /tmp/initdb-\$\$.*.sql)
+#\$(md5sum /tmp/initdb-\$\$.*.sql)
 
-    boot done
-"
-END
+#    boot done
+#"
+#END
 
     popd
 echo "pgbuild:end
diff --git a/extra/native/sdk-fix.tar b/extra/native/sdk-fix.tar
new file mode 100644
index 000000000..465c06afc
Binary files /dev/null and b/extra/native/sdk-fix.tar differ
diff --git a/extra/native/wip.sh b/extra/native/wip.sh
new file mode 100755
index 000000000..2bec5ba73
--- /dev/null
+++ b/extra/native/wip.sh
@@ -0,0 +1,30 @@
+reset
+export SDKROOT=${SDKROOT:-/opt/python-wasm-sdk}
+
+export CI=${CI:-true}
+export PGVERSION=${PGVERSION:-16.4}
+
+
+export WASI=true
+export contrib=false
+export extra=false
+export DEBUG=true
+export OBJDUMP=false
+
+rm -rf /tmp/pglite/pg.installed /tmp/pglite/bin/*.wasi build/postgres /tmp/pglite/base
+echo cleaned !
+
+export DEBUG=${DEBUG:-false}
+export EXTRA_EXT=${EXTRA_EXT:-"vector postgis"}
+
+. /opt/python-wasm-sdk/wasisdk/wasisdk_env.sh
+
+# node linkweb pglite-prep pglite
+if ./cibuild.sh ${contrib:-contrib} ${extra:-extra}
+then
+    echo NO WEB RUNTIME
+else
+    echo FAILED
+fi
+
+# WASMTIME_BACKTRACE_DETAILS=1 wasi-run /tmp/pglite/bin/postgres.wasi --single postgres
diff --git a/patches/emsdk_port.c b/patches/emsdk_port.c
new file mode 100644
index 000000000..8138b60e5
--- /dev/null
+++ b/patches/emsdk_port.c
@@ -0,0 +1,40 @@
+#include "postgres.h"
+
+#include <stdio.h> // FILE+fprintf
+#include <string.h> // strlen
+extern FILE* IDB_PIPE_FP;
+extern FILE* SOCKET_FILE;
+extern int SOCKET_DATA;
+extern int IDB_STAGE;
+
+static inline int
+ends_with(const char *str, const char *suffix)
+{
+    if (!str || !suffix)
+        return 0;
+    size_t lenstr = strlen(str);
+    size_t lensuffix = strlen(suffix);
+    if (lensuffix >  lenstr)
+        return 0;
+    return strncmp(str + lenstr - lensuffix, suffix, lensuffix) == 0;
+}
+
+EMSCRIPTEN_KEEPALIVE FILE *
+pg_popen(const char *command, const char *type) {
+    if ( ends_with(command,"-V") || (IDB_STAGE>1)) {
+    	fprintf(stderr,"# emsdk-popen[%s] STUB\n", command);
+    	return stderr;
+    }
+
+    if (!IDB_STAGE) {
+        fprintf(stderr,"# emsdk-popen[%s] (BOOT)\n", command);
+        IDB_PIPE_FP = fopen( IDB_PIPE_BOOT, "w");
+        IDB_STAGE = 1;
+    } else {
+        fprintf(stderr,"# emsdk-popen[%s] (SINGLE)\n", command);
+        IDB_PIPE_FP = fopen( IDB_PIPE_SINGLE, "w");
+        IDB_STAGE = 2;
+    }
+
+    return IDB_PIPE_FP;
+}
diff --git a/patches/exports/pglite b/patches/exports/pglite
index f2a5c83c1..947ec3379 100644
--- a/patches/exports/pglite
+++ b/patches/exports/pglite
@@ -86,6 +86,7 @@ _EncodeTimeOnly
 _EndCopyFrom
 _EnsurePortalSnapshotExists
 _EnterParallelMode
+_ErrorContext
 _ExecAsyncRequestDone
 _ExecAsyncRequestPending
 _ExecAsyncResponse
@@ -591,86 +592,62 @@ __ZNKSt3__211unique_lockINS_5mutexEE9owns_lockB8nn180100Ev
 __ZNKSt3__212__do_message7messageEi
 __ZNKSt3__212__no_destroyINS_6localeEE5__getB8nn180100Ev
 __ZNKSt3__212bad_weak_ptr4whatEv
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE12find_last_ofEPKcmm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE13__get_pointerB8nn180100Ev
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE13find_first_ofEPKcmm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE13get_allocatorB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE14__annotate_newB8nn180100Em
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE14__get_long_capB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE15__addr_in_rangeB8nn180100IcEEbRKT_
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE15__get_long_sizeB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE16__get_short_sizeB8nn180100Ev
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE16find_last_not_ofEPKcmm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE17__annotate_deleteB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE17__annotate_shrinkB8nn180100Em
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE17find_first_not_ofEPKcmm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE18__get_long_pointerB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE19__annotate_increaseB8nn180100Em
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE19__get_short_pointerB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE20__throw_length_errorB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE20__throw_out_of_rangeB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE21__make_const_iteratorB8nn180100EPKc
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE2atEm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE3endB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4backB8nn180100Ev
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4copyEPcmm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4dataB8nn180100Ev
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4findEPKcmm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4findEcm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4sizeB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5beginB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5emptyB8nn180100Ev
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5rfindEPKcmm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5rfindEcm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6lengthB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7__allocB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7compareB8nn180100INS_17basic_string_viewIcS2_EETnNS_9enable_ifIXaasr33__can_be_converted_to_string_viewIcS2_T_EE5valuentsr17__is_same_uncvrefISA_S5_EE5valueEiE4typeELi0EEEimmRKSA_mm
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7compareEPKc
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7compareEmmPKc
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7compareEmmPKcm
-__ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7compareEmmRKS5_mm
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE8capacityB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE8max_sizeB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE9__is_longB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEcvNS_17basic_string_viewIcS2_EEB8nn180100Ev
 __ZNKSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEixB8nn180100Em
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE12find_last_ofEPKwmm
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE13__get_pointerB8nn180100Ev
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE13find_first_ofEPKwmm
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE14__annotate_newB8nn180100Em
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE14__get_long_capB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE15__addr_in_rangeB8nn180100IwEEbRKT_
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE15__get_long_sizeB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE16__get_short_sizeB8nn180100Ev
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE16find_last_not_ofEPKwmm
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE17__annotate_deleteB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE17__annotate_shrinkB8nn180100Em
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE17find_first_not_ofEPKwmm
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE18__get_long_pointerB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE19__annotate_increaseB8nn180100Em
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE19__get_short_pointerB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE20__throw_length_errorB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE20__throw_out_of_rangeB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE21__make_const_iteratorB8nn180100EPKw
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE2atEm
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE3endB8nn180100Ev
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE4copyEPwmm
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE4dataB8nn180100Ev
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE4findEPKwmm
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE4findEwm
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE4sizeB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE5beginB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE5c_strB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE5emptyB8nn180100Ev
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE5rfindEPKwmm
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE5rfindEwm
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7__allocB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7compareB8nn180100INS_17basic_string_viewIwS2_EETnNS_9enable_ifIXaasr33__can_be_converted_to_string_viewIwS2_T_EE5valuentsr17__is_same_uncvrefISA_S5_EE5valueEiE4typeELi0EEEimmRKSA_mm
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7compareEPKw
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7compareEmmPKw
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7compareEmmPKwm
-__ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7compareEmmRKS5_mm
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE8capacityB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE8max_sizeB8nn180100Ev
 __ZNKSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE9__is_longB8nn180100Ev
@@ -835,8 +812,10 @@ __ZNKSt3__216reverse_iteratorIPNS_17basic_string_viewIcNS_11char_traitsIcEEEEE4b
 __ZNKSt3__216reverse_iteratorIPNS_17basic_string_viewIcNS_11char_traitsIcEEEEEdeB8nn180100Ev
 __ZNKSt3__216reverse_iteratorIPNS_4pairINS_17basic_string_viewIcNS_11char_traitsIcEEEENS_4__fs10filesystem12PathPartKindEEEE4baseB8nn180100Ev
 __ZNKSt3__216reverse_iteratorIPNS_4pairINS_17basic_string_viewIcNS_11char_traitsIcEEEENS_4__fs10filesystem12PathPartKindEEEEdeB8nn180100Ev
+__ZNKSt3__216reverse_iteratorIPNS_4pairINS_17basic_string_viewIcNS_11char_traitsIcEEEENS_4__fs10filesystem12PathPartKindEEEEptB8nn180100EvQoo12is_pointer_vIT_ErQSC__XcldtfpK_onptEE
 __ZNKSt3__216reverse_iteratorIPNS_4pairIPNS_18condition_variableEPNS_5mutexEEEE4baseB8nn180100Ev
 __ZNKSt3__216reverse_iteratorIPNS_4pairIPNS_18condition_variableEPNS_5mutexEEEEdeB8nn180100Ev
+__ZNKSt3__216reverse_iteratorIPNS_4pairIPNS_18condition_variableEPNS_5mutexEEEEptB8nn180100EvQoo12is_pointer_vIT_ErQS9__XcldtfpK_onptEE
 __ZNKSt3__216reverse_iteratorIPPNS_17__assoc_sub_stateEE4baseB8nn180100Ev
 __ZNKSt3__216reverse_iteratorIPPNS_17__assoc_sub_stateEEdeB8nn180100Ev
 __ZNKSt3__216reverse_iteratorIPPNS_6locale5facetEE4baseB8nn180100Ev
@@ -1051,14 +1030,18 @@ __ZNKSt3__24__fs10filesystem4path8filenameB8nn180100Ev
 __ZNKSt3__24__fs10filesystem4path9extensionB8nn180100Ev
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerINS1_4pathEE11report_implERKNS_10error_codeEPKcPv
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerINS1_4pathEE6reportERKNS_10error_codeE
+__ZNKSt3__24__fs10filesystem6detail12ErrorHandlerINS1_4pathEE6reportERKNS_10error_codeEPKcz
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerINS1_4pathEE6reportERKNS_4errcE
+__ZNKSt3__24__fs10filesystem6detail12ErrorHandlerINS1_4pathEE6reportERKNS_4errcEPKcz
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerINS_6chrono10time_pointINS1_16_FilesystemClockENS4_8durationInNS_5ratioILx1ELx1000000000EEEEEEEE6reportERKNS_10error_codeE
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerINS_6chrono10time_pointINS1_16_FilesystemClockENS4_8durationInNS_5ratioILx1ELx1000000000EEEEEEEE6reportERKNS_4errcE
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerIbE11report_implERKNS_10error_codeEPKcPv
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerIbE6reportERKNS_10error_codeE
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerIbE6reportERKNS_4errcE
+__ZNKSt3__24__fs10filesystem6detail12ErrorHandlerIbE6reportERKNS_4errcEPKcz
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerIvE11report_implERKNS_10error_codeEPKcPv
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerIvE6reportERKNS_10error_codeE
+__ZNKSt3__24__fs10filesystem6detail12ErrorHandlerIvE6reportERKNS_10error_codeEPKcz
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerIvE6reportERKNS_4errcE
 __ZNKSt3__24__fs10filesystem6detail12ErrorHandlerIyE6reportERKNS_10error_codeE
 __ZNKSt3__24__fs10filesystem6detail14FileDescriptor10get_statusEv
@@ -1083,6 +1066,7 @@ __ZNKSt3__24hashINS_11__thread_idEEclB8nn180100ES1_
 __ZNKSt3__24hashIPKvEclB8nn180100ES2_
 __ZNKSt3__24hashIPVKvEclB8nn180100ES2_
 __ZNKSt3__24hashImEclB8nn180100Em
+__ZNKSt3__24lessIvEclB8nn180100IRKyS4_EEDTltclsr3stdE7forwardIT_Efp_Eclsr3stdE7forwardIT0_Efp0_EEOS5_OS6_
 __ZNKSt3__25arrayI8timespecLm2EE4dataB8nn180100Ev
 __ZNKSt3__25arrayIcLm256EE4sizeB8nn180100Ev
 __ZNKSt3__25ctypeIcE10do_tolowerEPcPKc
@@ -1467,15 +1451,12 @@ __ZNKSt3__28time_getIwNS_19istreambuf_iteratorIwNS_11char_traitsIwEEEEE18__get_d
 __ZNKSt3__28time_getIwNS_19istreambuf_iteratorIwNS_11char_traitsIwEEEEE3getES4_S4_RNS_8ios_baseERjP2tmPKwSC_
 __ZNKSt3__28time_getIwNS_19istreambuf_iteratorIwNS_11char_traitsIwEEEEE6do_getES4_S4_RNS_8ios_baseERjP2tmcc
 __ZNKSt3__28time_getIwNS_19istreambuf_iteratorIwNS_11char_traitsIwEEEEE9__get_dayERiRS4_S4_RjRKNS_5ctypeIwEE
-__ZNKSt3__28time_putIcNS_19ostreambuf_iteratorIcNS_11char_traitsIcEEEEE3putES4_RNS_8ios_baseEcPK2tmPKcSC_
 __ZNKSt3__28time_putIcNS_19ostreambuf_iteratorIcNS_11char_traitsIcEEEEE6do_putES4_RNS_8ios_baseEcPK2tmcc
-__ZNKSt3__28time_putIwNS_19ostreambuf_iteratorIwNS_11char_traitsIwEEEEE3putES4_RNS_8ios_baseEwPK2tmPKwSC_
 __ZNKSt3__28time_putIwNS_19ostreambuf_iteratorIwNS_11char_traitsIwEEEEE6do_putES4_RNS_8ios_baseEwPK2tmcc
 __ZNKSt3__28valarrayImE4sizeB8nn180100Ev
 __ZNKSt3__29__num_getIcE10__do_widenERNS_8ios_baseEPc
 __ZNKSt3__29__num_getIcE12__do_widen_pERNS_8ios_baseEPc
 __ZNKSt3__29__num_getIwE10__do_widenERNS_8ios_baseEPw
-__ZNKSt3__29__num_getIwE12__do_widen_pERNS_8ios_baseEPc
 __ZNKSt3__29__num_getIwE12__do_widen_pIwEEPKT_RNS_8ios_baseEPS3_
 __ZNKSt3__29basic_iosIcNS_11char_traitsIcEEE10exceptionsB8nn180100Ev
 __ZNKSt3__29basic_iosIcNS_11char_traitsIcEEE3tieB8nn180100Ev
@@ -1603,6 +1584,7 @@ __ZNSt3__210moneypunctIwLb1EEC2B8nn180100Em
 __ZNSt3__210moneypunctIwLb1EED0Ev
 __ZNSt3__210ostrstreamD0Ev
 __ZNSt3__210ostrstreamD1Ev
+__ZNSt3__210shared_ptrINS_4__fs10filesystem12__dir_streamEE18__enable_weak_thisB8nn180100Ez
 __ZNSt3__210shared_ptrINS_4__fs10filesystem12__dir_streamEE27__create_with_control_blockB8nn180100IS3_NS_20__shared_ptr_emplaceIS3_NS_9allocatorIS3_EEEEEES4_PT_PT0_
 __ZNSt3__210shared_ptrINS_4__fs10filesystem12__dir_streamEE4swapB8nn180100ERS4_
 __ZNSt3__210shared_ptrINS_4__fs10filesystem12__dir_streamEE5resetB8nn180100Ev
@@ -1611,6 +1593,7 @@ __ZNSt3__210shared_ptrINS_4__fs10filesystem12__dir_streamEEC2B8nn180100Ev
 __ZNSt3__210shared_ptrINS_4__fs10filesystem12__dir_streamEED2B8nn180100Ev
 __ZNSt3__210shared_ptrINS_4__fs10filesystem12__dir_streamEEaSB8nn180100EOS4_
 __ZNSt3__210shared_ptrINS_4__fs10filesystem16filesystem_error8_StorageEED2B8nn180100Ev
+__ZNSt3__210shared_ptrINS_4__fs10filesystem28recursive_directory_iterator12__shared_impEE18__enable_weak_thisB8nn180100Ez
 __ZNSt3__210shared_ptrINS_4__fs10filesystem28recursive_directory_iterator12__shared_impEE27__create_with_control_blockB8nn180100IS4_NS_20__shared_ptr_emplaceIS4_NS_9allocatorIS4_EEEEEES5_PT_PT0_
 __ZNSt3__210shared_ptrINS_4__fs10filesystem28recursive_directory_iterator12__shared_impEE4swapB8nn180100ERS5_
 __ZNSt3__210shared_ptrINS_4__fs10filesystem28recursive_directory_iterator12__shared_impEE5resetB8nn180100Ev
@@ -1920,7 +1903,6 @@ __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE21__resize_defau
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE25__grow_by_without_replaceB8nn180100Emmmmmm
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE25__init_copy_ctor_externalEPKcm
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE26__erase_external_with_moveEmm
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE2atEm
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE3endB8nn180100Ev
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4backB8nn180100Ev
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE4dataB8nn180100Ev
@@ -1930,7 +1912,6 @@ __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5clearB8nn180100
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5eraseB8nn180100ENS_11__wrap_iterIPKcEE
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5eraseEmm
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6__initEPKcm
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6__initEPKcmm
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6__initEmc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6__initIPKcTnNS_9enable_ifIXsr31__has_forward_iterator_categoryIT_EE5valueEiE4typeELi0EEEvSA_SA_
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6__initIPcTnNS_9enable_ifIXsr31__has_forward_iterator_categoryIT_EE5valueEiE4typeELi0EEEvS9_S9_
@@ -1939,29 +1920,21 @@ __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6appendB8nn18010
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6appendB8nn180100IPcTnNS_9enable_ifIXsr31__has_forward_iterator_categoryIT_EE5valueEiE4typeELi0EEERS5_S9_S9_
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6appendEPKc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6appendEPKcm
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6appendERKS5_mm
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6appendEmc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6assignEPKc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6assignEPKcm
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6assignERKS5_mm
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6assignEmc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6insertENS_11__wrap_iterIPKcEEc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6insertEmPKc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6insertEmPKcm
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6insertEmRKS5_mm
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6insertEmmc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6resizeB8nn180100Em
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6resizeEmc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7__allocB8nn180100Ev
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7replaceEmmPKc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7replaceEmmPKcm
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7replaceEmmRKS5_mm
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7replaceEmmmc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7reserveEm
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE8pop_backB8nn180100Ev
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE9__grow_byB8nn180100Emmmmmm
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE9push_backEc
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC1ERKS5_mmRKS4_
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2B8nn180100ENS_24__uninitialized_size_tagEmRKS4_
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2B8nn180100EOS5_
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2B8nn180100ERKS4_
@@ -1973,7 +1946,6 @@ __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2B8nn180100IPKc
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2B8nn180100IPcTnNS_9enable_ifIXsr29__has_input_iterator_categoryIT_EE5valueEiE4typeELi0EEES9_S9_
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2B8nn180100IPcTnNS_9enable_ifIXsr29__has_input_iterator_categoryIT_EE5valueEiE4typeELi0EEES9_S9_RKS4_
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2ERKS5_
-__ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2ERKS5_mmRKS4_
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEC2INS_17basic_string_viewIcS2_EETnNS_9enable_ifIXaasr33__can_be_converted_to_string_viewIcS2_T_EE5valuentsr17__is_same_uncvrefISA_S5_EE5valueEiE4typeELi0EEERKSA_
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEED1Ev
 __ZNSt3__212basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEED2Ev
@@ -2003,8 +1975,6 @@ __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE16__init_with_si
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE16__set_short_sizeB8nn180100Em
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE17__assign_externalEPKw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE17__assign_externalEPKwm
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE17__assign_no_aliasILb0EEERS5_PKwm
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE17__assign_no_aliasILb1EEERS5_PKwm
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE18__get_long_pointerB8nn180100Ev
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE18__set_long_pointerB8nn180100EPw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE18__shrink_or_extendB8nn180100Em
@@ -2016,7 +1986,6 @@ __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE21__grow_by_and_
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE25__grow_by_without_replaceB8nn180100Emmmmmm
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE25__init_copy_ctor_externalEPKwm
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE26__erase_external_with_moveEmm
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE2atEm
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE3endB8nn180100Ev
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE4backB8nn180100Ev
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE4dataB8nn180100Ev
@@ -2025,38 +1994,25 @@ __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE5clearB8nn180100
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE5eraseB8nn180100ENS_11__wrap_iterIPKwEE
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE5eraseEmm
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6__initEPKwm
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6__initEPKwmm
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6__initEmw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6__initIPKwTnNS_9enable_ifIXsr31__has_forward_iterator_categoryIT_EE5valueEiE4typeELi0EEEvSA_SA_
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6__initIPcTnNS_9enable_ifIXsr31__has_forward_iterator_categoryIT_EE5valueEiE4typeELi0EEEvS9_S9_
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6__initIPwTnNS_9enable_ifIXsr31__has_forward_iterator_categoryIT_EE5valueEiE4typeELi0EEEvS9_S9_
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6appendB8nn180100IPwTnNS_9enable_ifIXsr31__has_forward_iterator_categoryIT_EE5valueEiE4typeELi0EEERS5_S9_S9_
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6appendEPKw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6appendEPKwm
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6appendERKS5_mm
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6appendEmw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6assignEPKw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6assignEPKwm
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6assignERKS5_mm
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6assignEmw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6assignIPwTnNS_9enable_ifIXsr31__has_forward_iterator_categoryIT_EE5valueEiE4typeELi0EEERS5_S9_S9_
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6insertENS_11__wrap_iterIPKwEEw
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6insertEmPKw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6insertEmPKwm
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6insertEmRKS5_mm
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6insertEmmw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6resizeB8nn180100Em
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE6resizeEmw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7__allocB8nn180100Ev
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7replaceEmmPKw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7replaceEmmPKwm
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7replaceEmmRKS5_mm
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7replaceEmmmw
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7reserveEm
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE8pop_backB8nn180100Ev
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE9__grow_byB8nn180100Emmmmmm
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE9push_backEw
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEC1ERKS5_mmRKS4_
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEC2B8nn180100EOS5_
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEC2B8nn180100Emw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEC2B8nn180100Ev
@@ -2065,12 +2021,10 @@ __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEC2B8nn180100IPKw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEC2B8nn180100IPcTnNS_9enable_ifIXsr29__has_input_iterator_categoryIT_EE5valueEiE4typeELi0EEES9_S9_
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEC2B8nn180100IPwTnNS_9enable_ifIXsr29__has_input_iterator_categoryIT_EE5valueEiE4typeELi0EEES9_S9_RKS4_
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEC2ERKS5_
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEC2ERKS5_mmRKS4_
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEED1Ev
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEED2Ev
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEaSB8nn180100EOS5_
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEaSB8nn180100EPKw
-__ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEaSEw
 __ZNSt3__212basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEEixB8nn180100Em
 __ZNSt3__212codecvt_baseC2B8nn180100Ev
 __ZNSt3__212construct_atB8nn180100INS_17basic_string_viewIcNS_11char_traitsIcEEEEJS4_EPS4_EEPT_S7_DpOT0_
@@ -2157,7 +2111,6 @@ __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE12__write_modeEv
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE15__make_mdstringEj
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE4openEPKcj
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE4openERKNS_12basic_stringIcS2_NS_9allocatorIcEEEEj
-__ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE4swapERS3_
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE4syncEv
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE5closeEv
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE5imbueERKNS_6localeE
@@ -2168,94 +2121,36 @@ __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE7seekposENS_4fposI11__mbstate_tE
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE8overflowEi
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE9pbackfailEi
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEE9underflowEv
-__ZNSt3__213basic_filebufIcNS_11char_traitsIcEEEC1EOS3_
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEEC1Ev
-__ZNSt3__213basic_filebufIcNS_11char_traitsIcEEEC2EOS3_
-__ZNSt3__213basic_filebufIcNS_11char_traitsIcEEEC2Ev
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEED0Ev
 __ZNSt3__213basic_filebufIcNS_11char_traitsIcEEED1Ev
-__ZNSt3__213basic_filebufIcNS_11char_traitsIcEEED2Ev
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE12__inc_gcountB8nn180100Ev
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE3getEPclc
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE3getERNS_15basic_streambufIcS2_EEc
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE3getEv
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE4peekEv
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE4readEPcl
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE4swapB8nn180100ERS3_
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE4syncEv
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE5seekgENS_4fposI11__mbstate_tEE
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE5seekgExNS_8ios_base7seekdirE
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE5tellgEv
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE5ungetEv
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE6ignoreEli
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE6sentryC1ERS3_b
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE6sentryC2ERS3_b
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE7getlineEPclc
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE7putbackEc
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEE8readsomeEPcl
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEEC1B8nn180100EPNS_15basic_streambufIcS2_EE
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEEC2B8nn180100EPNS_15basic_streambufIcS2_EE
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEED0Ev
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEED1Ev
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEED2Ev
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEEaSEOS3_
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsEPNS_15basic_streambufIcS2_EE
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERPv
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERb
 __ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERd
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERe
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERf
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERi
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERj
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERl
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERm
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERs
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERt
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERx
-__ZNSt3__213basic_istreamIcNS_11char_traitsIcEEErsERy
 __ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE12__inc_gcountB8nn180100Ev
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE3getEPwlw
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE3getERNS_15basic_streambufIwS2_EEw
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE3getEv
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE4peekEv
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE4readEPwl
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE4syncEv
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE5seekgENS_4fposI11__mbstate_tEE
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE5seekgExNS_8ios_base7seekdirE
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE5tellgEv
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE5ungetEv
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE6ignoreEli
 __ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE6sentryC1ERS3_b
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE6sentryC2ERS3_b
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE7getlineEPwlw
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE7putbackEw
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEE8readsomeEPwl
 __ZNSt3__213basic_istreamIwNS_11char_traitsIwEEEC1B8nn180100EPNS_15basic_streambufIwS2_EE
 __ZNSt3__213basic_istreamIwNS_11char_traitsIwEEED0Ev
 __ZNSt3__213basic_istreamIwNS_11char_traitsIwEEED1Ev
 __ZNSt3__213basic_istreamIwNS_11char_traitsIwEEED2Ev
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsEPNS_15basic_streambufIwS2_EE
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERPv
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERb
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERd
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERe
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERf
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERi
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERj
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERl
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERm
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERs
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERt
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERx
-__ZNSt3__213basic_istreamIwNS_11char_traitsIwEEErsERy
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEE3putEc
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEE4swapB8nn180100ERS3_
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEE5flushEv
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEE5writeEPKcl
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEE6sentryC1ERS3_
-__ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEE6sentryC2ERS3_
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEE6sentryD1Ev
-__ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEE6sentryD2Ev
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEEC1B8nn180100EPNS_15basic_streambufIcS2_EE
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEEC2B8nn180100EPNS_15basic_streambufIcS2_EE
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEED0Ev
@@ -2263,44 +2158,19 @@ __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEED1Ev
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEED2Ev
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEEaSEOS3_
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEPKv
-__ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEPNS_15basic_streambufIcS2_EE
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEb
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEd
-__ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEe
-__ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEf
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEi
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEj
-__ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEl
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEm
-__ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEs
-__ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEt
 __ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEx
-__ZNSt3__213basic_ostreamIcNS_11char_traitsIcEEElsEy
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEE3putEw
 __ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEE5flushEv
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEE5writeEPKwl
 __ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEE6sentryC1ERS3_
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEE6sentryC2ERS3_
 __ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEE6sentryD1Ev
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEE6sentryD2Ev
 __ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEEC1B8nn180100EPNS_15basic_streambufIwS2_EE
 __ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEED0Ev
 __ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEED1Ev
 __ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEED2Ev
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEPKv
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEPNS_15basic_streambufIwS2_EE
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEb
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEd
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEe
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEf
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEi
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEj
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEl
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEm
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEs
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEt
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEx
-__ZNSt3__213basic_ostreamIwNS_11char_traitsIwEEElsEy
 __ZNSt3__213messages_baseC2B8nn180100Ev
 __ZNSt3__213move_backwardB8nn180100IPPNS_4__fs10filesystem12__dir_streamES5_EET0_T_S7_S6_
 __ZNSt3__213move_iteratorIPPNS_4__fs10filesystem12__dir_streamEEC2B8nn180100ES5_
@@ -2448,8 +2318,6 @@ __ZNSt3__214__unwrap_rangeB8nn180100IPPNS_4__fs10filesystem12__dir_streamES5_EED
 __ZNSt3__214__unwrap_rangeB8nn180100IPPNS_6locale5facetES4_EEDaT_T0_
 __ZNSt3__214__unwrap_rangeB8nn180100IPcS1_EEDaT_T0_
 __ZNSt3__214__unwrap_rangeB8nn180100IPwS1_EEDaT_T0_
-__ZNSt3__214basic_ifstreamIcNS_11char_traitsIcEEE4openEPKcj
-__ZNSt3__214basic_ifstreamIcNS_11char_traitsIcEEE4openERKNS_12basic_stringIcS2_NS_9allocatorIcEEEEj
 __ZNSt3__214basic_ifstreamIcNS_11char_traitsIcEEE6__openEij
 __ZNSt3__214basic_ifstreamIcNS_11char_traitsIcEEEC1Ev
 __ZNSt3__214basic_ifstreamIcNS_11char_traitsIcEEED0Ev
@@ -2460,8 +2328,6 @@ __ZNSt3__214basic_iostreamIcNS_11char_traitsIcEEED0Ev
 __ZNSt3__214basic_iostreamIcNS_11char_traitsIcEEED1Ev
 __ZNSt3__214basic_iostreamIcNS_11char_traitsIcEEED2Ev
 __ZNSt3__214basic_iostreamIcNS_11char_traitsIcEEEaSEOS3_
-__ZNSt3__214basic_ofstreamIcNS_11char_traitsIcEEE4openEPKcj
-__ZNSt3__214basic_ofstreamIcNS_11char_traitsIcEEE4openERKNS_12basic_stringIcS2_NS_9allocatorIcEEEEj
 __ZNSt3__214basic_ofstreamIcNS_11char_traitsIcEEE6__openEij
 __ZNSt3__214basic_ofstreamIcNS_11char_traitsIcEEEC1Ev
 __ZNSt3__214basic_ofstreamIcNS_11char_traitsIcEEED0Ev
@@ -2470,27 +2336,21 @@ __ZNSt3__214basic_ofstreamIcNS_11char_traitsIcEEED2Ev
 __ZNSt3__214codecvt_bynameIDiDu11__mbstate_tEC2B8nn180100ERKNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEm
 __ZNSt3__214codecvt_bynameIDiDu11__mbstate_tED0Ev
 __ZNSt3__214codecvt_bynameIDiDu11__mbstate_tED1Ev
-__ZNSt3__214codecvt_bynameIDiDu11__mbstate_tED2Ev
 __ZNSt3__214codecvt_bynameIDic11__mbstate_tEC2B8nn180100ERKNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEm
 __ZNSt3__214codecvt_bynameIDic11__mbstate_tED0Ev
 __ZNSt3__214codecvt_bynameIDic11__mbstate_tED1Ev
-__ZNSt3__214codecvt_bynameIDic11__mbstate_tED2Ev
 __ZNSt3__214codecvt_bynameIDsDu11__mbstate_tEC2B8nn180100ERKNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEm
 __ZNSt3__214codecvt_bynameIDsDu11__mbstate_tED0Ev
 __ZNSt3__214codecvt_bynameIDsDu11__mbstate_tED1Ev
-__ZNSt3__214codecvt_bynameIDsDu11__mbstate_tED2Ev
 __ZNSt3__214codecvt_bynameIDsc11__mbstate_tEC2B8nn180100ERKNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEm
 __ZNSt3__214codecvt_bynameIDsc11__mbstate_tED0Ev
 __ZNSt3__214codecvt_bynameIDsc11__mbstate_tED1Ev
-__ZNSt3__214codecvt_bynameIDsc11__mbstate_tED2Ev
 __ZNSt3__214codecvt_bynameIcc11__mbstate_tEC2B8nn180100ERKNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEm
 __ZNSt3__214codecvt_bynameIcc11__mbstate_tED0Ev
 __ZNSt3__214codecvt_bynameIcc11__mbstate_tED1Ev
-__ZNSt3__214codecvt_bynameIcc11__mbstate_tED2Ev
 __ZNSt3__214codecvt_bynameIwc11__mbstate_tEC2B8nn180100ERKNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEm
 __ZNSt3__214codecvt_bynameIwc11__mbstate_tED0Ev
 __ZNSt3__214codecvt_bynameIwc11__mbstate_tED1Ev
-__ZNSt3__214codecvt_bynameIwc11__mbstate_tED2Ev
 __ZNSt3__214collate_bynameIcED0Ev
 __ZNSt3__214collate_bynameIcED1Ev
 __ZNSt3__214collate_bynameIwED0Ev
@@ -2588,17 +2448,13 @@ __ZNSt3__215basic_streambufIcNS_11char_traitsIcEEE9pbackfailEi
 __ZNSt3__215basic_streambufIcNS_11char_traitsIcEEE9showmanycEv
 __ZNSt3__215basic_streambufIcNS_11char_traitsIcEEE9sputbackcB8nn180100Ec
 __ZNSt3__215basic_streambufIcNS_11char_traitsIcEEE9underflowEv
-__ZNSt3__215basic_streambufIcNS_11char_traitsIcEEEC1ERKS3_
-__ZNSt3__215basic_streambufIcNS_11char_traitsIcEEEC1Ev
 __ZNSt3__215basic_streambufIcNS_11char_traitsIcEEEC2ERKS3_
 __ZNSt3__215basic_streambufIcNS_11char_traitsIcEEEC2Ev
 __ZNSt3__215basic_streambufIcNS_11char_traitsIcEEED0Ev
 __ZNSt3__215basic_streambufIcNS_11char_traitsIcEEED1Ev
 __ZNSt3__215basic_streambufIcNS_11char_traitsIcEEED2Ev
-__ZNSt3__215basic_streambufIcNS_11char_traitsIcEEEaSERKS3_
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEE10pubseekoffB8nn180100ExNS_8ios_base7seekdirEj
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEE10pubseekposB8nn180100ENS_4fposI11__mbstate_tEEj
-__ZNSt3__215basic_streambufIwNS_11char_traitsIwEEE4swapERS3_
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEE4syncEv
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEE5gbumpB8nn180100Ei
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEE5imbueERKNS_6localeE
@@ -2621,25 +2477,17 @@ __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEE9pbackfailEi
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEE9showmanycEv
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEE9sputbackcB8nn180100Ew
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEE9underflowEv
-__ZNSt3__215basic_streambufIwNS_11char_traitsIwEEEC1ERKS3_
-__ZNSt3__215basic_streambufIwNS_11char_traitsIwEEEC1Ev
-__ZNSt3__215basic_streambufIwNS_11char_traitsIwEEEC2ERKS3_
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEEC2Ev
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEED0Ev
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEED1Ev
 __ZNSt3__215basic_streambufIwNS_11char_traitsIwEEED2Ev
-__ZNSt3__215basic_streambufIwNS_11char_traitsIwEEEaSERKS3_
 __ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE11__move_initB8nn180100EOS5_
 __ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE15__init_buf_ptrsB8nn180100Ev
-__ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strERKNS_12basic_stringIcS2_S4_EE
-__ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE4swapERS5_
 __ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj
 __ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekposENS_4fposI11__mbstate_tEEj
 __ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE8overflowEi
 __ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9pbackfailEi
 __ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE9underflowEv
-__ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEC1EOS5_
-__ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEC2EOS5_
 __ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEED0Ev
 __ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEED2Ev
 __ZNSt3__215basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEaSEOS5_
@@ -2901,6 +2749,7 @@ __ZNSt3__217__floyd_sift_downB8nn180100INS_17_ClassicAlgPolicyERNS_6ranges4lessE
 __ZNSt3__217__libcpp_allocateB8nn180100Emm
 __ZNSt3__217__libcpp_mbrlen_lB8nn180100EPKcmP11__mbstate_tP15__locale_struct
 __ZNSt3__217__libcpp_mbtowc_lB8nn180100EPwPKcmP15__locale_struct
+__ZNSt3__217__libcpp_sscanf_lEPKcP15__locale_structS1_z
 __ZNSt3__217__mulShift_mod1e9B8nn180100EyPKyi
 __ZNSt3__217__widen_from_utf8ILm16EED0Ev
 __ZNSt3__217__widen_from_utf8ILm16EED1Ev
@@ -3023,7 +2872,6 @@ __ZNSt3__218__unwrap_iter_implIPwLb1EE8__unwrapB8nn180100ES1_
 __ZNSt3__218basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEED0Ev
 __ZNSt3__218basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEED1Ev
 __ZNSt3__218basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEED2Ev
-__ZNSt3__218basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEaSEOS5_
 __ZNSt3__218condition_variableC2B8nn180100Ev
 __ZNSt3__219__DOUBLE_POW5_SPLITE
 __ZNSt3__219__allocate_at_leastB8nn180100INS_15__sso_allocatorIPNS_6locale5facetELm30EEEEENS_19__allocation_resultINS_16allocator_traitsIT_E7pointerEEERS8_m
@@ -3053,8 +2901,10 @@ __ZNSt3__219__double_or_nothingB8nn180100IcEEvRNS_10unique_ptrIT_PFvPvEEERPS2_S9
 __ZNSt3__219__double_or_nothingB8nn180100IjEEvRNS_10unique_ptrIT_PFvPvEEERPS2_S9_
 __ZNSt3__219__double_or_nothingB8nn180100IwEEvRNS_10unique_ptrIT_PFvPvEEERPS2_S9_
 __ZNSt3__219__iostream_categoryD0Ev
+__ZNSt3__219__libcpp_asprintf_lEPPcP15__locale_structPKcz
 __ZNSt3__219__libcpp_deallocateB8nn180100EPvmm
 __ZNSt3__219__libcpp_mutex_lockB8nn180100EP15pthread_mutex_t
+__ZNSt3__219__libcpp_snprintf_lEPcmP15__locale_structPKcz
 __ZNSt3__219__libcpp_tls_createB8nn180100EPjPFvPvE
 __ZNSt3__219__mulPow5InvDivPow2B8nn180100Ejji
 __ZNSt3__219__partial_sort_implB8nn180100INS_17_ClassicAlgPolicyERNS_6ranges4lessEPaS5_EET1_S6_S6_T2_OT0_
@@ -3120,11 +2970,9 @@ __ZNSt3__219__unwrap_range_implIPwS1_E8__unwrapB8nn180100ES1_S1_
 __ZNSt3__219basic_istringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEED0Ev
 __ZNSt3__219basic_istringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEED1Ev
 __ZNSt3__219basic_istringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEED2Ev
-__ZNSt3__219basic_istringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEaSEOS5_
 __ZNSt3__219basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEED0Ev
 __ZNSt3__219basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEED1Ev
 __ZNSt3__219basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEED2Ev
-__ZNSt3__219basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEaSEOS5_
 __ZNSt3__219istreambuf_iteratorIcNS_11char_traitsIcEEE7__proxyC2B8nn180100EcPNS_15basic_streambufIcS2_EE
 __ZNSt3__219istreambuf_iteratorIcNS_11char_traitsIcEEEC2B8nn180100EPNS_15basic_streambufIcS2_EE
 __ZNSt3__219istreambuf_iteratorIcNS_11char_traitsIcEEEC2B8nn180100ERNS_13basic_istreamIcS2_EE
@@ -3768,6 +3616,7 @@ __ZNSt3__24__fs10filesystem6detail12posix_fchmodERKNS2_14FileDescriptorERK4statR
 __ZNSt3__24__fs10filesystem6detail12symlink_fileEPKcS4_
 __ZNSt3__24__fs10filesystem6detail13capture_errnoEv
 __ZNSt3__24__fs10filesystem6detail13extract_mtimeERK4stat
+__ZNSt3__24__fs10filesystem6detail13format_stringEPKcz
 __ZNSt3__24__fs10filesystem6detail13get_file_typeI6direnthEENS1_9file_typeEPT_i
 __ZNSt3__24__fs10filesystem6detail13posix_readdirEP11__dirstreamRNS_10error_codeE
 __ZNSt3__24__fs10filesystem6detail14FileDescriptor14refresh_statusERNS_10error_codeE
@@ -4025,21 +3874,7 @@ __ZNSt3__26__moveB8nn180100INS_17_ClassicAlgPolicyENS_16reverse_iteratorIPNS_17b
 __ZNSt3__26__moveB8nn180100INS_17_ClassicAlgPolicyENS_16reverse_iteratorIPPNS_17__assoc_sub_stateEEES6_S6_EENS_4pairIT0_T2_EES8_T1_S9_
 __ZNSt3__26__moveB8nn180100INS_17_ClassicAlgPolicyENS_16reverse_iteratorIPPNS_6locale5facetEEES7_S7_EENS_4pairIT0_T2_EES9_T1_SA_
 __ZNSt3__26__moveB8nn180100INS_17_ClassicAlgPolicyEPPNS_4__fs10filesystem12__dir_streamES6_S6_EENS_4pairIT0_T2_EES8_T1_S9_
-__ZNSt3__26__sortIRNS_6__lessIaaEEPaEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIccEEPcEEvT0_S5_T_
 __ZNSt3__26__sortIRNS_6__lessIddEEPdEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIeeEEPeEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIffEEPfEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIhhEEPhEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIiiEEPiEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIjjEEPjEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIllEEPlEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessImmEEPmEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIssEEPsEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIttEEPtEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIwwEEPwEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIxxEEPxEEvT0_S5_T_
-__ZNSt3__26__sortIRNS_6__lessIyyEEPyEEvT0_S5_T_
 __ZNSt3__26chrono10time_pointINS0_12steady_clockENS0_8durationIxNS_5ratioILx1ELx1000000000EEEEEEC2B8nn180100ERKS6_
 __ZNSt3__26chrono10time_pointINS0_12system_clockENS0_8durationIxNS_5ratioILx1ELx1000000EEEEEEC2B8nn180100ERKS6_
 __ZNSt3__26chrono10time_pointINS_4__fs10filesystem16_FilesystemClockENS0_8durationInNS_5ratioILx1ELx1000000000EEEEEE3minB8nn180100Ev
@@ -4665,7 +4500,6 @@ __ZNSt3__29basic_iosIcNS_11char_traitsIcEEE3tieB8nn180100EPNS_13basic_ostreamIcS
 __ZNSt3__29basic_iosIcNS_11char_traitsIcEEE4initB8nn180100EPNS_15basic_streambufIcS2_EE
 __ZNSt3__29basic_iosIcNS_11char_traitsIcEEE4swapB8nn180100ERS3_
 __ZNSt3__29basic_iosIcNS_11char_traitsIcEEE5clearB8nn180100Ej
-__ZNSt3__29basic_iosIcNS_11char_traitsIcEEE7copyfmtERKS3_
 __ZNSt3__29basic_iosIcNS_11char_traitsIcEEE8setstateB8nn180100Ej
 __ZNSt3__29basic_iosIcNS_11char_traitsIcEEEC2B8nn180100Ev
 __ZNSt3__29basic_iosIcNS_11char_traitsIcEEED0Ev
@@ -4675,7 +4509,6 @@ __ZNSt3__29basic_iosIwNS_11char_traitsIwEEE10exceptionsB8nn180100Ej
 __ZNSt3__29basic_iosIwNS_11char_traitsIwEEE3tieB8nn180100EPNS_13basic_ostreamIwS2_EE
 __ZNSt3__29basic_iosIwNS_11char_traitsIwEEE4initB8nn180100EPNS_15basic_streambufIwS2_EE
 __ZNSt3__29basic_iosIwNS_11char_traitsIwEEE5clearB8nn180100Ej
-__ZNSt3__29basic_iosIwNS_11char_traitsIwEEE7copyfmtERKS3_
 __ZNSt3__29basic_iosIwNS_11char_traitsIwEEE8setstateB8nn180100Ej
 __ZNSt3__29basic_iosIwNS_11char_traitsIwEEEC2B8nn180100Ev
 __ZNSt3__29basic_iosIwNS_11char_traitsIwEEED0Ev
@@ -4790,13 +4623,24 @@ __ZNSt3__2eqB8nn180100IwNS_11char_traitsIwEEEEbRKNS_19istreambuf_iteratorIT_T0_E
 __ZNSt3__2eqB8nn180100IwPFvPvEEEbRKNS_10unique_ptrIT_T0_EEDn
 __ZNSt3__2gtB8nn180100ENS_15strong_orderingENS_20_CmpUnspecifiedParamE
 __ZNSt3__2ltB8nn180100ENS_15strong_orderingENS_20_CmpUnspecifiedParamE
+__ZNSt3__2miB8nn180100IPKcPcEEDTmicldtfp_4baseEcldtfp0_4baseEERKNS_11__wrap_iterIT_EERKNS5_IT0_EE
+__ZNSt3__2miB8nn180100IPKwPwEEDTmicldtfp_4baseEcldtfp0_4baseEERKNS_11__wrap_iterIT_EERKNS5_IT0_EE
+__ZNSt3__2miB8nn180100IPPNS_4__fs10filesystem12__dir_streamES5_EEDTmicldtfp_4baseEcldtfp0_4baseEERKNS_13move_iteratorIT_EERKNS7_IT0_EE
+__ZNSt3__2miB8nn180100IPcS1_EEDTmicldtfp_4baseEcldtfp0_4baseEERKNS_11__wrap_iterIT_EERKNS3_IT0_EE
+__ZNSt3__2miB8nn180100IPwS1_EEDTmicldtfp_4baseEcldtfp0_4baseEERKNS_11__wrap_iterIT_EERKNS3_IT0_EE
 __ZNSt3__2neB8nn180100ERKNS_16__deque_iteratorINS_4__fs10filesystem12__dir_streamEPS3_RS3_PS4_lLl0EEES9_
+__ZNSt3__2neB8nn180100INS_11__wrap_iterIPNS_17basic_string_viewIcNS_11char_traitsIcEEEEEES7_EEbRKNS_16reverse_iteratorIT_EERKNS8_IT0_EEQrqXnecldtfp_4baseEcldtfp0_4baseERNS_14convertible_toIbEEE
 __ZNSt3__2neB8nn180100IPKcPcEEbRKNS_11__wrap_iterIT_EERKNS4_IT0_EE
 __ZNSt3__2neB8nn180100IPKwPwEEbRKNS_11__wrap_iterIT_EERKNS4_IT0_EE
 __ZNSt3__2neB8nn180100IPNS_17basic_string_viewIcNS_11char_traitsIcEEEEEEbRKNS_11__wrap_iterIT_EESA_
+__ZNSt3__2neB8nn180100IPNS_17basic_string_viewIcNS_11char_traitsIcEEEES5_EEbRKNS_16reverse_iteratorIT_EERKNS6_IT0_EEQrqXnecldtfp_4baseEcldtfp0_4baseERNS_14convertible_toIbEEE
 __ZNSt3__2neB8nn180100IPNS_4pairINS_17basic_string_viewIcNS_11char_traitsIcEEEENS_4__fs10filesystem12PathPartKindEEEEEbRKNS_11__wrap_iterIT_EESF_
+__ZNSt3__2neB8nn180100IPNS_4pairINS_17basic_string_viewIcNS_11char_traitsIcEEEENS_4__fs10filesystem12PathPartKindEEESA_EEbRKNS_16reverse_iteratorIT_EERKNSB_IT0_EEQrqXnecldtfp_4baseEcldtfp0_4baseERNS_14convertible_toIbEEE
 __ZNSt3__2neB8nn180100IPNS_4pairIPNS_18condition_variableEPNS_5mutexEEEEEbRKNS_11__wrap_iterIT_EESC_
+__ZNSt3__2neB8nn180100IPNS_4pairIPNS_18condition_variableEPNS_5mutexEEES7_EEbRKNS_16reverse_iteratorIT_EERKNS8_IT0_EEQrqXnecldtfp_4baseEcldtfp0_4baseERNS_14convertible_toIbEEE
 __ZNSt3__2neB8nn180100IPPNS_17__assoc_sub_stateEEEbRKNS_11__wrap_iterIT_EES8_
+__ZNSt3__2neB8nn180100IPPNS_17__assoc_sub_stateES3_EEbRKNS_16reverse_iteratorIT_EERKNS4_IT0_EEQrqXnecldtfp_4baseEcldtfp0_4baseERNS_14convertible_toIbEEE
+__ZNSt3__2neB8nn180100IPPNS_6locale5facetES4_EEbRKNS_16reverse_iteratorIT_EERKNS5_IT0_EEQrqXnecldtfp_4baseEcldtfp0_4baseERNS_14convertible_toIbEEE
 __ZNSt3__2neB8nn180100IPcEEbRKNS_11__wrap_iterIT_EES6_
 __ZNSt3__2neB8nn180100IPwEEbRKNS_11__wrap_iterIT_EES6_
 __ZNSt3__2plB8nn180100IcNS_11char_traitsIcEENS_9allocatorIcEEEENS_12basic_stringIT_T0_T1_EEOS9_PKS6_
@@ -5318,20 +5162,17 @@ __ZZNSt3__236_Floating_to_chars_general_precisionB8nn180100IfEENS_15to_chars_res
 __ZZNSt3__24__fs10filesystem15directory_entry20__create_iter_resultB8nn180100ENS1_9file_typeEENKUlvE_clEv
 __ZZZNSt3__236_Floating_to_chars_general_precisionB8nn180100IdEENS_15to_chars_resultEPcS2_T_iENKUlvE_clEvENKUlyE_clEy
 __ZZZNSt3__236_Floating_to_chars_general_precisionB8nn180100IfEENS_15to_chars_resultEPcS2_T_iENKUlvE_clEvENKUljE_clEj
-__ZdaPvRKSt9nothrow_t
+__ZdaPv
 __ZdaPvSt11align_val_t
-__ZdaPvSt11align_val_tRKSt9nothrow_t
-__ZdaPvmSt11align_val_t
-__ZdlPvRKSt9nothrow_t
+__ZdlPv
 __ZdlPvSt11align_val_t
-__ZdlPvSt11align_val_tRKSt9nothrow_t
+__ZdlPvm
 __ZdlPvmSt11align_val_t
-__ZnamRKSt9nothrow_t
+__Znam
 __ZnamSt11align_val_t
-__ZnamSt11align_val_tRKSt9nothrow_t
+__Znwm
 __ZnwmRKSt9nothrow_t
 __ZnwmSt11align_val_t
-__ZnwmSt11align_val_tRKSt9nothrow_t
 ___THREW__
 ___addtf3
 ___ctype_get_mb_cur_max
@@ -5353,11 +5194,9 @@ ___divti3
 ___dynamic_cast
 ___errno_location
 ___extenddftf2
-___extendsftf2
 ___fixtfsi
 ___floatditf
 ___floatsitf
-___fpclassifyl
 ___getf2
 ___gttf2
 ___letf2
@@ -5830,7 +5669,6 @@ _is_publishable_relation
 _isalnum
 _isalpha
 _isatty
-_isdigit
 _isdigit_l
 _isgraph
 _isolat1ToUTF8
@@ -5928,7 +5766,6 @@ _macaddr_gt
 _macaddr_le
 _macaddr_lt
 _main
-_main_repl
 _maintenance_work_mem
 _makeArrayResult
 _makeBoolean
@@ -6086,7 +5923,6 @@ _pg_reg_getnumoutarcs
 _pg_reg_getoutarcs
 _pg_regcomp
 _pg_regerror
-_pg_repl_raf
 _pg_saslprep
 _pg_scram_mech
 _pg_server_to_any
@@ -6698,11 +6534,11 @@ _xmlUCSIsYijingHexagramSymbols
 _xmlXPathBooleanFunction
 _xmlXPathCastNodeToString
 _xmlXPathCeilingFunction
-_xmlXPathCompile
 _xmlXPathCompiledEval
 _xmlXPathConcatFunction
 _xmlXPathContainsFunction
 _xmlXPathCountFunction
+_xmlXPathCtxtCompile
 _xmlXPathFalseFunction
 _xmlXPathFloorFunction
 _xmlXPathFreeCompExpr
diff --git a/patches/imports/pgcore b/patches/imports/pgcore
index dcd00007e..1a31dabab 100644
--- a/patches/imports/pgcore
+++ b/patches/imports/pgcore
@@ -1,11 +1,7 @@
-___memory_base
-___table_base
 _check_encoding_conversion_args
 _report_invalid_encoding
 _report_untranslatable_char
-___stack_pointer
 ___memory_base
-___table_base
 _SearchSysCache1
 _errstart_cold
 _errmsg_internal
@@ -18,7 +14,6 @@ _SysCacheGetAttrNotNull
 _text_to_cstring
 _pstrdup
 _MemoryContextAllocZero
-_memset
 _AllocSetContextCreateInternal
 _format_procedure
 _MemoryContextSetIdentifier
@@ -39,7 +34,6 @@ _errhint
 _type_is_rowtype
 _ReleaseSysCache
 _pfree
-_memcpy
 _function_parse_error_transpose
 _set_errcontext_domain
 _errcontext_msg
@@ -129,24 +123,23 @@ _datumTransfer
 _invoke_iiii
 _invoke_v
 _invoke_i
-_ReThrowError
 _unpack_sql_state
 _cstring_to_text
 _invoke_viiiii
 _MemoryContextGetParent
+_ReThrowError
 _emscripten_longjmp
 _CreateExecutorState
 _ResourceOwnerCreate
 _CreateExprContext
 _GetCurrentSubTransactionId
-_SPI_plan_get_plan_sources
-_SPI_execute_plan_extended
-_SPI_result_code_string
+_SPI_plan_get_cached_plan
 _GetErrorContextStack
 _Int64GetDatum
 _SPI_cursor_close
 _SPI_cursor_find
 _SPI_cursor_open_with_paramlist
+_SPI_result_code_string
 _get_element_type
 _pg_detoast_datum_copy
 _array_create_iterator
@@ -157,6 +150,7 @@ _tuplestore_puttuple
 _tuplestore_tuple_count
 _CreateDestReceiver
 _SetTuplestoreDestReceiverParams
+_SPI_execute_plan_extended
 _getTypeOutputInfo
 _OidOutputFunctionCall
 _MemoryContextStrdup
@@ -172,11 +166,11 @@ _SPI_commit
 _SPI_rollback_and_chain
 _SPI_rollback
 _err_generic_string
+_ReleaseCachedPlan
 _SPI_prepare_extended
 _SPI_keepplan
-_SPI_plan_get_cached_plan
+_SPI_plan_get_plan_sources
 _CachedPlanAllowsSimpleValidityCheck
-_ReleaseCachedPlan
 _EnsurePortalSnapshotExists
 _CachedPlanIsSimplyValid
 _ExecInitExprWithParams
@@ -216,9 +210,8 @@ _SPI_freeplan
 _MemoryContextDelete
 _pg_printf
 _fflush
-_get_collation_oid
-_memmove
 _list_free
+_get_collation_oid
 _typeStringToTypeName
 _raw_parser
 _quote_identifier
@@ -256,6 +249,9 @@ _internalerrquery
 _strchr
 _scanner_init
 _scanner_finish
+___stack_pointer
+___memory_base
+___table_base
 _error_context_stack
 _TopMemoryContext
 _CurrentMemoryContext
@@ -275,9 +271,9 @@ _MemoryContextDeleteChildren
 _MyProc
 _TopTransactionContext
 _TopTransactionResourceOwner
+_SPI_result
 _SPI_processed
 _SPI_tuptable
-_SPI_result
 _namein
 _work_mem
 _stdout
@@ -286,9 +282,6 @@ _SPI_connect_ext
 _plpgsql_compile
 _ResourceOwnerDelete
 _pg_re_throw
-___stack_pointer
-___memory_base
-___table_base
 _errstart_cold
 _errmsg_internal
 _errfinish
@@ -312,7 +305,6 @@ _atoi
 _pg_strtoint32
 _pg_snprintf
 _palloc
-_memcpy
 _initStringInfo
 _appendStringInfoString
 _appendStringInfo
@@ -355,11 +347,9 @@ _pthread_mutex_lock
 _pthread_mutex_unlock
 _close
 _strncmp
-___errno_location
-_time
 _pg_printf
+_time
 _abort
-_memset
 _getenv
 _strlcpy
 _geteuid
@@ -376,13 +366,14 @@ _explicit_bzero
 _pg_prng_uint64_range
 _pg_get_encoding_from_locale
 _pg_encoding_to_char_private
-_pg_getaddrinfo_all
-_gai_strerror
-_pg_freeaddrinfo_all
+___errno_location
 _getpeereid
 _pg_strerror_r
 _getsockopt
 _getsockname
+_pg_getaddrinfo_all
+_gai_strerror
+_pg_freeaddrinfo_all
 _pg_inet_net_ntop
 _socket
 _connect
@@ -410,9 +401,8 @@ _memchr
 _open
 _read
 _write
-_memmove
-_fflush
 _poll
+_fflush
 _strnlen
 _pg_encoding_dsplen
 _fileno
@@ -435,6 +425,9 @@ _sigwait
 _localtime
 _strftime
 _pg_md5_encrypt
+___stack_pointer
+___memory_base
+___table_base
 _WalReceiverFunctions
 _MyLatch
 _pg_lsn_in
@@ -447,22 +440,17 @@ _pgresStatus
 _stdout
 _stdin
 _pg_scram_mech
-___memory_base
-___table_base
 _check_encoding_conversion_args
 _report_invalid_encoding
 _pg_encoding_verifymbchar
 ___memory_base
-___table_base
 _check_encoding_conversion_args
 _latin2mic
 _mic2latin
 _latin2mic_with_table
 _mic2latin_with_table
 _local2local
-___stack_pointer
 ___memory_base
-___table_base
 _palloc0
 _pfree
 _strcmp
@@ -481,27 +469,23 @@ _searchstoplist
 _strlen
 _pg_server_to_any
 _repalloc
-_memcpy
 _pg_any_to_server
 _palloc
 _memcmp
-_memmove
-_lowerstr
-_CurrentMemoryContext
+___stack_pointer
 ___memory_base
 ___table_base
+_lowerstr
+_CurrentMemoryContext
 _check_encoding_conversion_args
 _latin2mic
 _mic2latin
 ___memory_base
-___table_base
 _check_encoding_conversion_args
 _report_invalid_encoding
 _pg_encoding_verifymbchar
 _report_untranslatable_char
-___stack_pointer
 ___memory_base
-___table_base
 _palloc0
 _AllocSetContextCreateInternal
 _strcmp
@@ -533,7 +517,6 @@ _MemoryContextReset
 _MakePerTupleExprContext
 _slot_getsomeattrs_int
 _MakeSingleTupleTableSlot
-_memcpy
 _ExecStoreVirtualTuple
 _OutputPluginPrepareWrite
 _logicalrep_write_insert
@@ -602,15 +585,16 @@ _bms_equal
 _logicalrep_write_begin
 _list_member_xid
 _lappend_xid
-_bms_is_member
 _logicalrep_write_typ
+_bms_is_member
 _logicalrep_write_rel
+___stack_pointer
+___memory_base
+___table_base
 _CurrentMemoryContext
 _TTSOpsVirtual
 _CacheMemoryContext
 _TTSOpsHeapTuple
-___memory_base
-___table_base
 _check_encoding_conversion_args
 _latin2mic
 _mic2latin
@@ -618,15 +602,14 @@ _latin2mic_with_table
 _mic2latin_with_table
 _local2local
 ___memory_base
-___table_base
 _check_encoding_conversion_args
 _pg_encoding_verifymbchar
 _report_invalid_encoding
 _report_untranslatable_char
-___stack_pointer
 ___memory_base
-___table_base
 _check_encoding_conversion_args
 _pg_encoding_verifymbchar
 _report_invalid_encoding
 _report_untranslatable_char
+___stack_pointer
+___memory_base
diff --git a/patches/imports/plpgsql b/patches/imports/plpgsql
index 046818e7c..3c68eead8 100644
--- a/patches/imports/plpgsql
+++ b/patches/imports/plpgsql
@@ -1,283 +1,2 @@
-___stack_pointer
 ___memory_base
 ___table_base
-_SearchSysCache1
-_errstart_cold
-_errmsg_internal
-_errfinish
-_puts
-_hash_search
-_ItemPointerEquals
-_errstart
-_SysCacheGetAttrNotNull
-_text_to_cstring
-_pstrdup
-_MemoryContextAllocZero
-_memset
-_AllocSetContextCreateInternal
-_format_procedure
-_MemoryContextSetIdentifier
-_MemoryContextAlloc
-_get_func_arg_info
-_palloc
-_pg_snprintf
-_errcode
-_format_type_be
-_errmsg
-_palloc0
-_CreateTemplateTupleDesc
-_TupleDescInitEntry
-_TupleDescInitEntryCollation
-_repalloc
-_get_fn_expr_rettype
-_errhint
-_type_is_rowtype
-_ReleaseSysCache
-_pfree
-_memcpy
-_function_parse_error_transpose
-_set_errcontext_domain
-_errcontext_msg
-_list_make1_impl
-_lappend
-_NameListToString
-_errdetail
-_parser_errposition
-_bms_add_member
-_MemoryContextAllocZeroAligned
-_makeString
-_list_make2_impl
-_strcmp
-_list_make3_impl
-_makeTypeName
-_LookupTypeName
-_get_base_element_type
-_lookup_type_cache
-_RelnameGetRelid
-_makeRangeVar
-_RangeVarGetRelidExtended
-_SearchSysCacheAttName
-_get_rel_type_id
-_makeTypeNameFromNameList
-_strlen
-_strspn
-_hash_create
-_resolve_polymorphic_argtypes
-_get_call_expr_argtype
-_expand_array
-_SPI_freetuptable
-_MemoryContextReset
-_TransferExpandedObject
-_ProcessInterrupts
-_CreateTupleDescCopy
-_SPI_datumTransfer
-_get_call_result_type
-_domain_check
-_FreeExprContext
-_makeParamList
-_detoast_external_attr
-_datumCopy
-_DeleteExpandedObject
-_DatumGetEOHP
-_expanded_record_set_tuple
-_MemoryContextSetParent
-_deconstruct_expanded_record
-_pg_detoast_datum
-_make_expanded_record_from_typeid
-_lookup_rowtype_tupdesc
-_DecrTupleDescRefCount
-_expanded_record_fetch_tupdesc
-_make_expanded_record_from_tupdesc
-_heap_deform_tuple
-_convert_tuples_by_position
-_expanded_record_get_tuple
-_execute_attr_map_tuple
-_SPI_returntuple
-_EOH_get_flat_size
-_SPI_palloc
-_EOH_flatten_into
-_FreeCachedExpression
-_get_typcollation
-_coerce_to_target_type
-_GetCachedExpression
-_ExecInitExpr
-_make_expanded_record_from_exprecord
-_expanded_record_set_field_internal
-_SPI_register_trigger_data
-_SPI_copytuple
-_expanded_record_lookup_field
-_FreeExecutorState
-_ResourceOwnerReleaseAllPlanCacheRefs
-_invoke_vi
-___wasm_setjmp_test
-_setTempRet0
-_getTempRet0
-_invoke_viiiiii
-_invoke_viii
-_invoke_viiii
-_invoke_iiiiii
-_invoke_iii
-_invoke_ii
-___wasm_setjmp
-_get_typlenbyval
-_datumTransfer
-_invoke_iiii
-_invoke_v
-_invoke_i
-_ReThrowError
-_unpack_sql_state
-_cstring_to_text
-_invoke_viiiii
-_MemoryContextGetParent
-_emscripten_longjmp
-_CreateExecutorState
-_ResourceOwnerCreate
-_CreateExprContext
-_GetCurrentSubTransactionId
-_SPI_plan_get_plan_sources
-_SPI_execute_plan_extended
-_SPI_result_code_string
-_GetErrorContextStack
-_Int64GetDatum
-_SPI_cursor_close
-_SPI_cursor_find
-_SPI_cursor_open_with_paramlist
-_get_element_type
-_pg_detoast_datum_copy
-_array_create_iterator
-_array_iterate
-_MakeExpandedObjectReadOnlyInternal
-_tuplestore_putvalues
-_tuplestore_puttuple
-_tuplestore_tuple_count
-_CreateDestReceiver
-_SetTuplestoreDestReceiverParams
-_getTypeOutputInfo
-_OidOutputFunctionCall
-_MemoryContextStrdup
-_SPI_execute_extended
-_initStringInfo
-_appendStringInfoChar
-_appendStringInfoString
-_errdetail_internal
-_SPI_scroll_cursor_fetch
-_SPI_scroll_cursor_move
-_SPI_commit_and_chain
-_SPI_commit
-_SPI_rollback_and_chain
-_SPI_rollback
-_err_generic_string
-_SPI_prepare_extended
-_SPI_keepplan
-_SPI_plan_get_cached_plan
-_CachedPlanAllowsSimpleValidityCheck
-_ReleaseCachedPlan
-_EnsurePortalSnapshotExists
-_CachedPlanIsSimplyValid
-_ExecInitExprWithParams
-_CommandCounterIncrement
-_GetTransactionSnapshot
-_PushActiveSnapshot
-_PopActiveSnapshot
-_errmsg_plural
-_SPI_getbinval
-_exprType
-_exprTypmod
-_contain_mutable_functions
-_bms_is_member
-_get_typsubscript
-_SPI_execute_plan_with_paramlist
-_PinPortal
-_SPI_cursor_fetch
-_UnpinPortal
-_DirectFunctionCall1Coll
-_get_namespace_name
-_construct_md_array
-_GetCommandTagName
-_BlessTupleDesc
-_expanded_record_fetch_field
-_HeapTupleHeaderGetDatum
-_heap_form_tuple
-_tuplestore_begin_heap
-_bms_next_member
-_appendStringInfo
-_appendStringInfoStringQuoted
-_SPI_cursor_parse_open
-_ExprEvalPushStep
-_expanded_record_set_fields
-_typenameTypeIdAndMod
-_strcpy
-_SPI_freeplan
-_MemoryContextDelete
-_pg_printf
-_fflush
-_get_collation_oid
-_memmove
-_list_free
-_typeStringToTypeName
-_raw_parser
-_quote_identifier
-_appendStringInfoSpaces
-_scanner_isspace
-_geterrposition
-_getinternalerrposition
-_internalerrposition
-_errposition
-_pg_bindtextdomain
-_DefineCustomEnumVariable
-_DefineCustomBoolVariable
-_DefineCustomStringVariable
-_MarkGUCPrefixReserved
-_RegisterXactCallback
-_RegisterSubXactCallback
-_find_rendezvous_variable
-_pg_strcasecmp
-_SplitIdentifierString
-___errno_location
-_pre_format_elog_string
-_format_elog_string
-_guc_malloc
-_invoke_vii
-_invoke_iiiiiii
-_SPI_finish
-_CheckFunctionValidatorAccess
-_get_typtype
-_SPI_connect
-_ScanKeywordLookup
-_core_yylex
-_appendBinaryStringInfo
-_pg_mbstrlen_with_len
-_internalerrquery
-_strchr
-_scanner_init
-_scanner_finish
-_error_context_stack
-_TopMemoryContext
-_CurrentMemoryContext
-_check_function_bodies
-_InterruptPending
-_CurrentResourceOwner
-_plpgsql_parser_setup
-___THREW__
-___threwValue
-_BeginInternalSubTransaction
-_PG_exception_stack
-_ReleaseCurrentSubTransaction
-_CopyErrorData
-_FlushErrorState
-_RollbackAndReleaseCurrentSubTransaction
-_MemoryContextDeleteChildren
-_MyProc
-_TopTransactionContext
-_TopTransactionResourceOwner
-_SPI_processed
-_SPI_tuptable
-_SPI_result
-_namein
-_work_mem
-_stdout
-_GUC_check_errdetail_string
-_SPI_connect_ext
-_plpgsql_compile
-_ResourceOwnerDelete
-_pg_re_throw
diff --git a/patches/imports/vector b/patches/imports/vector
index 3d9d81f05..37da64559 100644
--- a/patches/imports/vector
+++ b/patches/imports/vector
@@ -1,6 +1,3 @@
-___stack_pointer
-___memory_base
-___table_base
 _palloc0
 _pg_detoast_datum
 _errstart_cold
@@ -12,7 +9,6 @@ _Float8GetDatum
 ___errno_location
 _strtof
 _errdetail
-_memcpy
 _pnstrdup
 _palloc
 _float_to_shortest_decimal_bufn
@@ -97,7 +93,6 @@ _MemoryContextAlloc
 _MemoryContextMemAllocated
 _MarkBufferDirty
 _UnlockReleaseBuffer
-_memset
 _PageGetFreeSpace
 _BufferGetBlockNumber
 _PageAddItemExtended
@@ -116,7 +111,6 @@ _PageGetExactFreeSpace
 _LockRelationForExtension
 _UnlockRelationForExtension
 _RelationGetIndexScan
-_memmove
 _pgstat_assoc_relation
 _list_make1_impl
 _pairingheap_remove_first
@@ -154,15 +148,15 @@ _BlockSampler_Next
 _tuplesort_estimate_shared
 _tuplesort_initialize_shared
 _MakeSingleTupleTableSlot
+_tuplesort_gettupleslot
+_slot_getsomeattrs_int
+_index_form_tuple
 _CreateTemplateTupleDesc
 _TupleDescInitEntry
 _ExecStoreVirtualTuple
 _tuplesort_puttupleslot
 _reservoir_get_next_S
 _sampler_random_fract
-_tuplesort_gettupleslot
-_slot_getsomeattrs_int
-_index_form_tuple
 _palloc_extended
 _tuplesort_reset
 _nocache_index_getattr
@@ -172,6 +166,9 @@ _pg_qsort
 _pg_ltoa
 _pq_getmsgfloat4
 _pq_sendfloat4
+___stack_pointer
+___memory_base
+___table_base
 _pg_number_of_ones
 _numeric_float4
 _MainLWLockArray
diff --git a/patches/interactive_one_wasi.c b/patches/interactive_one_wasi.c
new file mode 100644
index 000000000..b90bea35c
--- /dev/null
+++ b/patches/interactive_one_wasi.c
@@ -0,0 +1,621 @@
+#define PDEBUG(string) puts(string)
+#include <unistd.h>  // access, unlink
+
+#include "interactive_one.h"
+
+static void pg_prompt() {
+    fprintf(stdout,"pg> %c\n", 4);
+}
+
+extern void AbortTransaction(void);
+extern void CleanupTransaction(void);
+extern void ClientAuthentication(Port *port);
+extern FILE* SOCKET_FILE;
+extern int SOCKET_DATA;
+
+/*
+init sequence
+___________________________________
+SubPostmasterMain / (forkexec)
+    InitPostmasterChild
+    shm attach
+    preload
+
+    BackendInitialize(Port *port) -> collect initial packet
+
+	    pq_init();
+	    whereToSendOutput = DestRemote;
+	    status = ProcessStartupPacket(port, false, false);
+            pq_startmsgread
+            pq_getbytes from pq_recvbuf
+            TODO: place PqRecvBuffer (8K) in lower mem for zero copy
+
+        PerformAuthentication
+        ClientAuthentication(port)
+        CheckPasswordAuth SYNC!!!!  ( sendAuthRequest flush -> recv_password_packet )
+    InitShmemAccess/InitProcess/CreateSharedMemoryAndSemaphores
+
+    BackendRun(port)
+        PostgresMain
+
+
+-> pq_flush() is synchronous
+
+
+buffer sizes:
+
+    https://github.com/postgres/postgres/blob/master/src/backend/libpq/pqcomm.c#L118
+
+    https://github.com/postgres/postgres/blob/master/src/common/stringinfo.c#L28
+
+
+*/
+
+extern int	ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done);
+extern void pq_recvbuf_fill(FILE* fp, int packetlen);
+
+#define PG_MAX_AUTH_TOKEN_LENGTH	65535
+static char *
+recv_password_packet(Port *port) {
+	StringInfoData buf;
+	int			mtype;
+
+	pq_startmsgread();
+
+	/* Expect 'p' message type */
+	mtype = pq_getbyte();
+	if (mtype != 'p')
+	{
+		/*
+		 * If the client just disconnects without offering a password, don't
+		 * make a log entry.  This is legal per protocol spec and in fact
+		 * commonly done by psql, so complaining just clutters the log.
+		 */
+		if (mtype != EOF)
+			ereport(ERROR,
+					(errcode(ERRCODE_PROTOCOL_VIOLATION),
+					 errmsg("expected password response, got message type %d",
+							mtype)));
+		return NULL;			/* EOF or bad message type */
+	}
+
+	initStringInfo(&buf);
+	if (pq_getmessage(&buf, PG_MAX_AUTH_TOKEN_LENGTH))	/* receive password */
+	{
+		/* EOF - pq_getmessage already logged a suitable message */
+		pfree(buf.data);
+		return NULL;
+	}
+
+	/*
+	 * Apply sanity check: password packet length should agree with length of
+	 * contained string.  Note it is safe to use strlen here because
+	 * StringInfo is guaranteed to have an appended '\0'.
+	 */
+	if (strlen(buf.data) + 1 != buf.len)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROTOCOL_VIOLATION),
+				 errmsg("invalid password packet size")));
+
+	/*
+	 * Don't allow an empty password. Libpq treats an empty password the same
+	 * as no password at all, and won't even try to authenticate. But other
+	 * clients might, so allowing it would be confusing.
+	 *
+	 * Note that this only catches an empty password sent by the client in
+	 * plaintext. There's also a check in CREATE/ALTER USER that prevents an
+	 * empty string from being stored as a user's password in the first place.
+	 * We rely on that for MD5 and SCRAM authentication, but we still need
+	 * this check here, to prevent an empty password from being used with
+	 * authentication methods that check the password against an external
+	 * system, like PAM, LDAP and RADIUS.
+	 */
+	if (buf.len == 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PASSWORD),
+				 errmsg("empty password returned by client")));
+
+	/* Do not echo password to logs, for security. */
+	elog(DEBUG5, "received password packet");
+	return buf.data;
+}
+
+
+int md5Salt_len  = 4;
+char md5Salt[4];
+
+static void io_init(bool in_auth, bool out_auth) {
+    ClientAuthInProgress = in_auth;
+	pq_init();					/* initialize libpq to talk to client */
+	whereToSendOutput = DestRemote; /* now safe to ereport to client */
+    MyProcPort = (Port *) calloc(1, sizeof(Port));
+    if (!MyProcPort) {
+        PDEBUG("# 133: io_init   --------- NO CLIENT (oom) ---------");
+        abort();
+    }
+    MyProcPort->canAcceptConnections = CAC_OK;
+    ClientAuthInProgress = out_auth;
+
+    SOCKET_FILE = NULL;
+    SOCKET_DATA = 0;
+    PDEBUG("\n\n\n\n# 141: io_init  --------- Ready for CLIENT ---------");
+}
+
+EMSCRIPTEN_KEEPALIVE int
+cma_wsize = 0;
+
+EMSCRIPTEN_KEEPALIVE int
+cma_rsize = 0;
+
+
+volatile int sf_connected = 0;
+volatile bool sockfiles = false;
+volatile bool is_wire = true;
+extern char * cma_port;
+
+
+__attribute__((export_name("interactive_write"))) // EMSCRIPTEN_KEEPALIVE
+void
+interactive_write(int size) {
+    cma_rsize = size;
+    cma_wsize = 0;
+}
+
+/* TODO : prevent multiple write and write while reading ? */
+
+__attribute__((export_name("interactive_read"))) // EMSCRIPTEN_KEEPALIVE
+int
+interactive_read() {
+/* should cma_rsize should be reset here ? */
+    return cma_wsize;
+}
+
+
+__attribute__((export_name("use_wire")))
+void
+use_wire(int state) {
+    if (state>0) {
+        puts("180: wire mode, repl off, echo on");
+        force_echo=true;
+        is_wire = true;
+        is_repl = false;
+    } else {
+        //puts("184: repl mode, echo off");
+        force_echo=false;
+        is_wire = false;
+        is_repl = true;
+    }
+}
+
+__attribute__((export_name("clear_error")))
+void
+clear_error() {
+    error_context_stack = NULL;
+    HOLD_INTERRUPTS();
+
+    disable_all_timeouts(false);	/* do first to avoid race condition */
+    QueryCancelPending = false;
+    idle_in_transaction_timeout_enabled = false;
+    idle_session_timeout_enabled = false;
+    DoingCommandRead = false;
+
+    pq_comm_reset();
+    EmitErrorReport();
+    debug_query_string = NULL;
+
+    AbortCurrentTransaction();
+
+    if (am_walsender)
+        WalSndErrorCleanup();
+
+    PortalErrorCleanup();
+    if (MyReplicationSlot != NULL)
+        ReplicationSlotRelease();
+
+    ReplicationSlotCleanup();
+
+    MemoryContextSwitchTo(TopMemoryContext);
+    FlushErrorState();
+
+    if (doing_extended_query_message)
+        ignore_till_sync = true;
+
+    xact_started = false;
+
+    if (pq_is_reading_msg())
+        ereport(FATAL,
+                (errcode(ERRCODE_PROTOCOL_VIOLATION),
+                 errmsg("terminating connection because protocol synchronization was lost")));
+
+    RESUME_INTERRUPTS();
+
+    /*
+     * If we were handling an extended-query-protocol message, skip till next Sync.
+     * This also causes us not to issue ReadyForQuery (until we get Sync).
+     */
+
+    if (!ignore_till_sync)
+        send_ready_for_query = true;
+}
+
+void
+startup_auth() {
+    /* code is in handshake/auth domain so read whole msg now */
+
+    if (ProcessStartupPacket(MyProcPort, true, true) != STATUS_OK) {
+        PDEBUG("# 196: ProcessStartupPacket !OK");
+    } else {
+        PDEBUG("# 198: sending auth request");
+        //ClientAuthentication(MyProcPort);
+ClientAuthInProgress = true;
+        md5Salt[0]=0x01;
+        md5Salt[1]=0x23;
+        md5Salt[2]=0x45;
+        md5Salt[3]=0x56;
+        {
+            StringInfoData buf;
+            pq_beginmessage(&buf, 'R');
+            pq_sendint32(&buf, (int32) AUTH_REQ_MD5);
+            if (md5Salt_len > 0)
+                pq_sendbytes(&buf, md5Salt, md5Salt_len);
+            pq_endmessage(&buf);
+            pq_flush();
+        }
+    }
+}
+
+
+void
+startup_pass(bool check) {
+    // auth 'p'
+    if (check) {
+        char *passwd = recv_password_packet(MyProcPort);
+        printf("# 223: auth recv password: %s\n", "md5***" );
+        /*
+        // TODO: CheckMD5Auth
+            if (passwd == NULL)
+                return STATUS_EOF;
+            if (shadow_pass)
+                result = md5_crypt_verify(port->user_name, shadow_pass, passwd, md5Salt, md5Salt_len, logdetail);
+            else
+                result = STATUS_ERROR;
+        */
+        pfree(passwd);
+    } else {
+        PDEBUG("# 235: auth skip");
+    }
+    ClientAuthInProgress = false;
+
+    {
+        StringInfoData buf;
+        pq_beginmessage(&buf, 'R');
+        pq_sendint32(&buf, (int32) AUTH_REQ_OK);
+        pq_endmessage(&buf);
+    }
+
+    BeginReportingGUCOptions();
+    pgstat_report_connect(MyDatabaseId);
+    {
+        StringInfoData buf;
+        pq_beginmessage(&buf, 'K');
+        pq_sendint32(&buf, (int32) MyProcPid);
+        pq_sendint32(&buf, (int32) MyCancelKey);
+        pq_endmessage(&buf);
+    }
+PDEBUG("# 255: TODO: set a pg_main started flag");
+    sf_connected++;
+    send_ready_for_query = true;
+
+}
+
+extern void pg_startcma();
+
+EMSCRIPTEN_KEEPALIVE void
+interactive_one() {
+    int	peek = -1;  /* preview of firstchar with no pos change */
+	int firstchar = 0;  /* character read from getc() */
+    bool pipelining = true;
+	StringInfoData input_message;
+	StringInfoData *inBuf;
+    FILE *stream ;
+    FILE *fp;
+    int packetlen;
+
+    if (!MyProcPort) {
+        io_init(is_wire, false);
+/*
+        ClientAuthInProgress = true;
+        pq_init();
+        MyProcPort = (Port *) calloc(1, sizeof(Port));
+        if (!MyProcPort) {
+            PDEBUG("      --------- NO CLIENT (oom) ---------");
+            abort();
+        }
+        MyProcPort->canAcceptConnections = CAC_OK;
+        ClientAuthInProgress = false;
+*/
+    }
+
+
+    // this could be pg_flush in sync mode.
+    // but in fact we are writing socket data that was piled up previous frame async.
+    if (SOCKET_DATA>0) {
+        puts("281: ERROR flush after frame");
+        goto wire_flush;
+    }
+
+    if (!cma_rsize) {
+        // prepare reply queue
+        if (!SOCKET_FILE) {
+            SOCKET_FILE =  fopen(PGS_OLOCK, "w") ;
+            MyProcPort->sock = fileno(SOCKET_FILE);
+        }
+    }
+
+    doing_extended_query_message = false;
+    MemoryContextSwitchTo(MessageContext);
+    MemoryContextResetAndDeleteChildren(MessageContext);
+
+    initStringInfo(&input_message);
+
+    inBuf = &input_message;
+
+	InvalidateCatalogSnapshotConditionally();
+
+	if (send_ready_for_query)
+	{
+
+		if (IsAbortedTransactionBlockState())
+		{
+			puts("@@@@ TODO 219: idle in transaction (aborted)");
+		}
+		else if (IsTransactionOrTransactionBlock())
+		{
+			puts("@@@@ TODO 235: idle in transaction");
+		}
+		else
+		{
+			if (notifyInterruptPending)
+				ProcessNotifyInterrupt(false);
+        }
+        send_ready_for_query = false;
+    }
+
+
+// postgres.c 4627
+    DoingCommandRead = true;
+
+#if defined(EMUL_CMA)
+    #define IO ((char *)(1+(int)cma_port))  //  temp fix for -O0 but less efficient than literal
+    #error "inefficient"
+#else
+    #define IO ((char *)(1))
+#endif
+
+
+/*
+ * in cma mode (cma_rsize>0), client call the wire loop itself waiting synchronously for the results
+ * in socketfiles mode, the wire loop polls a pseudo socket made from incoming and outgoing files.
+ * in repl mode (cma_rsize==0) output is on stdout not cma/socketfiles wire. repl mode is default.
+ */
+
+    peek = IO[0];
+    packetlen = cma_rsize;
+
+    if (cma_rsize) {
+        sockfiles = false;
+        is_repl = false;
+        whereToSendOutput = DestRemote;
+        if (!is_wire)
+            PDEBUG("repl message in cma buffer !");
+    } else {
+        fp = fopen(PGS_IN, "r");
+
+        // read as a socket.
+        if (fp) {
+            fseek(fp, 0L, SEEK_END);
+            packetlen = ftell(fp);
+            if (packetlen) {
+                // always.
+                is_wire = true;
+                sockfiles = true;
+                whereToSendOutput = DestRemote;
+                resetStringInfo(inBuf);
+                rewind(fp);
+                /* peek on first char */
+                peek = getc(fp);
+                rewind(fp);
+                pq_recvbuf_fill(fp, packetlen);
+    #if PGDEBUG
+                rewind(fp);
+    #endif
+                /* is it startup/auth packet ? */
+                if (!peek) {
+                    startup_auth();
+                    peek = -1;
+                }
+                if (peek==112) {
+                    startup_pass(true);
+                    peek = -1;
+                }
+            }
+
+            /* FD CLEANUP, all cases */
+            fclose(fp);
+            unlink(PGS_IN);
+
+            if (packetlen) {
+                // it was startup/auth , write and return fast.
+                if (peek<0) {
+                    PDEBUG("# 399: handshake/auth/pass skip");
+                    goto wire_flush;
+                }
+
+                /* else it was wire msg */
+    #if PGDEBUG
+                printf("# 405: node+repl is_wire -> true : %c\n", peek);
+                force_echo = true;
+    #endif
+                firstchar = peek;
+                goto incoming;
+            } // wire msg
+
+        } // fp data read
+
+        // is it REPL in cma ?
+        if (!peek)
+            return;
+
+        puts("# 418 : defaulting to REPL mode");
+
+        firstchar = peek ;
+        is_repl = true;
+        is_wire = false;
+        whereToSendOutput = DestNone;
+
+        //REPL mode  in zero copy buffer ( lowest wasm memory segment )
+        packetlen = strlen(IO);
+
+    } // !cma_rsize -> socketfiles -> repl
+
+#if PGDEBUG
+        printf("# 429: fd %s: %s fd=%d is_embed=%d is_repl=%d is_wire=%d peek=%d len=%d\n", PGS_OLOCK, IO, MyProcPort->sock, is_embed, is_repl, is_wire, peek, packetlen);
+#endif
+
+    // buffer query TODO: direct access ?
+    // CMA wire mode. -> packetlen was set to cma_rsize
+    resetStringInfo(inBuf);
+
+    for (int i=0; i<packetlen; i++) {
+        appendStringInfoChar(inBuf, IO[i]);
+    }
+
+    if (packetlen<2) {
+        puts("# 441: WARNING: empty packet");
+        cma_rsize= 0;
+        pg_prompt();
+        // always free cma buffer !!!
+        IO[0] = 0;
+        return;
+    }
+
+incoming:
+#if defined(__wasi__) //PGDEBUG
+    PDEBUG("# 451: sjlj exception handler off");
+#else
+    #error "sigsetjmp unsupported"
+#endif // wasi
+
+    while (pipelining) {
+        if (is_repl) {
+            // TODO: are we sure repl could not pipeline ?
+            pipelining = false;
+            /* stdio node repl */
+            whereToSendOutput = DestDebug;
+        }
+
+        if (is_wire) {
+            /* wire on a socket or cma may auth, not handled by pg_proto block */
+            if (peek==0) {
+                PDEBUG("# 470: handshake/auth");
+                startup_auth();
+                PDEBUG("# 472: auth request");
+                break;
+            }
+
+            if (peek==112) {
+                PDEBUG("# 477: password");
+                startup_pass(true);
+                break;
+            }
+
+            firstchar = SocketBackend(inBuf);
+
+            #if PGDEBUG
+                if (force_echo) {
+                    printf("# 486: wire=%d 1stchar=%c Q: %s\n", is_wire,  firstchar, inBuf->data);
+                    force_echo = false;
+                } else {
+                    printf("# 489: PIPELINING [%c]!\n", firstchar);
+                }
+            #endif
+            pipelining = pq_buffer_has_data();
+            if (!pipelining) {
+                printf("# 494: end of wire, rfq=%d\n", send_ready_for_query);
+            } else {
+                printf("# 496: no end of wire -> pipelining, rfq=%d\n", send_ready_for_query);
+            }
+        } else {
+            /* nowire */
+            if (firstchar == EOF && inBuf->len == 0) {
+                firstchar = EOF;
+            } else {
+                appendStringInfoChar(inBuf, (char) '\0');
+            	firstchar = 'Q';
+            }
+        }
+
+        if (!ignore_till_sync)
+            send_ready_for_query = true;
+
+        if (ignore_till_sync && firstchar != EOF) {
+            puts("@@@@@@@@@@@@@ 512 TODO: postgres.c 	4684 :	continue");
+        } else {
+            /* process notifications */
+            ProcessClientReadInterrupt(true);
+        }
+
+        #include "pg_proto.c"
+
+    }
+
+
+    if (!is_repl) {
+wire_flush:
+        if (!ClientAuthInProgress) {
+            if (send_ready_for_query) {
+                PDEBUG("# 556: end packet - sending rfq");
+                ReadyForQuery(DestRemote);
+                //done at postgres.c 4623 send_ready_for_query = false;
+            } else {
+                PDEBUG("# 531: end packet - with no rfq");
+            }
+        } else {
+            PDEBUG("# 534: end packet (ClientAuthInProgress - no rfq) ");
+        }
+
+        if (SOCKET_DATA>0) {
+            if (sockfiles) {
+                if (cma_wsize)
+                    puts("ERROR: cma was not flushed before socketfile interface");
+            } else {
+                /* wsize may have increased with previous rfq so assign here */
+                cma_wsize = SOCKET_DATA;
+            }
+            if (SOCKET_FILE) {
+                int outb = SOCKET_DATA;
+                fclose(SOCKET_FILE);
+                SOCKET_FILE = NULL;
+                SOCKET_DATA = 0;
+                if (cma_wsize)
+                    PDEBUG("# 551: cma and sockfile ???");
+                if (sockfiles) {
+#if PGDEBUG
+                    printf("# 554: client:ready -> read(%d) " PGS_OLOCK "->" PGS_OUT"\n", outb);
+#endif
+                    rename(PGS_OLOCK, PGS_OUT);
+                }
+            }
+
+        } else {
+            cma_wsize = 0;
+        }
+    }
+
+    // always free kernel buffer !!!
+    cma_rsize = 0;
+    IO[0] = 0;
+
+    #undef IO
+}
+
diff --git a/patches/pg_main.c b/patches/pg_main.c
index 4ac51bec0..67822c473 100644
--- a/patches/pg_main.c
+++ b/patches/pg_main.c
@@ -6,10 +6,8 @@
 #define IDB_HASDB   0b0100
 #define IDB_HASUSER 0b1000
 
-#if defined(PG_MAIN)
-
-#if defined(PG_EC_STATIC) || defined(__wasi__)
-#warning "PG_EC_STATIC"
+#if defined(PG_MAIN) && ( defined(PG_EC_STATIC) || defined(__wasi__) )
+#   warning "PG_EC_STATIC"
 
 EMSCRIPTEN_KEEPALIVE void
 fsync_pgdata(const char *pg_data, int serverVersion) {
@@ -36,6 +34,10 @@ pg_realloc(void *ptr, size_t size) {
     return realloc(ptr, size);
 }
 
+EMSCRIPTEN_KEEPALIVE void pg_free(void *ptr) {
+    free(ptr);
+}
+
 EMSCRIPTEN_KEEPALIVE char *
 pg_strdup(const char *in) {
 	char	   *tmp;
@@ -60,1285 +62,12 @@ simple_prompt(const char *prompt, bool echo) {
     return pg_strdup("");
 }
 
-
-
 #endif // PG_EC_STATIC
 
 
-bool is_node = false;
-bool is_repl = true;
-
-EMSCRIPTEN_KEEPALIVE bool
-quote_all_identifiers = false;
-
-
-EMSCRIPTEN_KEEPALIVE void interactive_one(void);
-EMSCRIPTEN_KEEPALIVE void interactive_file(void);
-
-/* exported from postmaster.h */
-EMSCRIPTEN_KEEPALIVE const char*
-progname;
-
-void
-PostgresMain(const char *dbname, const char *username)
-{
-    puts("# 82: ERROR: PostgresMain should not be called anymore" __FILE__ );
-    while (1){};
-}
-
-
-
-volatile bool send_ready_for_query = true;
-volatile bool idle_in_transaction_timeout_enabled = false;
-volatile bool idle_session_timeout_enabled = false;
-volatile sigjmp_buf local_sigjmp_buf;
-
-volatile bool repl = true ;
-volatile int pg_idb_status = 0;
-volatile bool inloop = false;
-
-/* ================================================================================ */
-/* ================================================================================ */
-/* ================================================================================ */
-/* ================================================================================ */
-
-EMSCRIPTEN_KEEPALIVE
-FILE * single_mode_feed = NULL;
-
-bool force_echo = false;
-
-extern void ReInitPostgres(const char *in_dbname, Oid dboid,
-			 const char *username, Oid useroid,
-			 bool load_session_libraries,
-			 bool override_allow_connections,
-			 char *out_dbname);
-
-
-void
-AsyncPostgresSingleUserMain(int argc, char *argv[],
-					   const char *username, int async_restart)
-{
-	const char *dbname = NULL;
-PDEBUG("# 122");
-	/* Initialize startup process environment. */
-	InitStandaloneProcess(argv[0]);
-
-	/* Set default values for command-line options.	 */
-	InitializeGUCOptions();
-PDEBUG("# 128");
-	/* Parse command-line options. */
-	process_postgres_switches(argc, argv, PGC_POSTMASTER, &dbname);
-PDEBUG("# 131");
-	/* Must have gotten a database name, or have a default (the username) */
-	if (dbname == NULL)
-	{
-		dbname = username;
-		if (dbname == NULL)
-			ereport(FATAL,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("%s: no database nor user name specified",
-							progname)));
-	}
-
-if (async_restart) goto async_db_change;
-	/* Acquire configuration parameters */
-	if (!SelectConfigFiles(userDoption, progname))
-		proc_exit(1);
-
-	checkDataDir();
-	ChangeToDataDir();
-
-	/*
-	 * Create lockfile for data directory.
-	 */
-	CreateDataDirLockFile(false);
-
-	/* read control file (error checking and contains config ) */
-	LocalProcessControlFile(false);
-
-	/*
-	 * process any libraries that should be preloaded at postmaster start
-	 */
-	process_shared_preload_libraries();
-
-	/* Initialize MaxBackends */
-	InitializeMaxBackends();
-PDEBUG("# 166");
-	/*
-	 * Give preloaded libraries a chance to request additional shared memory.
-	 */
-	process_shmem_requests();
-
-	/*
-	 * Now that loadable modules have had their chance to request additional
-	 * shared memory, determine the value of any runtime-computed GUCs that
-	 * depend on the amount of shared memory required.
-	 */
-	InitializeShmemGUCs();
-
-	/*
-	 * Now that modules have been loaded, we can process any custom resource
-	 * managers specified in the wal_consistency_checking GUC.
-	 */
-	InitializeWalConsistencyChecking();
-
-	CreateSharedMemoryAndSemaphores();
-
-	/*
-	 * Remember stand-alone backend startup time,roughly at the same point
-	 * during startup that postmaster does so.
-	 */
-	PgStartTime = GetCurrentTimestamp();
-
-	/*
-	 * Create a per-backend PGPROC struct in shared memory. We must do this
-	 * before we can use LWLocks.
-	 */
-	InitProcess();
-
-// main
-	SetProcessingMode(InitProcessing);
-
-	/* Early initialization */
-	BaseInit();
-async_db_change:;
-PDEBUG("# 205");
-	/*
-	 * General initialization.
-	 *
-	 * NOTE: if you are tempted to add code in this vicinity, consider putting
-	 * it inside InitPostgres() instead.  In particular, anything that
-	 * involves database access should be there, not here.
-	 */
-	InitPostgres(dbname, InvalidOid,	/* database to connect to */
-				 username, InvalidOid,	/* role to connect as */
-				 !am_walsender, /* honor session_preload_libraries? */
-				 false,			/* don't ignore datallowconn */
-				 NULL);			/* no out_dbname */
-
-	/*
-	 * If the PostmasterContext is still around, recycle the space; we don't
-	 * need it anymore after InitPostgres completes.  Note this does not trash
-	 * *MyProcPort, because ConnCreate() allocated that space with malloc()
-	 * ... else we'd need to copy the Port data first.  Also, subsidiary data
-	 * such as the username isn't lost either; see ProcessStartupPacket().
-	 */
-	if (PostmasterContext)
-	{
-		MemoryContextDelete(PostmasterContext);
-		PostmasterContext = NULL;
-	}
-
-	SetProcessingMode(NormalProcessing);
-
-	/*
-	 * Now all GUC states are fully set up.  Report them to client if
-	 * appropriate.
-	 */
-	BeginReportingGUCOptions();
-
-	/*
-	 * Also set up handler to log session end; we have to wait till now to be
-	 * sure Log_disconnections has its final value.
-	 */
-	if (IsUnderPostmaster && Log_disconnections)
-		on_proc_exit(log_disconnections, 0);
-
-	pgstat_report_connect(MyDatabaseId);
-
-	/* Perform initialization specific to a WAL sender process. */
-	if (am_walsender)
-		InitWalSender();
-
-	/*
-	 * Send this backend's cancellation info to the frontend.
-	 */
-	if (whereToSendOutput == DestRemote)
-	{
-		StringInfoData buf;
-
-		pq_beginmessage(&buf, 'K');
-		pq_sendint32(&buf, (int32) MyProcPid);
-		pq_sendint32(&buf, (int32) MyCancelKey);
-		pq_endmessage(&buf);
-		/* Need not flush since ReadyForQuery will do it. */
-	}
-
-	/* Welcome banner for standalone case */
-	if (whereToSendOutput == DestDebug)
-		printf("\nPostgreSQL stand-alone backend %s\n", PG_VERSION);
-
-	/*
-	 * Create the memory context we will use in the main loop.
-	 *
-	 * MessageContext is reset once per iteration of the main loop, ie, upon
-	 * completion of processing of each command message from the client.
-	 */
-	MessageContext = AllocSetContextCreate(TopMemoryContext, "MessageContext", ALLOCSET_DEFAULT_SIZES);
-
-	/*
-	 * Create memory context and buffer used for RowDescription messages. As
-	 * SendRowDescriptionMessage(), via exec_describe_statement_message(), is
-	 * frequently executed for ever single statement, we don't want to
-	 * allocate a separate buffer every time.
-	 */
-	row_description_context = AllocSetContextCreate(TopMemoryContext, "RowDescriptionContext", ALLOCSET_DEFAULT_SIZES);
-	MemoryContextSwitchTo(row_description_context);
-	initStringInfo(&row_description_buf);
-	MemoryContextSwitchTo(TopMemoryContext);
-}
-
-void
-RePostgresSingleUserMain(int single_argc, char *single_argv[], const char *username)
-{
-#if PGDEBUG
-printf("# 295: RePostgresSingleUserMain progname=%s for %s feed=%s\n", progname, single_argv[0], IDB_PIPE_SINGLE);
-#endif
-    single_mode_feed = fopen(IDB_PIPE_SINGLE, "r");
-
-    // should be template1.
-    const char *dbname = NULL;
-
-
-    /* Parse command-line options. */
-    process_postgres_switches(single_argc, single_argv, PGC_POSTMASTER, &dbname);
-#if PGDEBUG
-printf("# 306: dbname=%s\n", dbname);
-#endif
-    LocalProcessControlFile(false);
-
-    process_shared_preload_libraries();
-
-//	                InitializeMaxBackends();
-
-// ? IgnoreSystemIndexes = true;
-IgnoreSystemIndexes = false;
-    process_shmem_requests();
-
-    InitializeShmemGUCs();
-
-    InitializeWalConsistencyChecking();
-
-    PgStartTime = GetCurrentTimestamp();
-
-    SetProcessingMode(InitProcessing);
-PDEBUG("# 326: Re-InitPostgres");
-if (am_walsender)
-    PDEBUG("# 327: am_walsender == true");
-//      BaseInit();
-
-    InitPostgres(dbname, InvalidOid,	/* database to connect to */
-                 username, InvalidOid,	/* role to connect as */
-                 !am_walsender, /* honor session_preload_libraries? */
-                 false,			/* don't ignore datallowconn */
-                 NULL);			/* no out_dbname */
-
-PDEBUG("# 334");
-/*
-    if (PostmasterContext)
-    {
-        PDEBUG("# 103");
-        MemoryContextDelete(PostmasterContext);
-        PostmasterContext = NULL;
-    }
-*/
-    SetProcessingMode(NormalProcessing);
-
-    BeginReportingGUCOptions();
-
-    if (IsUnderPostmaster && Log_disconnections)
-        on_proc_exit(log_disconnections, 0);
-
-    pgstat_report_connect(MyDatabaseId);
-
-    /* Perform initialization specific to a WAL sender process. */
-    if (am_walsender)
-        InitWalSender();
-/*
-    if (whereToSendOutput == DestRemote)
-    {
-        StringInfoData buf;
-
-        pq_beginmessage(&buf, 'K');
-        pq_sendint32(&buf, (int32) MyProcPid);
-        pq_sendint32(&buf, (int32) MyCancelKey);
-        pq_endmessage(&buf);
-        // Need not flush since ReadyForQuery will do it.
-    }
-*/
-#if PGDEBUG
-    whereToSendOutput = DestDebug;
-#endif
-
-    if (whereToSendOutput == DestDebug)
-        printf("\nPostgreSQL stand-alone backend %s\n", PG_VERSION);
-
-    /*
-     * Create the memory context we will use in the main loop.
-     *
-     * MessageContext is reset once per iteration of the main loop, ie, upon
-     * completion of processing of each command message from the client.
-     */
-    MessageContext = AllocSetContextCreate(TopMemoryContext,
-						                   "MessageContext",
-						                   ALLOCSET_DEFAULT_SIZES);
-
-    /*
-     * Create memory context and buffer used for RowDescription messages. As
-     * SendRowDescriptionMessage(), via exec_describe_statement_message(), is
-     * frequently executed for ever single statement, we don't want to
-     * allocate a separate buffer every time.
-     */
-    row_description_context = AllocSetContextCreate(TopMemoryContext,
-									                "RowDescriptionContext",
-									                ALLOCSET_DEFAULT_SIZES);
-    MemoryContextSwitchTo(row_description_context);
-    initStringInfo(&row_description_buf);
-    MemoryContextSwitchTo(TopMemoryContext);
-
-#if 1 //PGDEBUG
-    PDEBUG("# 415: exception handler off");
-#else
-    if (sigsetjmp(local_sigjmp_buf, 1) != 0)
-    {
-        /*
-         * NOTE: if you are tempted to add more code in this if-block,
-         * consider the high probability that it should be in
-         * AbortTransaction() instead.  The only stuff done directly here
-         * should be stuff that is guaranteed to apply *only* for outer-level
-         * error recovery, such as adjusting the FE/BE protocol status.
-         */
-
-        /* Since not using PG_TRY, must reset error stack by hand */
-        error_context_stack = NULL;
-
-        /* Prevent interrupts while cleaning up */
-        HOLD_INTERRUPTS();
-
-        /*
-         * Forget any pending QueryCancel request, since we're returning to
-         * the idle loop anyway, and cancel any active timeout requests.  (In
-         * future we might want to allow some timeout requests to survive, but
-         * at minimum it'd be necessary to do reschedule_timeouts(), in case
-         * we got here because of a query cancel interrupting the SIGALRM
-         * interrupt handler.)	Note in particular that we must clear the
-         * statement and lock timeout indicators, to prevent any future plain
-         * query cancels from being misreported as timeouts in case we're
-         * forgetting a timeout cancel.
-         */
-        disable_all_timeouts(false);	/* do first to avoid race condition */
-        QueryCancelPending = false;
-        idle_in_transaction_timeout_enabled = false;
-        idle_session_timeout_enabled = false;
-
-        /* Not reading from the client anymore. */
-        DoingCommandRead = false;
-
-        /* Make sure libpq is in a good state */
-        pq_comm_reset();
-
-        /* Report the error to the client and/or server log */
-        EmitErrorReport();
-
-        /*
-         * If Valgrind noticed something during the erroneous query, print the
-         * query string, assuming we have one.
-         */
-        valgrind_report_error_query(debug_query_string);
-
-        /*
-         * Make sure debug_query_string gets reset before we possibly clobber
-         * the storage it points at.
-         */
-        debug_query_string = NULL;
-
-        /*
-         * Abort the current transaction in order to recover.
-         */
-        AbortCurrentTransaction();
-
-        if (am_walsender)
-            WalSndErrorCleanup();
-
-        PortalErrorCleanup();
-
-        /*
-         * We can't release replication slots inside AbortTransaction() as we
-         * need to be able to start and abort transactions while having a slot
-         * acquired. But we never need to hold them across top level errors,
-         * so releasing here is fine. There also is a before_shmem_exit()
-         * callback ensuring correct cleanup on FATAL errors.
-         */
-        if (MyReplicationSlot != NULL)
-            ReplicationSlotRelease();
-
-        /* We also want to cleanup temporary slots on error. */
-        ReplicationSlotCleanup();
-
-        jit_reset_after_error();
-
-        /*
-         * Now return to normal top-level context and clear ErrorContext for
-         * next time.
-         */
-        MemoryContextSwitchTo(TopMemoryContext);
-        FlushErrorState();
-
-        /*
-         * If we were handling an extended-query-protocol message, initiate
-         * skip till next Sync.  This also causes us not to issue
-         * ReadyForQuery (until we get Sync).
-         */
-        if (doing_extended_query_message)
-            ignore_till_sync = true;
-
-        /* We don't have a transaction command open anymore */
-        xact_started = false;
-
-        /*
-         * If an error occurred while we were reading a message from the
-         * client, we have potentially lost track of where the previous
-         * message ends and the next one begins.  Even though we have
-         * otherwise recovered from the error, we cannot safely read any more
-         * messages from the client, so there isn't much we can do with the
-         * connection anymore.
-         */
-        if (pq_is_reading_msg())
-            ereport(FATAL,
-	                (errcode(ERRCODE_PROTOCOL_VIOLATION),
-	                 errmsg("terminating connection because protocol synchronization was lost")));
-
-        /* Now we can allow interrupts again */
-        RESUME_INTERRUPTS();
-    }
-
-    /* We can now handle ereport(ERROR) */
-    PG_exception_stack = &local_sigjmp_buf;
-
-#endif
-
-    if (!ignore_till_sync)
-        send_ready_for_query = true;	/* initially, or after error */
-
-    if (!inloop) {
-        inloop = true;
-        PDEBUG("# 545: REPL(initdb-single):Begin " __FILE__ );
-
-        while (repl) { interactive_file(); }
-    } else {
-        // signal error
-        optind = -1;
-    }
-
-    fclose(single_mode_feed);
-
-    if (strlen(getenv("REPL")) && getenv("REPL")[0]=='Y') {
-        PDEBUG("# 556: REPL(initdb-single):End " __FILE__ );
-
-        /* now use stdin as source */
-        repl = true;
-        single_mode_feed = NULL;
-
-        force_echo = true;
-
-        if (!is_node) {
-#if PGDEBUG
-            fprintf(stdout,"# 566: now in webloop(RAF)\npg> %c\n", 4);
-#endif
-            emscripten_set_main_loop( (em_callback_func)interactive_one, 0, 0);
-        } else {
-            PDEBUG("# 570: REPL(single after initdb):Begin(NORETURN)");
-            while (repl) { interactive_file(); }
-            PDEBUG("# 572: REPL:End Raising a 'RuntimeError Exception' to halt program NOW");
-            {
-                void (*npe)() = NULL;
-                npe();
-            }
-        }
-
-        // unreachable.
-    }
-
-    PDEBUG("# 582: no line-repl requested, exiting and keeping runtime alive");
-}
-
-
-
-
-/* ================================================================================ */
-/* ================================================================================ */
-/* ================================================================================ */
-/* ================================================================================ */
-
-
-extern int cma_rsize;
-
-EMSCRIPTEN_KEEPALIVE void
-pg_repl_raf(){
-
-    is_repl = strlen(getenv("REPL")) && getenv("REPL")[0]=='Y';
-    if (is_node) {
-        PDEBUG(WASM_PREFIX "/bin/postgres.js");
-        printf("cma_rsize was %d\n now set to 0\n", cma_rsize);
-        // force wire socket emulation
-        cma_rsize = 0;
-        if (!strcmp(getenv("_"), WASM_PREFIX "/bin/postgres.js")) {
-            while (1) {
-                interactive_one();
-            }
-            PDEBUG("# 609: REPL:End Raising a 'RuntimeError Exception' to halt program NOW");
-            {
-                void (*npe)() = NULL;
-                npe();
-            }
-
-        }
-    }
-    if (is_repl) {
-PDEBUG("# 618: pg_repl_raf(REPL)");
-        repl = true;
-        single_mode_feed = NULL;
-        force_echo = true;
-        whereToSendOutput = DestNone;
-        emscripten_set_main_loop( (em_callback_func)interactive_one, 0, 0);
-    } else {
-        PDEBUG("# 625: TODO: headless wire mode");
-    }
-
-    if (is_node) {
-#if defined(__wasi__)
-        PDEBUG("# 629: pg_repl_raf(WASI) endless loop");
-        while (1) {
-            interactive_one();
-        }
-#else
-        PDEBUG("# 629: pg_repl_raf(NODE) EXIT!!!");
-#endif
-    }
-
-}
-
-
-EMSCRIPTEN_KEEPALIVE void
-pg_shutdown() {
-    PDEBUG("# 637: pg_shutdown");
-    proc_exit(66);
-}
-
-int loops = 0;
-
-
-
-EM_JS(int, peek_fd, (int fd), {
-    return test_data.length;
-});
-
-EM_JS(int, fnc_getfd, (int fd), {
-    return fnc_stdin()
-});
-
-
-EMSCRIPTEN_KEEPALIVE void
-interactive_file() {
-	int			firstchar;
-	int			c;				/* character read from getc() */
-	StringInfoData input_message;
-	StringInfoData *inBuf;
-    FILE *stream ;
-
-	/*
-	 * At top of loop, reset extended-query-message flag, so that any
-	 * errors encountered in "idle" state don't provoke skip.
-	 */
-	doing_extended_query_message = false;
-
-	/*
-	 * Release storage left over from prior query cycle, and create a new
-	 * query input buffer in the cleared MessageContext.
-	 */
-	MemoryContextSwitchTo(MessageContext);
-	MemoryContextResetAndDeleteChildren(MessageContext);
-
-	initStringInfo(&input_message);
-    inBuf = &input_message;
-	DoingCommandRead = true;
-
-	//firstchar = ReadCommand(&input_message);
-	if (whereToSendOutput == DestRemote)
-		firstchar = SocketBackend(&input_message);
-	else {
-
-	    /*
-	     * display a prompt and obtain input from the user
-	     */
-        if (!single_mode_feed) {
-	        printf("pg> %c\n", 4);
-        	fflush(stdout);
-            stream = stdin;
-        } else {
-            stream = single_mode_feed;
-        }
-
-	    resetStringInfo(inBuf);
-	    while ((c = getc(stream)) != EOF)
-	    {
-		    if (c == '\n')
-		    {
-			    if (UseSemiNewlineNewline)
-			    {
-				    /*
-				     * In -j mode, semicolon followed by two newlines ends the
-				     * command; otherwise treat newline as regular character.
-				     */
-				    if (inBuf->len > 1 &&
-					    inBuf->data[inBuf->len - 1] == '\n' &&
-					    inBuf->data[inBuf->len - 2] == ';')
-				    {
-					    /* might as well drop the second newline */
-					    break;
-				    }
-			    }
-			    else
-			    {
-				    /*
-				     * In plain mode, newline ends the command unless preceded by
-				     * backslash.
-				     */
-				    if (inBuf->len > 0 &&
-					    inBuf->data[inBuf->len - 1] == '\\')
-				    {
-					    /* discard backslash from inBuf */
-					    inBuf->data[--inBuf->len] = '\0';
-					    /* discard newline too */
-					    continue;
-				    }
-				    else
-				    {
-					    /* keep the newline character, but end the command */
-					    appendStringInfoChar(inBuf, '\n');
-					    break;
-				    }
-			    }
-		    }
-
-		    /* Not newline, or newline treated as regular character */
-		    appendStringInfoChar(inBuf, (char) c);
-	    }
-
-	    if (c == EOF && inBuf->len == 0) {
-		    firstchar = EOF;
-        } else {
-        	/* Add '\0' to make it look the same as message case. */
-	        appendStringInfoChar(inBuf, (char) '\0');
-        	firstchar = 'Q';
-        }
-
-    }
-
-	if (ignore_till_sync && firstchar != EOF)
-		return;
-
-    #include "pg_proto.c"
-}
-
-#include "./interactive_one.c"
-
-
-void
-PostgresSingleUserMain(int argc, char *argv[],
-					   const char *username)
-{
-    while(1){};
-}
-
-#else  // defined(PG_MAIN)
-
-extern bool is_node;
-extern bool is_repl;
-
-extern bool quote_all_identifiers;
-
-#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-#include <unistd.h>        /* chdir */
-#include <sys/stat.h>      /* mkdir */
-static
-void mkdirp(const char *p) {
-	if (!mkdir(p, 0700)) {
-		fprintf(stderr, "# no '%s' directory, creating one ...\n", p);
-	}
-}
-#endif /* wasm */
-
-
-#if defined(PG_INITDB_MAIN) || defined(__wasi__)
-extern int pg_initdb_main(void);
-
-extern void RePostgresSingleUserMain(int single_argc, char *single_argv[], const char *username);
-extern void AsyncPostgresSingleUserMain(int single_argc, char *single_argv[], const char *username, int async_restart);
-extern void main_post(void);
-extern void proc_exit(int code);
-extern bool IsPostmasterEnvironment;
-
-extern volatile int pg_idb_status;
-#if PGDEBUG
-void print_bits(size_t const size, void const * const ptr);
-void print_bits(size_t const size, void const * const ptr)
-{
-    unsigned char *b = (unsigned char*) ptr;
-    unsigned char byte;
-    int i, j;
-
-    for (i = size-1; i >= 0; i--) {
-        for (j = 7; j >= 0; j--) {
-            byte = (b[i] >> j) & 1;
-            printf("%u", byte);
-        }
-    }
-    puts("");
-}
-#endif // PGDEBUG
-EMSCRIPTEN_KEEPALIVE int
-pg_initdb() {
-    PDEBUG("# 1066: pg_initdb()");
-    optind = 1;
-    int async_restart = 1;
-    pg_idb_status |= IDB_FAILED;
-
-    if (!chdir(getenv("PGDATA"))){
-        if (access("PG_VERSION", F_OK) == 0) {
-        	chdir("/");
-
-            pg_idb_status |= IDB_HASDB;
-
-            /* assume auth success for now */
-            pg_idb_status |= IDB_HASUSER;
-#if PGDEBUG
-            printf("# 1080: pg_initdb: db exists at : %s TODO: test for db name : %s \n", getenv("PGDATA"), getenv("PGDATABASE"));
-            print_bits(sizeof(pg_idb_status), &pg_idb_status);
-#endif // PGDEBUG
-            main_post();
-            async_restart = 0;
-            {
-                char *single_argv[] = {
-                    WASM_PREFIX "/bin/postgres",
-                    "--single",
-                    "-d", "1", "-B", "16", "-S", "512", "-f", "siobtnmh",
-                    "-D", getenv("PGDATA"),
-                    "-F", "-O", "-j",
-                    WASM_PGOPTS,
-                    getenv("PGDATABASE"),
-                    NULL
-                };
-                int single_argc = sizeof(single_argv) / sizeof(char*) - 1;
-                optind = 1;
-                AsyncPostgresSingleUserMain(single_argc, single_argv, strdup(getenv("PGUSER")), async_restart);
-            }
-
-            goto initdb_done;
-        }
-    	chdir("/");
-#if PGDEBUG
-        printf("pg_initdb: no db found at : %s\n", getenv("PGDATA") );
-#endif // PGDEBUG
-    }
-#if PGDEBUG
-    PDEBUG("# 1080");
-    printf("# pg_initdb_main result = %d\n", pg_initdb_main() );
-#else
-    pg_initdb_main();
-#endif // PGDEBUG
-
-    /* save stdin and use previous initdb output to feed boot mode */
-    int saved_stdin = dup(STDIN_FILENO);
-    {
-        PDEBUG("# 1118: restarting in boot mode for initdb");
-        freopen(IDB_PIPE_BOOT, "r", stdin);
-
-        char *boot_argv[] = {
-            WASM_PREFIX "/bin/postgres",
-            "--boot",
-            "-D", getenv("PGDATA"),
-            "-d","3",
-            WASM_PGOPTS,
-            "-X", "1048576",
-            NULL
-        };
-        int boot_argc = sizeof(boot_argv) / sizeof(char*) - 1;
-
-	    set_pglocale_pgservice(boot_argv[0], PG_TEXTDOMAIN("initdb"));
-
-        optind = 1;
-        BootstrapModeMain(boot_argc, boot_argv, false);
-        fclose(stdin);
-#if PGDEBUG
-        puts("# 886: keep " IDB_PIPE_BOOT );
-#else
-        remove(IDB_PIPE_BOOT);
-#endif
-        stdin = fdopen(saved_stdin, "r");
-        /* fake a shutdown to comlplete WAL/OID states */
-        proc_exit(66);
-    }
-
-    /* use previous initdb output to feed single mode */
-
-
-    /* or resume a previous db */
-    //IsPostmasterEnvironment = true;
-    if (ShmemVariableCache->nextOid < ((Oid) FirstNormalObjectId)) {
-#if PGDEBUG
-        puts("# 891: warning oid base too low, will need to set OID range after initdb(bootstrap/single)");
-#endif
-    }
-
-    {
-        PDEBUG("# 889: restarting in single mode for initdb");
-
-        char *single_argv[] = {
-            WASM_PREFIX "/bin/postgres",
-            "--single",
-            "-d", "1", "-B", "16", "-S", "512", "-f", "siobtnmh",
-            "-D", getenv("PGDATA"),
-            "-F", "-O", "-j",
-            WASM_PGOPTS,
-            "template1",
-            NULL
-        };
-        int single_argc = sizeof(single_argv) / sizeof(char*) - 1;
-        optind = 1;
-        RePostgresSingleUserMain(single_argc, single_argv, strdup( getenv("PGUSER")));
-    }
-
-initdb_done:;
-    pg_idb_status |= IDB_CALLED;
-    IsPostmasterEnvironment = true;
-    if (ShmemVariableCache->nextOid < ((Oid) FirstNormalObjectId)) {
-        /* IsPostmasterEnvironment is now true
-         these will be executed when required in varsup.c/GetNewObjectId
-    	 ShmemVariableCache->nextOid = FirstNormalObjectId;
-	     ShmemVariableCache->oidCount = 0;
-        */
-#if PGDEBUG
-        puts("# 922: initdb done, oid base too low but OID range will be set because IsPostmasterEnvironment");
-#endif
-    }
-
-    if (optind>0) {
-        /* RESET getopt */
-        optind = 1;
-        /* we did not fail, clear the default failed state */
-        pg_idb_status &= IDB_OK;
-    } else {
-        PDEBUG("# exiting on initdb-single error");
-        // TODO raise js exception
-    }
-    return pg_idb_status;
-}
-
-
-#endif // PG_INITDB_MAIN
-
-#define PGDB WASM_PREFIX "/base"
-
-EM_JS(int, is_web_env, (), {
-    try {
-        if (window) return 1;
-    } catch(x) {return 0}
-});
-
-static void
-main_pre(int argc, char *argv[]) {
-
-
-    char key[256];
-    int i=0;
-// extra env is always after normal args
-    PDEBUG("# ============= extra argv dump ==================");
-    {
-        for (;i<argc;i++) {
-            const char *kv = argv[i];
-            for (int sk=0;sk<strlen(kv);sk++)
-                if(kv[sk]=='=')
-                    goto extra_env;
-#if PGDEBUG
-            printf("%s ", kv);
-#endif
-        }
-    }
-extra_env:;
-    PDEBUG("\n# ============= arg->env dump ==================");
-    {
-        for (;i<argc;i++) {
-            const char *kv = argv[i];
-            for (int sk=0;sk<strlen(kv);sk++) {
-                if (sk>255) {
-                    puts("buffer overrun on extra env at:");
-                    puts(kv);
-                    continue;
-                }
-                if (kv[sk]=='=') {
-                    memcpy(key, kv, sk);
-                    key[sk] = 0;
-#if PGDEBUG
-                    printf("%s='%s'\n", &(key[0]), &(kv[sk+1]));
-#endif
-                    setenv(key, &kv[sk+1], 1);
-                }
-            }
-        }
-    }
-    PDEBUG("\n# =========================================");
-
-	argv[0] = strdup(WASM_PREFIX "/bin/postgres");
-
-
 #if defined(__EMSCRIPTEN__)
-    EM_ASM({
-        Module.is_worker = (typeof WorkerGlobalScope !== 'undefined') && self instanceof WorkerGlobalScope;
-        Module.FD_BUFFER_MAX = $0;
-        Module.emscripten_copy_to = console.warn;
-    }, FD_BUFFER_MAX);  /* ( global mem start / num fd max ) */
-
-    if (is_node) {
-    	setenv("ENVIRONMENT", "node" , 1);
-        EM_ASM({
-#if PGDEBUG
-            console.warn("prerun(C-node) worker=", Module.is_worker);
-#endif
-            Module['postMessage'] = function custom_postMessage(event) {
-                console.log("# 1252: onCustomMessage:",__FILE__, event);
-            };
-        });
-
-    } else {
-    	setenv("ENVIRONMENT", "web" , 1);
-#if PGDEBUG
-        EM_ASM({
-            console.warn("prerun(C-web) worker=", Module.is_worker);
-        });
-#endif
-        is_repl = true;
-    }
-
-    EM_ASM({
-        if (Module.is_worker) {
-#if PGDEBUG
-            console.log("Main: running in a worker, setting onCustomMessage");
-#endif
-            function onCustomMessage(event) {
-                console.log("onCustomMessage:", event);
-            };
-            Module['onCustomMessage'] = onCustomMessage;
-        } else {
-#if PGDEBUG
-            console.log("Running in main thread, faking onCustomMessage");
-#endif
-            Module['postMessage'] = function custom_postMessage(event) {
-                switch (event.type) {
-                    case "raw" :  {
-                        stringToUTF8( event.data, shm_rawinput, Module.FD_BUFFER_MAX);
-                        break;
-                    }
-
-                    case "stdin" :  {
-                        stringToUTF8( event.data, 1, Module.FD_BUFFER_MAX);
-                        break;
-                    }
-                    case "rcon" :  {
-                        stringToUTF8( event.data, shm_rcon, Module.FD_BUFFER_MAX);
-                        break;
-                    }
-                    default : console.warn("custom_postMessage?", event);
-                }
-            };
-            //if (!window.vm)
-              //  window.vm = Module;
-        };
-    });
-
-#endif // __EMSCRIPTEN__
-	chdir("/");
-    mkdirp("/tmp");
-    mkdirp(WASM_PREFIX);
-
-	// postgres does not know where to find the server configuration file.
-    // also we store the fake locale file there.
-	// postgres.js:1605 You must specify the --config-file or -D invocation option or set the PGDATA environment variable.
-
-    /* enforce ? */
-	setenv("PGSYSCONFDIR", WASM_PREFIX, 1);
-	setenv("PGCLIENTENCODING", "UTF8", 1);
-
-    // default is to run a repl loop
-    setenv("REPL", "Y", 0);
-/*
- * we cannot run "locale -a" either from web or node. the file getenv("PGSYSCONFDIR") / "locale"
- * serves as popen output
- */
-
-	setenv("LC_CTYPE", "C" , 1);
-
-    /* defaults */
-
-    setenv("TZ", "UTC", 0);
-    setenv("PGTZ", "UTC", 0);
-	setenv("PGUSER", WASM_USERNAME , 0);
-	setenv("PGDATA", PGDB , 0);
-	setenv("PGDATABASE", "template1" , 0);
-    setenv("PG_COLOR", "always", 0);
-
-#if PGDEBUG
-    puts("# ============= env dump ==================");
-    for (char **env = environ; *env != 0; env++) {
-        char *drefp = *env;
-        printf("# %s\n", drefp);
-    }
-    puts("# =========================================");
-#endif
-}
-
-int g_argc;
-char **g_argv;
-
-void main_post();
-void main_post() {
-        /*
-         * Fire up essential subsystems: error and memory management
-         *
-         * Code after this point is allowed to use elog/ereport, though
-         * localization of messages may not work right away, and messages won't go
-         * anywhere but stderr until GUC settings get loaded.
-         */
-        MemoryContextInit();
-
-        /*
-         * Set up locale information
-         */
-        set_pglocale_pgservice(g_argv[0], PG_TEXTDOMAIN("postgres"));
-
-        /*
-         * In the postmaster, absorb the environment values for LC_COLLATE and
-         * LC_CTYPE.  Individual backends will change these later to settings
-         * taken from pg_database, but the postmaster cannot do that.  If we leave
-         * these set to "C" then message localization might not work well in the
-         * postmaster.
-         */
-        init_locale("LC_COLLATE", LC_COLLATE, "");
-        init_locale("LC_CTYPE", LC_CTYPE, "");
-
-        /*
-         * LC_MESSAGES will get set later during GUC option processing, but we set
-         * it here to allow startup error messages to be localized.
-         */
-    #ifdef LC_MESSAGES
-        init_locale("LC_MESSAGES", LC_MESSAGES, "");
-    #endif
-
-        /*
-         * We keep these set to "C" always, except transiently in pg_locale.c; see
-         * that file for explanations.
-         */
-        init_locale("LC_MONETARY", LC_MONETARY, "C");
-        init_locale("LC_NUMERIC", LC_NUMERIC, "C");
-        init_locale("LC_TIME", LC_TIME, "C");
-
-        /*
-         * Now that we have absorbed as much as we wish to from the locale
-         * environment, remove any LC_ALL setting, so that the environment
-         * variables installed by pg_perm_setlocale have force.
-         */
-        unsetenv("LC_ALL");
-}
-EMSCRIPTEN_KEEPALIVE void __cxa_throw(void *thrown_exception, void *tinfo, void *dest);
-EMSCRIPTEN_KEEPALIVE void
-__cxa_throw(void *thrown_exception, void *tinfo, void *dest) {}
-
-/*
-EMSCRIPTEN_KEEPALIVE void *
-_ZNSt13runtime_errorD1Ev(void * int32) {
-    return NULL;
-}
-*/
-
-
-extern void AsyncPostgresSingleUserMain(int single_argc, char *single_argv[], const char *username, int async_restart);
-
-
-#if defined(__wasi__)
-
-//#   include "../patches/wasi_signal.c"
-
-#   define PG_INITDB_MAIN
-#   define PG_MAIN
-
-#   define FRONTEND
-    #include "../postgresql/src/common/logging.c"
-#   undef FRONTEND
-
-    #define icu_language_tag(loc_str) icu_language_tag_idb(loc_str)
-    #define icu_validate_locale(loc_str) icu_validate_locale_idb(loc_str)
-    #include "../postgresql/src/interfaces/libpq/pqexpbuffer.c"
-    #define fsync_pgdata(...)
-
-    #include "../postgresql/src/bin/initdb/initdb.c"
-
-    void use_socketfile(void) {
-        is_repl = true;
-        is_node = true;
-    }
-#undef PG_INITDB_MAIN
-#undef PG_MAIN
-#endif // __wasi__
-EMSCRIPTEN_KEEPALIVE int main_repl();
-EMSCRIPTEN_KEEPALIVE int
-main_repl() {
-    bool hadloop_error = false;
-
-    whereToSendOutput = DestNone;
-
-    if (!mkdir(PGDB, 0700)) {
-        /* no db : run initdb now. */
-#if PGDEBUG
-        fprintf(stderr, "PGDATA=%s not found, running initdb with defaults\n", PGDB );
-#endif
-        #if defined(PG_INITDB_MAIN)
-            #warning "web build"
-puts("1168");
-            hadloop_error = pg_initdb() & IDB_FAILED;
-        #else
-            #warning "node build"
-            #if defined(__wasi__)
-                hadloop_error = pg_initdb() & IDB_FAILED;
-            #endif
-        #endif
-
-    } else {
-        // download a db case ?
-    	mkdirp(PGDB);
-
-        // db fixup because empty dirs are not packaged
-	    /*
-	    mkdirp(WASM_PREFIX "/lib");
-	    mkdirp(WASM_PREFIX "/lib/postgresql");
-	    */
-	    mkdirp(PGDB "/pg_wal");
-	    mkdirp(PGDB "/pg_wal/archive_status");
-	    mkdirp(PGDB "/pg_wal/summaries");
-
-	    mkdirp(PGDB "/pg_tblspc");
-	    mkdirp(PGDB "/pg_snapshots");
-	    mkdirp(PGDB "/pg_commit_ts");
-	    mkdirp(PGDB "/pg_notify");
-	    mkdirp(PGDB "/pg_replslot");
-	    mkdirp(PGDB "/pg_twophase");
-
-
-	    mkdirp(PGDB "/pg_logical");
-	    mkdirp(PGDB "/pg_logical/snapshots");
-	    mkdirp(PGDB "/pg_logical/mappings");
-
-    }
-
-    if (!hadloop_error) {
-        main_post();
-
-        /*
-         * Catch standard options before doing much else, in particular before we
-         * insist on not being root.
-         */
-        if (g_argc > 1) {
-	        if (strcmp(g_argv[1], "--help") == 0 || strcmp(g_argv[1], "-?") == 0)
-	        {
-		        help(progname);
-		        exit(0);
-	        }
-	        if (strcmp(g_argv[1], "--version") == 0 || strcmp(g_argv[1], "-V") == 0)
-	        {
-		        fputs(PG_BACKEND_VERSIONSTR, stdout);
-		        exit(0);
-	        }
-
-        }
-
-        if (g_argc > 1 && strcmp(g_argv[1], "--check") == 0) {
-	        BootstrapModeMain(g_argc, g_argv, true);
-            return 0;
-        }
-
-        if (g_argc > 1 && strcmp(g_argv[1], "--boot") == 0) {
-            PDEBUG("# 1410: boot: " __FILE__ );
-            BootstrapModeMain(g_argc, g_argv, false);
-            return 0;
-        }
-
-        PDEBUG("# 1415: single: " __FILE__ );
-        AsyncPostgresSingleUserMain(g_argc, g_argv, strdup(getenv("PGUSER")), 0);
-    }
-    return 0;
-}
-
-extern void pg_repl_raf(void);
-
-int
-main(int argc, char **argv)
-{
-    int ret=0;
-    is_node = !is_web_env();
-
-    main_pre(argc, argv);
-#if PGDEBUG
-    printf("# 1249: argv0 (%s) PGUSER=%s PGDATA=%s\n PGDATABASE=%s REPL=%s\n",
-        argv[0], getenv("PGUSER"), getenv("PGDATA"),  getenv("PGDATABASE"), getenv("REPL") );
+#   include "pg_main_emsdk.c"
+#else
+#   include "pg_main_wasi.c"
 #endif
-	progname = get_progname(argv[0]);
-
-    /*
-    PGDATESTYLE
-    TZ
-    PG_SHMEM_ADDR
-
-    PGCTLTIMEOUT
-    PG_TEST_USE_UNIX_SOCKETS
-    INITDB_TEMPLATE
-    PSQL_HISTORY
-    TMPDIR
-    PGOPTIONS
-    */
-
-    /*
-     * Platform-specific startup hacks
-     */
-    startup_hacks(progname);
-
-    /*
-     * Remember the physical location of the initially given argv[] array for
-     * possible use by ps display.  On some platforms, the argv[] storage must
-     * be overwritten in order to set the process title for ps. In such cases
-     * save_ps_display_args makes and returns a new copy of the argv[] array.
-     *
-     * save_ps_display_args may also move the environment strings to make
-     * extra room. Therefore this should be done as early as possible during
-     * startup, to avoid entanglements with code that might save a getenv()
-     * result pointer.
-     */
-    argv = save_ps_display_args(argc, argv);
-    g_argv = argv;
-    g_argc = argc;
-
-    is_repl = strlen(getenv("REPL")) && getenv("REPL")[0]=='Y';
-    if (!is_repl) {
-        PDEBUG("# 1289: exit with live runtime (nodb)");
-        return 0;
-    }
-    PDEBUG("# 1292: repl");
-    // so it is repl
-    main_repl();
-    if (is_node) {
-        PDEBUG("# 1296: node repl");
-        pg_repl_raf();
-    }
-    emscripten_force_exit(ret);
-	return ret;
-}
 
-#endif // PG_MAIN
diff --git a/patches/pg_main_emsdk.c b/patches/pg_main_emsdk.c
new file mode 100644
index 000000000..20320b3a9
--- /dev/null
+++ b/patches/pg_main_emsdk.c
@@ -0,0 +1,1244 @@
+#if defined(PG_MAIN)
+
+bool is_node = false;
+bool is_repl = true;
+
+EMSCRIPTEN_KEEPALIVE bool
+quote_all_identifiers = false;
+
+
+EMSCRIPTEN_KEEPALIVE void interactive_one(void);
+EMSCRIPTEN_KEEPALIVE void interactive_file(void);
+
+/* exported from postmaster.h */
+EMSCRIPTEN_KEEPALIVE const char*
+progname;
+
+void
+PostgresMain(const char *dbname, const char *username)
+{
+    puts("# 82: ERROR: PostgresMain should not be called anymore" __FILE__ );
+    while (1){};
+}
+
+
+
+volatile bool send_ready_for_query = true;
+volatile bool idle_in_transaction_timeout_enabled = false;
+volatile bool idle_session_timeout_enabled = false;
+volatile sigjmp_buf local_sigjmp_buf;
+
+volatile bool repl = true ;
+volatile int pg_idb_status = 0;
+volatile bool inloop = false;
+
+/* ================================================================================ */
+/* ================================================================================ */
+/* ================================================================================ */
+/* ================================================================================ */
+
+EMSCRIPTEN_KEEPALIVE
+FILE * single_mode_feed = NULL;
+
+bool force_echo = false;
+
+extern void ReInitPostgres(const char *in_dbname, Oid dboid,
+			 const char *username, Oid useroid,
+			 bool load_session_libraries,
+			 bool override_allow_connections,
+			 char *out_dbname);
+
+
+void
+AsyncPostgresSingleUserMain(int argc, char *argv[],
+					   const char *username, int async_restart)
+{
+	const char *dbname = NULL;
+PDEBUG("# 122");
+	/* Initialize startup process environment. */
+	InitStandaloneProcess(argv[0]);
+
+	/* Set default values for command-line options.	 */
+	InitializeGUCOptions();
+PDEBUG("# 128");
+	/* Parse command-line options. */
+	process_postgres_switches(argc, argv, PGC_POSTMASTER, &dbname);
+PDEBUG("# 131");
+	/* Must have gotten a database name, or have a default (the username) */
+	if (dbname == NULL)
+	{
+		dbname = username;
+		if (dbname == NULL)
+			ereport(FATAL,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("%s: no database nor user name specified",
+							progname)));
+	}
+
+if (async_restart) goto async_db_change;
+	/* Acquire configuration parameters */
+	if (!SelectConfigFiles(userDoption, progname))
+		proc_exit(1);
+
+	checkDataDir();
+	ChangeToDataDir();
+
+	/*
+	 * Create lockfile for data directory.
+	 */
+	CreateDataDirLockFile(false);
+
+	/* read control file (error checking and contains config ) */
+	LocalProcessControlFile(false);
+
+	/*
+	 * process any libraries that should be preloaded at postmaster start
+	 */
+	process_shared_preload_libraries();
+
+	/* Initialize MaxBackends */
+	InitializeMaxBackends();
+PDEBUG("# 166");
+	/*
+	 * Give preloaded libraries a chance to request additional shared memory.
+	 */
+	process_shmem_requests();
+
+	/*
+	 * Now that loadable modules have had their chance to request additional
+	 * shared memory, determine the value of any runtime-computed GUCs that
+	 * depend on the amount of shared memory required.
+	 */
+	InitializeShmemGUCs();
+
+	/*
+	 * Now that modules have been loaded, we can process any custom resource
+	 * managers specified in the wal_consistency_checking GUC.
+	 */
+	InitializeWalConsistencyChecking();
+
+	CreateSharedMemoryAndSemaphores();
+
+	/*
+	 * Remember stand-alone backend startup time,roughly at the same point
+	 * during startup that postmaster does so.
+	 */
+	PgStartTime = GetCurrentTimestamp();
+
+	/*
+	 * Create a per-backend PGPROC struct in shared memory. We must do this
+	 * before we can use LWLocks.
+	 */
+	InitProcess();
+
+// main
+	SetProcessingMode(InitProcessing);
+
+	/* Early initialization */
+	BaseInit();
+async_db_change:;
+PDEBUG("# 205");
+	/*
+	 * General initialization.
+	 *
+	 * NOTE: if you are tempted to add code in this vicinity, consider putting
+	 * it inside InitPostgres() instead.  In particular, anything that
+	 * involves database access should be there, not here.
+	 */
+	InitPostgres(dbname, InvalidOid,	/* database to connect to */
+				 username, InvalidOid,	/* role to connect as */
+				 !am_walsender, /* honor session_preload_libraries? */
+				 false,			/* don't ignore datallowconn */
+				 NULL);			/* no out_dbname */
+
+	/*
+	 * If the PostmasterContext is still around, recycle the space; we don't
+	 * need it anymore after InitPostgres completes.  Note this does not trash
+	 * *MyProcPort, because ConnCreate() allocated that space with malloc()
+	 * ... else we'd need to copy the Port data first.  Also, subsidiary data
+	 * such as the username isn't lost either; see ProcessStartupPacket().
+	 */
+	if (PostmasterContext)
+	{
+		MemoryContextDelete(PostmasterContext);
+		PostmasterContext = NULL;
+	}
+
+	SetProcessingMode(NormalProcessing);
+
+	/*
+	 * Now all GUC states are fully set up.  Report them to client if
+	 * appropriate.
+	 */
+	BeginReportingGUCOptions();
+
+	/*
+	 * Also set up handler to log session end; we have to wait till now to be
+	 * sure Log_disconnections has its final value.
+	 */
+	if (IsUnderPostmaster && Log_disconnections)
+		on_proc_exit(log_disconnections, 0);
+
+	pgstat_report_connect(MyDatabaseId);
+
+	/* Perform initialization specific to a WAL sender process. */
+	if (am_walsender)
+		InitWalSender();
+
+	/*
+	 * Send this backend's cancellation info to the frontend.
+	 */
+	if (whereToSendOutput == DestRemote)
+	{
+		StringInfoData buf;
+
+		pq_beginmessage(&buf, 'K');
+		pq_sendint32(&buf, (int32) MyProcPid);
+		pq_sendint32(&buf, (int32) MyCancelKey);
+		pq_endmessage(&buf);
+		/* Need not flush since ReadyForQuery will do it. */
+	}
+
+	/* Welcome banner for standalone case */
+	if (whereToSendOutput == DestDebug)
+		printf("\nPostgreSQL stand-alone backend %s\n", PG_VERSION);
+
+	/*
+	 * Create the memory context we will use in the main loop.
+	 *
+	 * MessageContext is reset once per iteration of the main loop, ie, upon
+	 * completion of processing of each command message from the client.
+	 */
+	MessageContext = AllocSetContextCreate(TopMemoryContext, "MessageContext", ALLOCSET_DEFAULT_SIZES);
+
+	/*
+	 * Create memory context and buffer used for RowDescription messages. As
+	 * SendRowDescriptionMessage(), via exec_describe_statement_message(), is
+	 * frequently executed for ever single statement, we don't want to
+	 * allocate a separate buffer every time.
+	 */
+	row_description_context = AllocSetContextCreate(TopMemoryContext, "RowDescriptionContext", ALLOCSET_DEFAULT_SIZES);
+	MemoryContextSwitchTo(row_description_context);
+	initStringInfo(&row_description_buf);
+	MemoryContextSwitchTo(TopMemoryContext);
+}
+
+void
+RePostgresSingleUserMain(int single_argc, char *single_argv[], const char *username)
+{
+#if PGDEBUG
+printf("# 295: RePostgresSingleUserMain progname=%s for %s feed=%s\n", progname, single_argv[0], IDB_PIPE_SINGLE);
+#endif
+    single_mode_feed = fopen(IDB_PIPE_SINGLE, "r");
+
+    // should be template1.
+    const char *dbname = NULL;
+
+
+    /* Parse command-line options. */
+    process_postgres_switches(single_argc, single_argv, PGC_POSTMASTER, &dbname);
+#if PGDEBUG
+printf("# 306: dbname=%s\n", dbname);
+#endif
+    LocalProcessControlFile(false);
+
+    process_shared_preload_libraries();
+
+//	                InitializeMaxBackends();
+
+// ? IgnoreSystemIndexes = true;
+IgnoreSystemIndexes = false;
+    process_shmem_requests();
+
+    InitializeShmemGUCs();
+
+    InitializeWalConsistencyChecking();
+
+    PgStartTime = GetCurrentTimestamp();
+
+    SetProcessingMode(InitProcessing);
+PDEBUG("# 326: Re-InitPostgres");
+if (am_walsender)
+    PDEBUG("# 327: am_walsender == true");
+//      BaseInit();
+
+    InitPostgres(dbname, InvalidOid,	/* database to connect to */
+                 username, InvalidOid,	/* role to connect as */
+                 !am_walsender, /* honor session_preload_libraries? */
+                 false,			/* don't ignore datallowconn */
+                 NULL);			/* no out_dbname */
+
+PDEBUG("# 334");
+/*
+    if (PostmasterContext)
+    {
+        PDEBUG("# 103");
+        MemoryContextDelete(PostmasterContext);
+        PostmasterContext = NULL;
+    }
+*/
+    SetProcessingMode(NormalProcessing);
+
+    BeginReportingGUCOptions();
+
+    if (IsUnderPostmaster && Log_disconnections)
+        on_proc_exit(log_disconnections, 0);
+
+    pgstat_report_connect(MyDatabaseId);
+
+    /* Perform initialization specific to a WAL sender process. */
+    if (am_walsender)
+        InitWalSender();
+/*
+    if (whereToSendOutput == DestRemote)
+    {
+        StringInfoData buf;
+
+        pq_beginmessage(&buf, 'K');
+        pq_sendint32(&buf, (int32) MyProcPid);
+        pq_sendint32(&buf, (int32) MyCancelKey);
+        pq_endmessage(&buf);
+        // Need not flush since ReadyForQuery will do it.
+    }
+*/
+#if PGDEBUG
+    whereToSendOutput = DestDebug;
+#endif
+
+    if (whereToSendOutput == DestDebug)
+        printf("\nPostgreSQL stand-alone backend %s\n", PG_VERSION);
+
+    /*
+     * Create the memory context we will use in the main loop.
+     *
+     * MessageContext is reset once per iteration of the main loop, ie, upon
+     * completion of processing of each command message from the client.
+     */
+    MessageContext = AllocSetContextCreate(TopMemoryContext,
+						                   "MessageContext",
+						                   ALLOCSET_DEFAULT_SIZES);
+
+    /*
+     * Create memory context and buffer used for RowDescription messages. As
+     * SendRowDescriptionMessage(), via exec_describe_statement_message(), is
+     * frequently executed for ever single statement, we don't want to
+     * allocate a separate buffer every time.
+     */
+    row_description_context = AllocSetContextCreate(TopMemoryContext,
+									                "RowDescriptionContext",
+									                ALLOCSET_DEFAULT_SIZES);
+    MemoryContextSwitchTo(row_description_context);
+    initStringInfo(&row_description_buf);
+    MemoryContextSwitchTo(TopMemoryContext);
+
+#if 1 //PGDEBUG
+    PDEBUG("# 415: exception handler off");
+#else
+    if (sigsetjmp(local_sigjmp_buf, 1) != 0)
+    {
+        /*
+         * NOTE: if you are tempted to add more code in this if-block,
+         * consider the high probability that it should be in
+         * AbortTransaction() instead.  The only stuff done directly here
+         * should be stuff that is guaranteed to apply *only* for outer-level
+         * error recovery, such as adjusting the FE/BE protocol status.
+         */
+
+        /* Since not using PG_TRY, must reset error stack by hand */
+        error_context_stack = NULL;
+
+        /* Prevent interrupts while cleaning up */
+        HOLD_INTERRUPTS();
+
+        /*
+         * Forget any pending QueryCancel request, since we're returning to
+         * the idle loop anyway, and cancel any active timeout requests.  (In
+         * future we might want to allow some timeout requests to survive, but
+         * at minimum it'd be necessary to do reschedule_timeouts(), in case
+         * we got here because of a query cancel interrupting the SIGALRM
+         * interrupt handler.)	Note in particular that we must clear the
+         * statement and lock timeout indicators, to prevent any future plain
+         * query cancels from being misreported as timeouts in case we're
+         * forgetting a timeout cancel.
+         */
+        disable_all_timeouts(false);	/* do first to avoid race condition */
+        QueryCancelPending = false;
+        idle_in_transaction_timeout_enabled = false;
+        idle_session_timeout_enabled = false;
+
+        /* Not reading from the client anymore. */
+        DoingCommandRead = false;
+
+        /* Make sure libpq is in a good state */
+        pq_comm_reset();
+
+        /* Report the error to the client and/or server log */
+        EmitErrorReport();
+
+        /*
+         * If Valgrind noticed something during the erroneous query, print the
+         * query string, assuming we have one.
+         */
+        valgrind_report_error_query(debug_query_string);
+
+        /*
+         * Make sure debug_query_string gets reset before we possibly clobber
+         * the storage it points at.
+         */
+        debug_query_string = NULL;
+
+        /*
+         * Abort the current transaction in order to recover.
+         */
+        AbortCurrentTransaction();
+
+        if (am_walsender)
+            WalSndErrorCleanup();
+
+        PortalErrorCleanup();
+
+        /*
+         * We can't release replication slots inside AbortTransaction() as we
+         * need to be able to start and abort transactions while having a slot
+         * acquired. But we never need to hold them across top level errors,
+         * so releasing here is fine. There also is a before_shmem_exit()
+         * callback ensuring correct cleanup on FATAL errors.
+         */
+        if (MyReplicationSlot != NULL)
+            ReplicationSlotRelease();
+
+        /* We also want to cleanup temporary slots on error. */
+        ReplicationSlotCleanup();
+
+        jit_reset_after_error();
+
+        /*
+         * Now return to normal top-level context and clear ErrorContext for
+         * next time.
+         */
+        MemoryContextSwitchTo(TopMemoryContext);
+        FlushErrorState();
+
+        /*
+         * If we were handling an extended-query-protocol message, initiate
+         * skip till next Sync.  This also causes us not to issue
+         * ReadyForQuery (until we get Sync).
+         */
+        if (doing_extended_query_message)
+            ignore_till_sync = true;
+
+        /* We don't have a transaction command open anymore */
+        xact_started = false;
+
+        /*
+         * If an error occurred while we were reading a message from the
+         * client, we have potentially lost track of where the previous
+         * message ends and the next one begins.  Even though we have
+         * otherwise recovered from the error, we cannot safely read any more
+         * messages from the client, so there isn't much we can do with the
+         * connection anymore.
+         */
+        if (pq_is_reading_msg())
+            ereport(FATAL,
+	                (errcode(ERRCODE_PROTOCOL_VIOLATION),
+	                 errmsg("terminating connection because protocol synchronization was lost")));
+
+        /* Now we can allow interrupts again */
+        RESUME_INTERRUPTS();
+    }
+
+    /* We can now handle ereport(ERROR) */
+    PG_exception_stack = &local_sigjmp_buf;
+
+#endif
+
+    if (!ignore_till_sync)
+        send_ready_for_query = true;	/* initially, or after error */
+
+    if (!inloop) {
+        inloop = true;
+        PDEBUG("# 545: REPL(initdb-single):Begin " __FILE__ );
+
+        while (repl) { interactive_file(); }
+    } else {
+        // signal error
+        optind = -1;
+    }
+
+    fclose(single_mode_feed);
+
+    if (strlen(getenv("REPL")) && getenv("REPL")[0]=='Y') {
+        PDEBUG("# 556: REPL(initdb-single):End " __FILE__ );
+
+        /* now use stdin as source */
+        repl = true;
+        single_mode_feed = NULL;
+
+        force_echo = true;
+
+        if (!is_node) {
+#if PGDEBUG
+            fprintf(stdout,"# 566: now in webloop(RAF)\npg> %c\n", 4);
+#endif
+            emscripten_set_main_loop( (em_callback_func)interactive_one, 0, 0);
+        } else {
+            PDEBUG("# 570: REPL(single after initdb):Begin(NORETURN)");
+            while (repl) { interactive_file(); }
+            PDEBUG("# 572: REPL:End Raising a 'RuntimeError Exception' to halt program NOW");
+            {
+                void (*npe)() = NULL;
+                npe();
+            }
+        }
+
+        // unreachable.
+    }
+
+    PDEBUG("# 582: no line-repl requested, exiting and keeping runtime alive");
+}
+
+
+
+
+/* ================================================================================ */
+/* ================================================================================ */
+/* ================================================================================ */
+/* ================================================================================ */
+
+
+extern int cma_rsize;
+
+EMSCRIPTEN_KEEPALIVE void
+pg_repl_raf(){
+
+    is_repl = strlen(getenv("REPL")) && getenv("REPL")[0]=='Y';
+    if (is_node) {
+        PDEBUG(WASM_PREFIX "/bin/postgres.js");
+        printf("cma_rsize was %d\n now set to 0\n", cma_rsize);
+        // force wire socket emulation
+        cma_rsize = 0;
+        if (!strcmp(getenv("_"), WASM_PREFIX "/bin/postgres.js")) {
+            while (1) {
+                interactive_one();
+            }
+            PDEBUG("# 609: REPL:End Raising a 'RuntimeError Exception' to halt program NOW");
+            {
+                void (*npe)() = NULL;
+                npe();
+            }
+
+        }
+    }
+    if (is_repl) {
+PDEBUG("# 618: pg_repl_raf(REPL)");
+        repl = true;
+        single_mode_feed = NULL;
+        force_echo = true;
+        whereToSendOutput = DestNone;
+        emscripten_set_main_loop( (em_callback_func)interactive_one, 0, 0);
+    } else {
+        PDEBUG("# 625: TODO: headless wire mode");
+    }
+
+    if (is_node) {
+#if defined(__wasi__)
+        PDEBUG("# 629: pg_repl_raf(WASI) endless loop");
+        while (1) {
+            interactive_one();
+        }
+#else
+        PDEBUG("# 629: pg_repl_raf(NODE) EXIT!!!");
+#endif
+    }
+
+}
+
+
+EMSCRIPTEN_KEEPALIVE void
+pg_shutdown() {
+    PDEBUG("# 637: pg_shutdown");
+    proc_exit(66);
+}
+
+int loops = 0;
+
+
+EMSCRIPTEN_KEEPALIVE void
+interactive_file() {
+	int			firstchar;
+	int			c;				/* character read from getc() */
+	StringInfoData input_message;
+	StringInfoData *inBuf;
+    FILE *stream ;
+
+	/*
+	 * At top of loop, reset extended-query-message flag, so that any
+	 * errors encountered in "idle" state don't provoke skip.
+	 */
+	doing_extended_query_message = false;
+
+	/*
+	 * Release storage left over from prior query cycle, and create a new
+	 * query input buffer in the cleared MessageContext.
+	 */
+	MemoryContextSwitchTo(MessageContext);
+	MemoryContextResetAndDeleteChildren(MessageContext);
+
+	initStringInfo(&input_message);
+    inBuf = &input_message;
+	DoingCommandRead = true;
+
+	//firstchar = ReadCommand(&input_message);
+	if (whereToSendOutput == DestRemote)
+		firstchar = SocketBackend(&input_message);
+	else {
+
+	    /*
+	     * display a prompt and obtain input from the user
+	     */
+        if (!single_mode_feed) {
+	        printf("pg> %c\n", 4);
+        	fflush(stdout);
+            stream = stdin;
+        } else {
+            stream = single_mode_feed;
+        }
+
+	    resetStringInfo(inBuf);
+	    while ((c = getc(stream)) != EOF)
+	    {
+		    if (c == '\n')
+		    {
+			    if (UseSemiNewlineNewline)
+			    {
+				    /*
+				     * In -j mode, semicolon followed by two newlines ends the
+				     * command; otherwise treat newline as regular character.
+				     */
+				    if (inBuf->len > 1 &&
+					    inBuf->data[inBuf->len - 1] == '\n' &&
+					    inBuf->data[inBuf->len - 2] == ';')
+				    {
+					    /* might as well drop the second newline */
+					    break;
+				    }
+			    }
+			    else
+			    {
+				    /*
+				     * In plain mode, newline ends the command unless preceded by
+				     * backslash.
+				     */
+				    if (inBuf->len > 0 &&
+					    inBuf->data[inBuf->len - 1] == '\\')
+				    {
+					    /* discard backslash from inBuf */
+					    inBuf->data[--inBuf->len] = '\0';
+					    /* discard newline too */
+					    continue;
+				    }
+				    else
+				    {
+					    /* keep the newline character, but end the command */
+					    appendStringInfoChar(inBuf, '\n');
+					    break;
+				    }
+			    }
+		    }
+
+		    /* Not newline, or newline treated as regular character */
+		    appendStringInfoChar(inBuf, (char) c);
+	    }
+
+	    if (c == EOF && inBuf->len == 0) {
+		    firstchar = EOF;
+        } else {
+        	/* Add '\0' to make it look the same as message case. */
+	        appendStringInfoChar(inBuf, (char) '\0');
+        	firstchar = 'Q';
+        }
+
+    }
+
+	if (ignore_till_sync && firstchar != EOF)
+		return;
+
+    #include "pg_proto.c"
+}
+
+#include "./interactive_one.c"
+
+
+void
+PostgresSingleUserMain(int argc, char *argv[],
+					   const char *username)
+{
+    while(1){};
+}
+
+#else  // defined(PG_MAIN)
+
+extern bool is_node;
+extern bool is_repl;
+
+extern bool quote_all_identifiers;
+
+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
+#include <unistd.h>        /* chdir */
+#include <sys/stat.h>      /* mkdir */
+static
+void mkdirp(const char *p) {
+	if (!mkdir(p, 0700)) {
+		fprintf(stderr, "# no '%s' directory, creating one ...\n", p);
+	}
+}
+#endif /* wasm */
+
+
+#if defined(PG_INITDB_MAIN) || defined(__wasi__)
+extern int pg_initdb_main(void);
+
+extern void RePostgresSingleUserMain(int single_argc, char *single_argv[], const char *username);
+extern void AsyncPostgresSingleUserMain(int single_argc, char *single_argv[], const char *username, int async_restart);
+extern void main_post(void);
+extern void proc_exit(int code);
+extern bool IsPostmasterEnvironment;
+
+extern volatile int pg_idb_status;
+#if PGDEBUG
+void print_bits(size_t const size, void const * const ptr);
+void print_bits(size_t const size, void const * const ptr)
+{
+    unsigned char *b = (unsigned char*) ptr;
+    unsigned char byte;
+    int i, j;
+
+    for (i = size-1; i >= 0; i--) {
+        for (j = 7; j >= 0; j--) {
+            byte = (b[i] >> j) & 1;
+            printf("%u", byte);
+        }
+    }
+    puts("");
+}
+#endif // PGDEBUG
+EMSCRIPTEN_KEEPALIVE int
+pg_initdb() {
+    PDEBUG("# 1066: pg_initdb()");
+    optind = 1;
+    int async_restart = 1;
+    pg_idb_status |= IDB_FAILED;
+
+    if (!chdir(getenv("PGDATA"))){
+        if (access("PG_VERSION", F_OK) == 0) {
+        	chdir("/");
+
+            pg_idb_status |= IDB_HASDB;
+
+            /* assume auth success for now */
+            pg_idb_status |= IDB_HASUSER;
+#if PGDEBUG
+            printf("# 1080: pg_initdb: db exists at : %s TODO: test for db name : %s \n", getenv("PGDATA"), getenv("PGDATABASE"));
+            print_bits(sizeof(pg_idb_status), &pg_idb_status);
+#endif // PGDEBUG
+            main_post();
+            async_restart = 0;
+            {
+                char *single_argv[] = {
+                    WASM_PREFIX "/bin/postgres",
+                    "--single",
+                    "-d", "1", "-B", "16", "-S", "512", "-f", "siobtnmh",
+                    "-D", getenv("PGDATA"),
+                    "-F", "-O", "-j",
+                    WASM_PGOPTS,
+                    getenv("PGDATABASE"),
+                    NULL
+                };
+                int single_argc = sizeof(single_argv) / sizeof(char*) - 1;
+                optind = 1;
+                AsyncPostgresSingleUserMain(single_argc, single_argv, strdup(getenv("PGUSER")), async_restart);
+            }
+
+            goto initdb_done;
+        }
+    	chdir("/");
+#if PGDEBUG
+        printf("pg_initdb: no db found at : %s\n", getenv("PGDATA") );
+#endif // PGDEBUG
+    }
+#if PGDEBUG
+    PDEBUG("# 1080");
+    printf("# pg_initdb_main result = %d\n", pg_initdb_main() );
+#else
+    pg_initdb_main();
+#endif // PGDEBUG
+
+    /* save stdin and use previous initdb output to feed boot mode */
+    int saved_stdin = dup(STDIN_FILENO);
+    {
+        PDEBUG("# 1118: restarting in boot mode for initdb");
+        freopen(IDB_PIPE_BOOT, "r", stdin);
+
+        char *boot_argv[] = {
+            WASM_PREFIX "/bin/postgres",
+            "--boot",
+            "-D", getenv("PGDATA"),
+            "-d","3",
+            WASM_PGOPTS,
+            "-X", "1048576",
+            NULL
+        };
+        int boot_argc = sizeof(boot_argv) / sizeof(char*) - 1;
+
+	    set_pglocale_pgservice(boot_argv[0], PG_TEXTDOMAIN("initdb"));
+
+        optind = 1;
+        BootstrapModeMain(boot_argc, boot_argv, false);
+        fclose(stdin);
+#if PGDEBUG
+        puts("# 886: keep " IDB_PIPE_BOOT );
+#else
+        remove(IDB_PIPE_BOOT);
+#endif
+        stdin = fdopen(saved_stdin, "r");
+        /* fake a shutdown to comlplete WAL/OID states */
+        proc_exit(66);
+    }
+
+    /* use previous initdb output to feed single mode */
+
+
+    /* or resume a previous db */
+    //IsPostmasterEnvironment = true;
+    if (ShmemVariableCache->nextOid < ((Oid) FirstNormalObjectId)) {
+#if PGDEBUG
+        puts("# 891: warning oid base too low, will need to set OID range after initdb(bootstrap/single)");
+#endif
+    }
+
+    {
+        PDEBUG("# 889: restarting in single mode for initdb");
+
+        char *single_argv[] = {
+            WASM_PREFIX "/bin/postgres",
+            "--single",
+            "-d", "1", "-B", "16", "-S", "512", "-f", "siobtnmh",
+            "-D", getenv("PGDATA"),
+            "-F", "-O", "-j",
+            WASM_PGOPTS,
+            "template1",
+            NULL
+        };
+        int single_argc = sizeof(single_argv) / sizeof(char*) - 1;
+        optind = 1;
+        RePostgresSingleUserMain(single_argc, single_argv, strdup( getenv("PGUSER")));
+    }
+
+initdb_done:;
+    pg_idb_status |= IDB_CALLED;
+    IsPostmasterEnvironment = true;
+    if (ShmemVariableCache->nextOid < ((Oid) FirstNormalObjectId)) {
+        /* IsPostmasterEnvironment is now true
+         these will be executed when required in varsup.c/GetNewObjectId
+    	 ShmemVariableCache->nextOid = FirstNormalObjectId;
+	     ShmemVariableCache->oidCount = 0;
+        */
+#if PGDEBUG
+        puts("# 922: initdb done, oid base too low but OID range will be set because IsPostmasterEnvironment");
+#endif
+    }
+
+    if (optind>0) {
+        /* RESET getopt */
+        optind = 1;
+        /* we did not fail, clear the default failed state */
+        pg_idb_status &= IDB_OK;
+    } else {
+        PDEBUG("# exiting on initdb-single error");
+        // TODO raise js exception
+    }
+    return pg_idb_status;
+}
+
+
+#endif // PG_INITDB_MAIN
+
+#define PGDB WASM_PREFIX "/base"
+
+EM_JS(int, is_web_env, (), {
+    try {
+        if (window) return 1;
+    } catch(x) {return 0}
+});
+
+static void
+main_pre(int argc, char *argv[]) {
+
+
+    char key[256];
+    int i=0;
+// extra env is always after normal args
+    PDEBUG("# ============= extra argv dump ==================");
+    {
+        for (;i<argc;i++) {
+            const char *kv = argv[i];
+            for (int sk=0;sk<strlen(kv);sk++)
+                if(kv[sk]=='=')
+                    goto extra_env;
+#if PGDEBUG
+            printf("%s ", kv);
+#endif
+        }
+    }
+extra_env:;
+    PDEBUG("\n# ============= arg->env dump ==================");
+    {
+        for (;i<argc;i++) {
+            const char *kv = argv[i];
+            for (int sk=0;sk<strlen(kv);sk++) {
+                if (sk>255) {
+                    puts("buffer overrun on extra env at:");
+                    puts(kv);
+                    continue;
+                }
+                if (kv[sk]=='=') {
+                    memcpy(key, kv, sk);
+                    key[sk] = 0;
+#if PGDEBUG
+                    printf("%s='%s'\n", &(key[0]), &(kv[sk+1]));
+#endif
+                    setenv(key, &kv[sk+1], 1);
+                }
+            }
+        }
+    }
+    PDEBUG("\n# =========================================");
+
+	argv[0] = strdup(WASM_PREFIX "/bin/postgres");
+
+
+#if defined(__EMSCRIPTEN__)
+    EM_ASM({
+        Module.is_worker = (typeof WorkerGlobalScope !== 'undefined') && self instanceof WorkerGlobalScope;
+        Module.FD_BUFFER_MAX = $0;
+        Module.emscripten_copy_to = console.warn;
+    }, FD_BUFFER_MAX);  /* ( global mem start / num fd max ) */
+
+    if (is_node) {
+    	setenv("ENVIRONMENT", "node" , 1);
+        EM_ASM({
+#if PGDEBUG
+            console.warn("prerun(C-node) worker=", Module.is_worker);
+#endif
+            Module['postMessage'] = function custom_postMessage(event) {
+                console.log("# pg_main_emsdk.c:944: onCustomMessage:", event);
+            };
+        });
+
+    } else {
+    	setenv("ENVIRONMENT", "web" , 1);
+#if PGDEBUG
+        EM_ASM({
+            console.warn("prerun(C-web) worker=", Module.is_worker);
+        });
+#endif
+        is_repl = true;
+    }
+
+    EM_ASM({
+        if (Module.is_worker) {
+#if PGDEBUG
+            console.log("Main: running in a worker, setting onCustomMessage");
+#endif
+            function onCustomMessage(event) {
+                console.log("onCustomMessage:", event);
+            };
+            Module['onCustomMessage'] = onCustomMessage;
+        } else {
+#if PGDEBUG
+            console.log("Running in main thread, faking onCustomMessage");
+#endif
+            Module['postMessage'] = function custom_postMessage(event) {
+                switch (event.type) {
+                    case "raw" :  {
+                        //stringToUTF8( event.data, shm_rawinput, Module.FD_BUFFER_MAX);
+                        break;
+                    }
+
+                    case "stdin" :  {
+                        stringToUTF8( event.data, 1, Module.FD_BUFFER_MAX);
+                        break;
+                    }
+                    case "rcon" :  {
+                        //stringToUTF8( event.data, shm_rcon, Module.FD_BUFFER_MAX);
+                        break;
+                    }
+                    default : console.warn("custom_postMessage?", event);
+                }
+            };
+            //if (!window.vm)
+              //  window.vm = Module;
+        };
+    });
+
+#endif // __EMSCRIPTEN__
+	chdir("/");
+    mkdirp("/tmp");
+    mkdirp(WASM_PREFIX);
+
+	// postgres does not know where to find the server configuration file.
+    // also we store the fake locale file there.
+	// postgres.js:1605 You must specify the --config-file or -D invocation option or set the PGDATA environment variable.
+
+    /* enforce ? */
+	setenv("PGSYSCONFDIR", WASM_PREFIX, 1);
+	setenv("PGCLIENTENCODING", "UTF8", 1);
+
+    // default is to run a repl loop
+    setenv("REPL", "Y", 0);
+/*
+ * we cannot run "locale -a" either from web or node. the file getenv("PGSYSCONFDIR") / "locale"
+ * serves as popen output
+ */
+
+	setenv("LC_CTYPE", "C" , 1);
+
+    /* defaults */
+
+    setenv("TZ", "UTC", 0);
+    setenv("PGTZ", "UTC", 0);
+	setenv("PGUSER", WASM_USERNAME , 0);
+	setenv("PGDATA", PGDB , 0);
+	setenv("PGDATABASE", "template1" , 0);
+    setenv("PG_COLOR", "always", 0);
+
+#if PGDEBUG
+    puts("# ============= env dump ==================");
+    for (char **env = environ; *env != 0; env++) {
+        char *drefp = *env;
+        printf("# %s\n", drefp);
+    }
+    puts("# =========================================");
+#endif
+}
+
+int g_argc;
+char **g_argv;
+
+void main_post();
+void main_post() {
+        /*
+         * Fire up essential subsystems: error and memory management
+         *
+         * Code after this point is allowed to use elog/ereport, though
+         * localization of messages may not work right away, and messages won't go
+         * anywhere but stderr until GUC settings get loaded.
+         */
+        MemoryContextInit();
+
+        /*
+         * Set up locale information
+         */
+        set_pglocale_pgservice(g_argv[0], PG_TEXTDOMAIN("postgres"));
+
+        /*
+         * In the postmaster, absorb the environment values for LC_COLLATE and
+         * LC_CTYPE.  Individual backends will change these later to settings
+         * taken from pg_database, but the postmaster cannot do that.  If we leave
+         * these set to "C" then message localization might not work well in the
+         * postmaster.
+         */
+        init_locale("LC_COLLATE", LC_COLLATE, "");
+        init_locale("LC_CTYPE", LC_CTYPE, "");
+
+        /*
+         * LC_MESSAGES will get set later during GUC option processing, but we set
+         * it here to allow startup error messages to be localized.
+         */
+    #ifdef LC_MESSAGES
+        init_locale("LC_MESSAGES", LC_MESSAGES, "");
+    #endif
+
+        /*
+         * We keep these set to "C" always, except transiently in pg_locale.c; see
+         * that file for explanations.
+         */
+        init_locale("LC_MONETARY", LC_MONETARY, "C");
+        init_locale("LC_NUMERIC", LC_NUMERIC, "C");
+        init_locale("LC_TIME", LC_TIME, "C");
+
+        /*
+         * Now that we have absorbed as much as we wish to from the locale
+         * environment, remove any LC_ALL setting, so that the environment
+         * variables installed by pg_perm_setlocale have force.
+         */
+        unsetenv("LC_ALL");
+}
+EMSCRIPTEN_KEEPALIVE void __cxa_throw(void *thrown_exception, void *tinfo, void *dest);
+EMSCRIPTEN_KEEPALIVE void
+__cxa_throw(void *thrown_exception, void *tinfo, void *dest) {}
+
+/*
+EMSCRIPTEN_KEEPALIVE void *
+_ZNSt13runtime_errorD1Ev(void * int32) {
+    return NULL;
+}
+*/
+
+
+extern void AsyncPostgresSingleUserMain(int single_argc, char *single_argv[], const char *username, int async_restart);
+
+
+EMSCRIPTEN_KEEPALIVE int main_repl();
+EMSCRIPTEN_KEEPALIVE int
+main_repl() {
+    bool hadloop_error = false;
+
+    whereToSendOutput = DestNone;
+
+    if (!mkdir(PGDB, 0700)) {
+        /* no db : run initdb now. */
+#if PGDEBUG
+        fprintf(stderr, "PGDATA=%s not found, running initdb with defaults\n", PGDB );
+#endif
+        #if defined(PG_INITDB_MAIN)
+            #warning "web build"
+puts("1168");
+            hadloop_error = pg_initdb() & IDB_FAILED;
+        #else
+            #warning "node build"
+            #if defined(__wasi__)
+                hadloop_error = pg_initdb() & IDB_FAILED;
+            #endif
+        #endif
+
+    } else {
+        // download a db case ?
+    	mkdirp(PGDB);
+
+        // db fixup because empty dirs are not packaged
+	    /*
+	    mkdirp(WASM_PREFIX "/lib");
+	    mkdirp(WASM_PREFIX "/lib/postgresql");
+	    */
+	    mkdirp(PGDB "/pg_wal");
+	    mkdirp(PGDB "/pg_wal/archive_status");
+	    mkdirp(PGDB "/pg_wal/summaries");
+
+	    mkdirp(PGDB "/pg_tblspc");
+	    mkdirp(PGDB "/pg_snapshots");
+	    mkdirp(PGDB "/pg_commit_ts");
+	    mkdirp(PGDB "/pg_notify");
+	    mkdirp(PGDB "/pg_replslot");
+	    mkdirp(PGDB "/pg_twophase");
+
+
+	    mkdirp(PGDB "/pg_logical");
+	    mkdirp(PGDB "/pg_logical/snapshots");
+	    mkdirp(PGDB "/pg_logical/mappings");
+
+    }
+
+    if (!hadloop_error) {
+        main_post();
+
+        /*
+         * Catch standard options before doing much else, in particular before we
+         * insist on not being root.
+         */
+        if (g_argc > 1) {
+	        if (strcmp(g_argv[1], "--help") == 0 || strcmp(g_argv[1], "-?") == 0)
+	        {
+		        help(progname);
+		        exit(0);
+	        }
+	        if (strcmp(g_argv[1], "--version") == 0 || strcmp(g_argv[1], "-V") == 0)
+	        {
+		        fputs(PG_BACKEND_VERSIONSTR, stdout);
+		        exit(0);
+	        }
+
+        }
+
+        if (g_argc > 1 && strcmp(g_argv[1], "--check") == 0) {
+	        BootstrapModeMain(g_argc, g_argv, true);
+            return 0;
+        }
+
+        if (g_argc > 1 && strcmp(g_argv[1], "--boot") == 0) {
+            PDEBUG("# 1410: boot: " __FILE__ );
+            BootstrapModeMain(g_argc, g_argv, false);
+            return 0;
+        }
+
+        PDEBUG("# 1415: single: " __FILE__ );
+        AsyncPostgresSingleUserMain(g_argc, g_argv, strdup(getenv("PGUSER")), 0);
+    }
+    return 0;
+}
+
+extern void pg_repl_raf(void);
+
+int
+main(int argc, char **argv)
+{
+    int ret=0;
+    is_node = !is_web_env();
+
+    main_pre(argc, argv);
+#if PGDEBUG
+    printf("# 1249: argv0 (%s) PGUSER=%s PGDATA=%s\n PGDATABASE=%s REPL=%s\n",
+        argv[0], getenv("PGUSER"), getenv("PGDATA"),  getenv("PGDATABASE"), getenv("REPL") );
+#endif
+	progname = get_progname(argv[0]);
+
+    /*
+    PGDATESTYLE
+    TZ
+    PG_SHMEM_ADDR
+
+    PGCTLTIMEOUT
+    PG_TEST_USE_UNIX_SOCKETS
+    INITDB_TEMPLATE
+    PSQL_HISTORY
+    TMPDIR
+    PGOPTIONS
+    */
+
+    /*
+     * Platform-specific startup hacks
+     */
+    startup_hacks(progname);
+
+    /*
+     * Remember the physical location of the initially given argv[] array for
+     * possible use by ps display.  On some platforms, the argv[] storage must
+     * be overwritten in order to set the process title for ps. In such cases
+     * save_ps_display_args makes and returns a new copy of the argv[] array.
+     *
+     * save_ps_display_args may also move the environment strings to make
+     * extra room. Therefore this should be done as early as possible during
+     * startup, to avoid entanglements with code that might save a getenv()
+     * result pointer.
+     */
+    argv = save_ps_display_args(argc, argv);
+    g_argv = argv;
+    g_argc = argc;
+
+    is_repl = strlen(getenv("REPL")) && getenv("REPL")[0]=='Y';
+    if (!is_repl) {
+        PDEBUG("# 1289: exit with live runtime (nodb)");
+        return 0;
+    }
+    PDEBUG("# 1292: repl");
+    // so it is repl
+    main_repl();
+    if (is_node) {
+        PDEBUG("# 1296: node repl");
+        pg_repl_raf();
+    }
+    emscripten_force_exit(ret);
+	return ret;
+}
+
+#endif // PG_MAIN
diff --git a/patches/pg_main_wasi.c b/patches/pg_main_wasi.c
new file mode 100644
index 000000000..b941790f1
--- /dev/null
+++ b/patches/pg_main_wasi.c
@@ -0,0 +1,1272 @@
+#if defined(PG_MAIN)
+bool is_embed = true;
+bool is_repl = true;
+bool quote_all_identifiers = false;
+
+__attribute__((export_name("interactive_one"))) void interactive_one(void);
+__attribute__((export_name("interactive_file"))) void interactive_file(void);
+
+/* exported from postmaster.h */
+const char *
+progname;
+
+void
+PostgresMain(const char *dbname, const char *username)
+{
+    puts("# 16: ERROR: PostgresMain should not be called anymore" __FILE__ );
+    while (1){};
+}
+
+
+
+volatile bool send_ready_for_query = true;
+volatile bool idle_in_transaction_timeout_enabled = false;
+volatile bool idle_session_timeout_enabled = false;
+volatile sigjmp_buf local_sigjmp_buf;
+
+volatile bool repl = true ;
+volatile int pg_idb_status = 0;
+volatile bool inloop = false;
+
+FILE * single_mode_feed = NULL;
+
+bool force_echo = false;
+
+extern void ReInitPostgres(const char *in_dbname, Oid dboid,
+			 const char *username, Oid useroid,
+			 bool load_session_libraries,
+			 bool override_allow_connections,
+			 char *out_dbname);
+
+
+void
+AsyncPostgresSingleUserMain(int argc, char *argv[],
+					   const char *username, int async_restart)
+{
+	const char *dbname = NULL;
+PDEBUG("# 47");
+	/* Initialize startup process environment. */
+	InitStandaloneProcess(argv[0]);
+
+	/* Set default values for command-line options.	 */
+	InitializeGUCOptions();
+PDEBUG("# 53");
+	/* Parse command-line options. */
+	process_postgres_switches(argc, argv, PGC_POSTMASTER, &dbname);
+PDEBUG("# 56");
+	/* Must have gotten a database name, or have a default (the username) */
+	if (dbname == NULL)
+	{
+		dbname = username;
+		if (dbname == NULL)
+			ereport(FATAL,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("%s: no database nor user name specified",
+							progname)));
+	}
+
+if (async_restart) goto async_db_change;
+	/* Acquire configuration parameters */
+	if (!SelectConfigFiles(userDoption, progname))
+		proc_exit(1);
+
+	checkDataDir();
+	ChangeToDataDir();
+
+	/*
+	 * Create lockfile for data directory.
+	 */
+	CreateDataDirLockFile(false);
+
+	/* read control file (error checking and contains config ) */
+	LocalProcessControlFile(false);
+
+	/*
+	 * process any libraries that should be preloaded at postmaster start
+	 */
+	process_shared_preload_libraries();
+
+	/* Initialize MaxBackends */
+	InitializeMaxBackends();
+PDEBUG("# 91");
+	/*
+	 * Give preloaded libraries a chance to request additional shared memory.
+	 */
+	process_shmem_requests();
+
+	/*
+	 * Now that loadable modules have had their chance to request additional
+	 * shared memory, determine the value of any runtime-computed GUCs that
+	 * depend on the amount of shared memory required.
+	 */
+	InitializeShmemGUCs();
+
+	/*
+	 * Now that modules have been loaded, we can process any custom resource
+	 * managers specified in the wal_consistency_checking GUC.
+	 */
+	InitializeWalConsistencyChecking();
+
+	CreateSharedMemoryAndSemaphores();
+
+	/*
+	 * Remember stand-alone backend startup time,roughly at the same point
+	 * during startup that postmaster does so.
+	 */
+	PgStartTime = GetCurrentTimestamp();
+
+	/*
+	 * Create a per-backend PGPROC struct in shared memory. We must do this
+	 * before we can use LWLocks.
+	 */
+	InitProcess();
+
+// main
+	SetProcessingMode(InitProcessing);
+
+	/* Early initialization */
+	BaseInit();
+async_db_change:;
+PDEBUG("# 130");
+	/*
+	 * General initialization.
+	 *
+	 * NOTE: if you are tempted to add code in this vicinity, consider putting
+	 * it inside InitPostgres() instead.  In particular, anything that
+	 * involves database access should be there, not here.
+	 */
+	InitPostgres(dbname, InvalidOid,	/* database to connect to */
+				 username, InvalidOid,	/* role to connect as */
+				 !am_walsender, /* honor session_preload_libraries? */
+				 false,			/* don't ignore datallowconn */
+				 NULL);			/* no out_dbname */
+
+	/*
+	 * If the PostmasterContext is still around, recycle the space; we don't
+	 * need it anymore after InitPostgres completes.  Note this does not trash
+	 * *MyProcPort, because ConnCreate() allocated that space with malloc()
+	 * ... else we'd need to copy the Port data first.  Also, subsidiary data
+	 * such as the username isn't lost either; see ProcessStartupPacket().
+	 */
+	if (PostmasterContext)
+	{
+		MemoryContextDelete(PostmasterContext);
+		PostmasterContext = NULL;
+	}
+
+	SetProcessingMode(NormalProcessing);
+
+	/*
+	 * Now all GUC states are fully set up.  Report them to client if
+	 * appropriate.
+	 */
+	BeginReportingGUCOptions();
+
+	/*
+	 * Also set up handler to log session end; we have to wait till now to be
+	 * sure Log_disconnections has its final value.
+	 */
+	if (IsUnderPostmaster && Log_disconnections)
+		on_proc_exit(log_disconnections, 0);
+
+	pgstat_report_connect(MyDatabaseId);
+
+	/* Perform initialization specific to a WAL sender process. */
+	if (am_walsender)
+		InitWalSender();
+
+	/*
+	 * Send this backend's cancellation info to the frontend.
+	 */
+	if (whereToSendOutput == DestRemote)
+	{
+		StringInfoData buf;
+
+		pq_beginmessage(&buf, 'K');
+		pq_sendint32(&buf, (int32) MyProcPid);
+		pq_sendint32(&buf, (int32) MyCancelKey);
+		pq_endmessage(&buf);
+		/* Need not flush since ReadyForQuery will do it. */
+	}
+
+	/* Welcome banner for standalone case */
+	if (whereToSendOutput == DestDebug)
+		printf("\nPostgreSQL stand-alone backend %s\n", PG_VERSION);
+
+	/*
+	 * Create the memory context we will use in the main loop.
+	 *
+	 * MessageContext is reset once per iteration of the main loop, ie, upon
+	 * completion of processing of each command message from the client.
+	 */
+	MessageContext = AllocSetContextCreate(TopMemoryContext, "MessageContext", ALLOCSET_DEFAULT_SIZES);
+
+	/*
+	 * Create memory context and buffer used for RowDescription messages. As
+	 * SendRowDescriptionMessage(), via exec_describe_statement_message(), is
+	 * frequently executed for ever single statement, we don't want to
+	 * allocate a separate buffer every time.
+	 */
+	row_description_context = AllocSetContextCreate(TopMemoryContext, "RowDescriptionContext", ALLOCSET_DEFAULT_SIZES);
+	MemoryContextSwitchTo(row_description_context);
+	initStringInfo(&row_description_buf);
+	MemoryContextSwitchTo(TopMemoryContext);
+}
+
+void
+RePostgresSingleUserMain(int single_argc, char *single_argv[], const char *username)
+{
+#if PGDEBUG
+printf("# 295: RePostgresSingleUserMain progname=%s for %s feed=%s\n", progname, single_argv[0], IDB_PIPE_SINGLE);
+#endif
+    single_mode_feed = fopen(IDB_PIPE_SINGLE, "r");
+
+    // should be template1.
+    const char *dbname = NULL;
+
+
+    /* Parse command-line options. */
+    process_postgres_switches(single_argc, single_argv, PGC_POSTMASTER, &dbname);
+#if PGDEBUG
+printf("# 306: dbname=%s\n", dbname);
+#endif
+    LocalProcessControlFile(false);
+
+    process_shared_preload_libraries();
+
+//	                InitializeMaxBackends();
+
+// ? IgnoreSystemIndexes = true;
+IgnoreSystemIndexes = false;
+    process_shmem_requests();
+
+    InitializeShmemGUCs();
+
+    InitializeWalConsistencyChecking();
+
+    PgStartTime = GetCurrentTimestamp();
+
+    SetProcessingMode(InitProcessing);
+PDEBUG("# 326: Re-InitPostgres");
+if (am_walsender)
+    PDEBUG("# 327: am_walsender == true");
+//      BaseInit();
+
+    InitPostgres(dbname, InvalidOid,	/* database to connect to */
+                 username, InvalidOid,	/* role to connect as */
+                 !am_walsender, /* honor session_preload_libraries? */
+                 false,			/* don't ignore datallowconn */
+                 NULL);			/* no out_dbname */
+
+PDEBUG("# 334");
+/*
+    if (PostmasterContext)
+    {
+        PDEBUG("# 103");
+        MemoryContextDelete(PostmasterContext);
+        PostmasterContext = NULL;
+    }
+*/
+    SetProcessingMode(NormalProcessing);
+
+    BeginReportingGUCOptions();
+
+    if (IsUnderPostmaster && Log_disconnections)
+        on_proc_exit(log_disconnections, 0);
+
+    pgstat_report_connect(MyDatabaseId);
+
+    /* Perform initialization specific to a WAL sender process. */
+    if (am_walsender)
+        InitWalSender();
+/*
+    if (whereToSendOutput == DestRemote)
+    {
+        StringInfoData buf;
+
+        pq_beginmessage(&buf, 'K');
+        pq_sendint32(&buf, (int32) MyProcPid);
+        pq_sendint32(&buf, (int32) MyCancelKey);
+        pq_endmessage(&buf);
+        // Need not flush since ReadyForQuery will do it.
+    }
+*/
+#if PGDEBUG
+    whereToSendOutput = DestDebug;
+#endif
+
+    if (whereToSendOutput == DestDebug)
+        printf("\nPostgreSQL stand-alone backend %s\n", PG_VERSION);
+
+    /*
+     * Create the memory context we will use in the main loop.
+     *
+     * MessageContext is reset once per iteration of the main loop, ie, upon
+     * completion of processing of each command message from the client.
+     */
+    MessageContext = AllocSetContextCreate(TopMemoryContext,
+						                   "MessageContext",
+						                   ALLOCSET_DEFAULT_SIZES);
+
+    /*
+     * Create memory context and buffer used for RowDescription messages. As
+     * SendRowDescriptionMessage(), via exec_describe_statement_message(), is
+     * frequently executed for ever single statement, we don't want to
+     * allocate a separate buffer every time.
+     */
+    row_description_context = AllocSetContextCreate(TopMemoryContext,
+									                "RowDescriptionContext",
+									                ALLOCSET_DEFAULT_SIZES);
+    MemoryContextSwitchTo(row_description_context);
+    initStringInfo(&row_description_buf);
+    MemoryContextSwitchTo(TopMemoryContext);
+
+#if defined(__wasi__) //PGDEBUG
+    puts("# 400: sjlj exception handler off");
+#else
+    if (sigsetjmp(local_sigjmp_buf, 1) != 0)
+    {
+        /*
+         * NOTE: if you are tempted to add more code in this if-block,
+         * consider the high probability that it should be in
+         * AbortTransaction() instead.  The only stuff done directly here
+         * should be stuff that is guaranteed to apply *only* for outer-level
+         * error recovery, such as adjusting the FE/BE protocol status.
+         */
+
+        /* Since not using PG_TRY, must reset error stack by hand */
+        error_context_stack = NULL;
+
+        /* Prevent interrupts while cleaning up */
+        HOLD_INTERRUPTS();
+
+        /*
+         * Forget any pending QueryCancel request, since we're returning to
+         * the idle loop anyway, and cancel any active timeout requests.  (In
+         * future we might want to allow some timeout requests to survive, but
+         * at minimum it'd be necessary to do reschedule_timeouts(), in case
+         * we got here because of a query cancel interrupting the SIGALRM
+         * interrupt handler.)	Note in particular that we must clear the
+         * statement and lock timeout indicators, to prevent any future plain
+         * query cancels from being misreported as timeouts in case we're
+         * forgetting a timeout cancel.
+         */
+        disable_all_timeouts(false);	/* do first to avoid race condition */
+        QueryCancelPending = false;
+        idle_in_transaction_timeout_enabled = false;
+        idle_session_timeout_enabled = false;
+
+        /* Not reading from the client anymore. */
+        DoingCommandRead = false;
+
+        /* Make sure libpq is in a good state */
+        pq_comm_reset();
+
+        /* Report the error to the client and/or server log */
+        EmitErrorReport();
+
+        /*
+         * If Valgrind noticed something during the erroneous query, print the
+         * query string, assuming we have one.
+         */
+        valgrind_report_error_query(debug_query_string);
+
+        /*
+         * Make sure debug_query_string gets reset before we possibly clobber
+         * the storage it points at.
+         */
+        debug_query_string = NULL;
+
+        /*
+         * Abort the current transaction in order to recover.
+         */
+        AbortCurrentTransaction();
+
+        if (am_walsender)
+            WalSndErrorCleanup();
+
+        PortalErrorCleanup();
+
+        /*
+         * We can't release replication slots inside AbortTransaction() as we
+         * need to be able to start and abort transactions while having a slot
+         * acquired. But we never need to hold them across top level errors,
+         * so releasing here is fine. There also is a before_shmem_exit()
+         * callback ensuring correct cleanup on FATAL errors.
+         */
+        if (MyReplicationSlot != NULL)
+            ReplicationSlotRelease();
+
+        /* We also want to cleanup temporary slots on error. */
+        ReplicationSlotCleanup();
+
+        jit_reset_after_error();
+
+        /*
+         * Now return to normal top-level context and clear ErrorContext for
+         * next time.
+         */
+        MemoryContextSwitchTo(TopMemoryContext);
+        FlushErrorState();
+
+        /*
+         * If we were handling an extended-query-protocol message, initiate
+         * skip till next Sync.  This also causes us not to issue
+         * ReadyForQuery (until we get Sync).
+         */
+        if (doing_extended_query_message)
+            ignore_till_sync = true;
+
+        /* We don't have a transaction command open anymore */
+        xact_started = false;
+
+        /*
+         * If an error occurred while we were reading a message from the
+         * client, we have potentially lost track of where the previous
+         * message ends and the next one begins.  Even though we have
+         * otherwise recovered from the error, we cannot safely read any more
+         * messages from the client, so there isn't much we can do with the
+         * connection anymore.
+         */
+        if (pq_is_reading_msg())
+            ereport(FATAL,
+	                (errcode(ERRCODE_PROTOCOL_VIOLATION),
+	                 errmsg("terminating connection because protocol synchronization was lost")));
+
+        /* Now we can allow interrupts again */
+        RESUME_INTERRUPTS();
+    }
+
+    /* We can now handle ereport(ERROR) */
+    PG_exception_stack = &local_sigjmp_buf;
+
+#endif
+
+    if (!ignore_till_sync)
+        send_ready_for_query = true;	/* initially, or after error */
+
+    if (!inloop) {
+        inloop = true;
+        PDEBUG("# 545: REPL(initdb-single):Begin " __FILE__ );
+
+        while (repl) { interactive_file(); }
+    } else {
+        // signal error
+        optind = -1;
+    }
+
+    fclose(single_mode_feed);
+
+    if (strlen(getenv("REPL")) && getenv("REPL")[0]=='Y') {
+        PDEBUG("# 556: REPL(initdb-single):End " __FILE__ );
+
+        /* now use stdin as source */
+        repl = true;
+        single_mode_feed = NULL;
+
+        force_echo = true;
+
+        if (is_embed) {
+#if PGDEBUG
+            fprintf(stdout,"# 551: now in webloop(RAF)\npg> %c\n", 4);
+#endif
+            emscripten_set_main_loop( (em_callback_func)interactive_one, 0, 0);
+        } else {
+
+            PDEBUG("# 556: REPL(single after initdb):Begin(NORETURN)");
+            while (repl) { interactive_file(); }
+            PDEBUG("# 558: REPL:End Raising a 'RuntimeError Exception' to halt program NOW");
+            {
+                void (*npe)() = NULL;
+                npe();
+            }
+        }
+
+        // unreachable.
+    }
+
+    PDEBUG("# 582: no line-repl requested, exiting and keeping runtime alive");
+}
+
+
+
+
+/* ================================================================================ */
+/* ================================================================================ */
+/* ================================================================================ */
+/* ================================================================================ */
+
+
+extern int cma_rsize;
+
+
+EMSCRIPTEN_KEEPALIVE void
+pg_shutdown() {
+    PDEBUG("# 637: pg_shutdown");
+    proc_exit(66);
+}
+
+int loops = 0;
+
+EMSCRIPTEN_KEEPALIVE void
+interactive_file() {
+	int			firstchar;
+	int			c;				/* character read from getc() */
+	StringInfoData input_message;
+	StringInfoData *inBuf;
+    FILE *stream ;
+
+	/*
+	 * At top of loop, reset extended-query-message flag, so that any
+	 * errors encountered in "idle" state don't provoke skip.
+	 */
+	doing_extended_query_message = false;
+
+	/*
+	 * Release storage left over from prior query cycle, and create a new
+	 * query input buffer in the cleared MessageContext.
+	 */
+	MemoryContextSwitchTo(MessageContext);
+	MemoryContextResetAndDeleteChildren(MessageContext);
+
+	initStringInfo(&input_message);
+    inBuf = &input_message;
+	DoingCommandRead = true;
+
+	//firstchar = ReadCommand(&input_message);
+	if (whereToSendOutput == DestRemote)
+		firstchar = SocketBackend(&input_message);
+	else {
+
+	    /*
+	     * display a prompt and obtain input from the user
+	     */
+        if (!single_mode_feed) {
+	        printf("pg> %c\n", 4);
+        	fflush(stdout);
+            stream = stdin;
+        } else {
+            stream = single_mode_feed;
+        }
+
+	    resetStringInfo(inBuf);
+	    while ((c = getc(stream)) != EOF)
+	    {
+		    if (c == '\n')
+		    {
+			    if (UseSemiNewlineNewline)
+			    {
+				    /*
+				     * In -j mode, semicolon followed by two newlines ends the
+				     * command; otherwise treat newline as regular character.
+				     */
+				    if (inBuf->len > 1 &&
+					    inBuf->data[inBuf->len - 1] == '\n' &&
+					    inBuf->data[inBuf->len - 2] == ';')
+				    {
+					    /* might as well drop the second newline */
+					    break;
+				    }
+			    }
+			    else
+			    {
+				    /*
+				     * In plain mode, newline ends the command unless preceded by
+				     * backslash.
+				     */
+				    if (inBuf->len > 0 &&
+					    inBuf->data[inBuf->len - 1] == '\\')
+				    {
+					    /* discard backslash from inBuf */
+					    inBuf->data[--inBuf->len] = '\0';
+					    /* discard newline too */
+					    continue;
+				    }
+				    else
+				    {
+					    /* keep the newline character, but end the command */
+					    appendStringInfoChar(inBuf, '\n');
+					    break;
+				    }
+			    }
+		    }
+
+		    /* Not newline, or newline treated as regular character */
+		    appendStringInfoChar(inBuf, (char) c);
+	    }
+
+	    if (c == EOF && inBuf->len == 0) {
+		    firstchar = EOF;
+        } else {
+        	/* Add '\0' to make it look the same as message case. */
+	        appendStringInfoChar(inBuf, (char) '\0');
+        	firstchar = 'Q';
+        }
+
+    }
+
+	if (ignore_till_sync && firstchar != EOF)
+		return;
+
+    #include "pg_proto.c"
+}
+
+#include "./interactive_one_wasi.c"
+
+void
+PostgresSingleUserMain(int argc, char *argv[], const char *username) {
+    while(1){};
+}
+
+#else  // defined(PG_MAIN)
+
+extern bool is_embed;
+extern bool is_repl;
+
+extern bool quote_all_identifiers;
+
+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
+#include <unistd.h>        /* chdir */
+#include <sys/stat.h>      /* mkdir */
+static
+void mkdirp(const char *p) {
+	if (!mkdir(p, 0700)) {
+		fprintf(stderr, "# no '%s' directory, creating one ...\n", p);
+	}
+}
+#endif /* wasm */
+
+
+extern int pg_initdb_main(void);
+
+extern void RePostgresSingleUserMain(int single_argc, char *single_argv[], const char *username);
+extern void AsyncPostgresSingleUserMain(int single_argc, char *single_argv[], const char *username, int async_restart);
+extern void main_post(void);
+extern void proc_exit(int code);
+extern bool IsPostmasterEnvironment;
+
+extern volatile int pg_idb_status;
+
+
+#if PGDEBUG
+void print_bits(size_t const size, void const * const ptr);
+void print_bits(size_t const size, void const * const ptr)
+{
+    unsigned char *b = (unsigned char*) ptr;
+    unsigned char byte;
+    int i, j;
+
+    for (i = size-1; i >= 0; i--) {
+        for (j = 7; j >= 0; j--) {
+            byte = (b[i] >> j) & 1;
+            printf("%u", byte);
+        }
+    }
+    puts("");
+}
+#endif // PGDEBUG
+
+
+EMSCRIPTEN_KEEPALIVE int
+pg_initdb() {
+    PDEBUG("# 1066: pg_initdb()");
+    optind = 1;
+    int async_restart = 1;
+    pg_idb_status |= IDB_FAILED;
+
+    if (!chdir(getenv("PGDATA"))){
+        if (access("PG_VERSION", F_OK) == 0) {
+        	chdir("/");
+
+/* TODO: fill in empty dirs from db template
+    if (mkdir(PGDB, 0700)) {
+
+        // download a db case ?
+    	mkdirp(PGDB);
+
+        // db fixup because empty dirs may not packaged (eg git)
+
+	    // mkdirp(WASM_PREFIX "/lib");
+	    // mkdirp(WASM_PREFIX "/lib/postgresql");
+
+	    mkdirp(PGDB "/pg_wal");
+	    mkdirp(PGDB "/pg_wal/archive_status");
+	    mkdirp(PGDB "/pg_wal/summaries");
+
+	    mkdirp(PGDB "/pg_tblspc");
+	    mkdirp(PGDB "/pg_snapshots");
+	    mkdirp(PGDB "/pg_commit_ts");
+	    mkdirp(PGDB "/pg_notify");
+	    mkdirp(PGDB "/pg_replslot");
+	    mkdirp(PGDB "/pg_twophase");
+
+
+	    mkdirp(PGDB "/pg_logical");
+	    mkdirp(PGDB "/pg_logical/snapshots");
+	    mkdirp(PGDB "/pg_logical/mappings");
+    } else {
+        // no db : run initdb now.
+
+    }
+
+
+*/
+
+
+            pg_idb_status |= IDB_HASDB;
+
+            /* assume auth success for now */
+            pg_idb_status |= IDB_HASUSER;
+#if PGDEBUG
+            printf("# 1080: pg_initdb: db exists at : %s TODO: test for db name : %s \n", getenv("PGDATA"), getenv("PGDATABASE"));
+            print_bits(sizeof(pg_idb_status), &pg_idb_status);
+#endif // PGDEBUG
+            main_post();
+            async_restart = 0;
+            {
+                char *single_argv[] = {
+                    WASM_PREFIX "/bin/postgres",
+                    "--single",
+                    "-d", "1", "-B", "16", "-S", "512", "-f", "siobtnmh",
+                    "-D", getenv("PGDATA"),
+                    "-F", "-O", "-j",
+                    WASM_PGOPTS,
+                    getenv("PGDATABASE"),
+                    NULL
+                };
+                int single_argc = sizeof(single_argv) / sizeof(char*) - 1;
+                optind = 1;
+                AsyncPostgresSingleUserMain(single_argc, single_argv, strdup(getenv("PGUSER")), async_restart);
+            }
+
+            goto initdb_done;
+        }
+    	chdir("/");
+#if PGDEBUG
+        printf("pg_initdb: no db found at : %s\n", getenv("PGDATA") );
+#endif // PGDEBUG
+    }
+#if PGDEBUG
+    PDEBUG("# 1080");
+    printf("# pg_initdb_main result = %d\n", pg_initdb_main() );
+#else
+    pg_initdb_main();
+#endif // PGDEBUG
+
+    /* save stdin and use previous initdb output to feed boot mode */
+    int saved_stdin = dup(STDIN_FILENO);
+    {
+        PDEBUG("# 1118: restarting in boot mode for initdb");
+        freopen(IDB_PIPE_BOOT, "r", stdin);
+
+        char *boot_argv[] = {
+            WASM_PREFIX "/bin/postgres",
+            "--boot",
+            "-D", getenv("PGDATA"),
+            "-d","3",
+            WASM_PGOPTS,
+            "-X", "1048576",
+            NULL
+        };
+        int boot_argc = sizeof(boot_argv) / sizeof(char*) - 1;
+
+	    set_pglocale_pgservice(boot_argv[0], PG_TEXTDOMAIN("initdb"));
+
+        optind = 1;
+        BootstrapModeMain(boot_argc, boot_argv, false);
+        fclose(stdin);
+#if PGDEBUG
+        puts("# 886: keep " IDB_PIPE_BOOT );
+#else
+        remove(IDB_PIPE_BOOT);
+#endif
+        stdin = fdopen(saved_stdin, "r");
+        /* fake a shutdown to comlplete WAL/OID states */
+        proc_exit(66);
+    }
+
+    /* use previous initdb output to feed single mode */
+
+
+    /* or resume a previous db */
+    //IsPostmasterEnvironment = true;
+    if (ShmemVariableCache->nextOid < ((Oid) FirstNormalObjectId)) {
+#if PGDEBUG
+        puts("# 891: warning oid base too low, will need to set OID range after initdb(bootstrap/single)");
+#endif
+    }
+
+    {
+        PDEBUG("# 889: restarting in single mode for initdb");
+
+        char *single_argv[] = {
+            WASM_PREFIX "/bin/postgres",
+            "--single",
+            "-d", "1", "-B", "16", "-S", "512", "-f", "siobtnmh",
+            "-D", getenv("PGDATA"),
+            "-F", "-O", "-j",
+            WASM_PGOPTS,
+            "template1",
+            NULL
+        };
+        int single_argc = sizeof(single_argv) / sizeof(char*) - 1;
+        optind = 1;
+        RePostgresSingleUserMain(single_argc, single_argv, strdup( getenv("PGUSER")));
+    }
+
+    pg_idb_status |= IDB_CALLED;
+    puts("        @@@@@@@@@@@@@@@@@@@@@ write version @@@@@@@@@@@@@@@@@@@@@@@@ ");
+
+initdb_done:;
+    IsPostmasterEnvironment = true;
+    if (ShmemVariableCache->nextOid < ((Oid) FirstNormalObjectId)) {
+        /* IsPostmasterEnvironment is now true
+         these will be executed when required in varsup.c/GetNewObjectId
+    	 ShmemVariableCache->nextOid = FirstNormalObjectId;
+	     ShmemVariableCache->oidCount = 0;
+        */
+#if PGDEBUG
+        puts("# 922: initdb done, oid base too low but OID range will be set because IsPostmasterEnvironment");
+#endif
+    }
+
+    if (optind>0) {
+        /* RESET getopt */
+        optind = 1;
+        /* we did not fail, clear the default failed state */
+        pg_idb_status &= IDB_OK;
+    } else {
+        PDEBUG("# exiting on initdb-single error");
+        // TODO raise js exception
+    }
+    return pg_idb_status;
+}
+
+
+#define PGDB WASM_PREFIX "/base"
+
+EM_JS(int, is_web_env, (), {
+    try {
+        if (window) return 1;
+    } catch(x) {return 0}
+});
+
+
+int g_argc;
+char **g_argv;
+
+
+void main_post() {
+    /*
+     * Fire up essential subsystems: error and memory management
+     *
+     * Code after this point is allowed to use elog/ereport, though
+     * localization of messages may not work right away, and messages won't go
+     * anywhere but stderr until GUC settings get loaded.
+     */
+    MemoryContextInit();
+
+    /*
+     * Set up locale information
+     */
+    set_pglocale_pgservice(g_argv[0], PG_TEXTDOMAIN("postgres"));
+
+    /*
+     * In the postmaster, absorb the environment values for LC_COLLATE and
+     * LC_CTYPE.  Individual backends will change these later to settings
+     * taken from pg_database, but the postmaster cannot do that.  If we leave
+     * these set to "C" then message localization might not work well in the
+     * postmaster.
+     */
+    init_locale("LC_COLLATE", LC_COLLATE, "");
+    init_locale("LC_CTYPE", LC_CTYPE, "");
+
+    /*
+     * LC_MESSAGES will get set later during GUC option processing, but we set
+     * it here to allow startup error messages to be localized.
+     */
+#ifdef LC_MESSAGES
+    init_locale("LC_MESSAGES", LC_MESSAGES, "");
+#endif
+
+    /*
+     * We keep these set to "C" always, except transiently in pg_locale.c; see
+     * that file for explanations.
+     */
+    init_locale("LC_MONETARY", LC_MONETARY, "C");
+    init_locale("LC_NUMERIC", LC_NUMERIC, "C");
+    init_locale("LC_TIME", LC_TIME, "C");
+
+    /*
+     * Now that we have absorbed as much as we wish to from the locale
+     * environment, remove any LC_ALL setting, so that the environment
+     * variables installed by pg_perm_setlocale have force.
+     */
+    unsetenv("LC_ALL");
+}
+
+/*
+EMSCRIPTEN_KEEPALIVE void
+__cxa_throw(void *thrown_exception, void *tinfo, void *dest) {}
+*/
+
+extern void AsyncPostgresSingleUserMain(int single_argc, char *single_argv[], const char *username, int async_restart);
+
+
+#if defined(__wasi__) || defined(__EMSCRIPTEN__)
+
+#   define PG_INITDB_MAIN
+#   define PG_MAIN
+
+#if !defined(PG_LINKWEB)
+#   define FRONTEND
+#   include "../postgresql/src/common/logging.c"
+#   undef FRONTEND
+#endif
+
+#   define icu_language_tag(loc_str) icu_language_tag_idb(loc_str)
+#   define icu_validate_locale(loc_str) icu_validate_locale_idb(loc_str)
+
+#if !defined(PG_LINKWEB)
+#   include "../postgresql/src/interfaces/libpq/pqexpbuffer.c"
+#endif
+#   define fsync_pgdata(...)
+
+#   include "../postgresql/src/bin/initdb/initdb.c"
+
+    void use_socketfile(void) {
+        is_repl = true;
+        is_embed = false;
+    }
+#undef PG_INITDB_MAIN
+#undef PG_MAIN
+
+#endif // __wasi__
+
+
+
+int exit_code = 0;
+
+#if defined(EMUL_CMA)
+extern char *cma_port ;
+#endif
+
+EMSCRIPTEN_KEEPALIVE void
+setup() {
+    PDEBUG("=setup=");
+
+    // default for web is embed ( CMA )
+PDEBUG(" >>>>>>>>>>>>> FORCING EMBED MODE <<<<<<<<<<<<<<<<");
+    is_embed = true; // is_web_env();
+
+
+/*
+// and now for some undisclosed reason
+// we may not use CMA https://github.com/llvm/llvm-project/blob/f78610af3feb88f0e1edb2482dc77490fb4cad77/lld/wasm/Driver.cpp#L767
+
+// check https://github.com/llvm/llvm-project/issues?q=is%3Aissue+is%3Aopen+global-base+label%3Abackend%3AWebAssembly
+#define IO ((char *)(0))
+{
+    for (int i=0;i<64;i++)
+        if ( IO[i] )
+            printf("%c", IO[i] );
+        else
+            printf(".");
+    puts("");
+}
+*/
+
+
+
+#if PGDEBUG
+    printf("# 1095: argv0 (%s) PGUSER=%s PGDATA=%s PGDATABASE=%s PGEMBED=%s REPL=%s\n",
+        g_argv[0], getenv("PGUSER"), getenv("PGDATA"),  getenv("PGDATABASE"), getenv("PGEMBED"), getenv("REPL") );
+#endif
+
+    int argc = g_argc;
+
+    char key[256];
+    int i=0;
+// extra env is always after normal args
+    PDEBUG("# ============= argv dump ==================");
+    {
+        for (;i<argc;i++) {
+            const char *kv = g_argv[i];
+            if (!strcmp(kv,"--")) {
+                g_argc = i;
+                goto extra_env;
+            }
+/*
+            for (int sk=0;sk<strlen(kv);sk++)
+                if(kv[sk]=='=') {
+                    g_argc = i;
+                    goto extra_env;
+                }
+*/
+#if PGDEBUG
+            printf("%s ", kv);
+#endif
+        }
+    }
+extra_env:;
+    PDEBUG("\n# ============= arg->env dump ==================");
+    {
+        for (;i<argc;i++) {
+            const char *kv = g_argv[i];
+            for (int sk=0;sk<strlen(kv);sk++) {
+                if (sk>255) {
+                    puts("buffer overrun on extra env at:");
+                    puts(kv);
+                    continue;
+                }
+                if (kv[sk]=='=') {
+                    memcpy(key, kv, sk);
+                    key[sk] = 0;
+#if PGDEBUG
+                    printf("%s='%s'\n", &(key[0]), &(kv[sk+1]));
+#endif
+                    setenv(key, &kv[sk+1], 1);
+                }
+            }
+        }
+    }
+    PDEBUG("\n# =========================================");
+
+	g_argv[0] = strdup(WASM_PREFIX "/bin/postgres");
+	progname = get_progname(g_argv[0]);
+
+	chdir("/");
+    mkdirp("/tmp");
+    mkdirp(WASM_PREFIX);
+
+	// postgres does not know where to find the server configuration file.
+    // also we store the fake locale file there.
+	// postgres.js:1605 You must specify the --config-file or -D invocation option or set the PGDATA environment variable.
+
+    /* enforce ? */
+	setenv("PGSYSCONFDIR", WASM_PREFIX, 1);
+	setenv("PGCLIENTENCODING", "UTF8", 1);
+
+    // default is to run a repl loop
+    setenv("REPL", "Y", 0);
+/*
+ * we cannot run "locale -a" either from web or node. the file getenv("PGSYSCONFDIR") / "locale"
+ * serves as popen output
+ */
+
+	setenv("LC_CTYPE", "C" , 1);
+
+    /* defaults */
+
+    setenv("TZ", "UTC", 0);
+    setenv("PGTZ", "UTC", 0);
+	setenv("PGUSER", WASM_USERNAME , 0);
+	setenv("PGDATA", PGDB , 0);
+	setenv("PGDATABASE", "template1" , 0);
+    setenv("PG_COLOR", "always", 0);
+
+    /*
+    PGDATESTYLE
+    TZ
+    PG_SHMEM_ADDR
+
+    PGCTLTIMEOUT
+    PG_TEST_USE_UNIX_SOCKETS
+    INITDB_TEMPLATE
+    PSQL_HISTORY
+    TMPDIR
+    PGOPTIONS
+    */
+
+#if PGDEBUG
+    puts("# ============= env dump ==================");
+    for (char **env = environ; *env != 0; env++) {
+        char *drefp = *env;
+        printf("# %s\n", drefp);
+    }
+    puts("# =========================================");
+#endif
+
+#if PGDEBUG
+    printf("# 1267: argv0 (%s) PGUSER=%s PGDATA=%s PGDATABASE=%s PGEMBED=%s REPL=%s\n",
+        g_argv[0], getenv("PGUSER"), getenv("PGDATA"),  getenv("PGDATABASE"), getenv("PGEMBED"), getenv("REPL"));
+#endif
+
+
+    /*
+     * Platform-specific startup hacks
+     */
+    startup_hacks(progname);
+
+    /*
+     * Remember the physical location of the initially given argv[] array for
+     * possible use by ps display.  On some platforms, the argv[] storage must
+     * be overwritten in order to set the process title for ps. In such cases
+     * save_ps_display_args makes and returns a new copy of the argv[] array.
+     *
+     * save_ps_display_args may also move the environment strings to make
+     * extra room. Therefore this should be done as early as possible during
+     * startup, to avoid entanglements with code that might save a getenv()
+     * result pointer.
+     */
+    g_argv = save_ps_display_args(g_argc, g_argv);
+
+    if (getenv("REPL") && strlen(getenv("REPL")))
+        is_repl = getenv("REPL")[0]=='Y';
+
+    if (getenv("PGEMBED") && strlen(getenv("PGEMBED")))
+        is_embed = getenv("PGEMBED")[0]=='Y';
+
+    if (!is_repl) {
+        PDEBUG("# 1360: exit with live runtime (norepl, (no)db)");
+        exit_code = 0;
+        return;
+    }
+
+    // repl required, run initdb now if needed.
+    bool hadloop_error = false;
+
+    whereToSendOutput = DestNone;
+
+    if (is_embed) {
+        puts("\n\n    setup: is_embed : not running initdb\n\n");
+        return ;
+    }
+
+    int initdb_code = pg_initdb();
+
+    hadloop_error = initdb_code & IDB_FAILED;
+
+    if (!hadloop_error) {
+
+        int async_restart = (pg_idb_status | IDB_CALLED) > 0;
+
+        main_post();
+
+        /*
+         * Catch standard options before doing much else, in particular before we
+         * insist on not being root.
+         */
+        if (g_argc > 1) {
+	        if (strcmp(g_argv[1], "--help") == 0 || strcmp(g_argv[1], "-?") == 0)
+	        {
+		        help(progname);
+		        exit(0);
+	        }
+	        if (strcmp(g_argv[1], "--version") == 0 || strcmp(g_argv[1], "-V") == 0)
+	        {
+		        fputs(PG_BACKEND_VERSIONSTR, stdout);
+		        exit(0);
+	        }
+
+        }
+
+        if (g_argc > 1 && strcmp(g_argv[1], "--check") == 0) {
+	        BootstrapModeMain(g_argc, g_argv, true);
+            exit_code = 0;
+            return;
+        }
+
+        if (g_argc > 1 && strcmp(g_argv[1], "--boot") == 0) {
+            PDEBUG("# 1410: boot: " __FILE__ );
+            BootstrapModeMain(g_argc, g_argv, false);
+            exit_code = 0;
+            return;
+        }
+
+        PDEBUG("# 1415: single: " __FILE__ );
+        if (async_restart)
+            puts("restart from initdb");
+        AsyncPostgresSingleUserMain(g_argc, g_argv, strdup(getenv("PGUSER")), async_restart);
+    }
+
+}
+
+extern void interactive_one(void);
+
+EMSCRIPTEN_KEEPALIVE void
+loop() {
+    PDEBUG("=loop=");
+    // so it is repl
+    if (!is_embed) {
+        PDEBUG("# 1344: node repl");
+        //pg_repl_raf();
+    }
+    //interactive_one();
+}
+
+
+EMSCRIPTEN_KEEPALIVE void
+set_repl(int value) {
+    if (value) {
+        setenv("REPL","Y",1);
+        is_repl = true;
+    } else {
+        setenv("REPL","N",1);
+        is_repl = false;
+    }
+}
+
+/*
+char **copy_argv(int argc, char *argv[]) {
+    // calculate the contiguous argv buffer size
+    int length=0;
+    size_t ptr_args = argc + 1;
+    for (int i = 0; i < argc; i++) {
+        length += (strlen(argv[i]) + 1);
+    }
+    char** new_argv = (char**)malloc((ptr_args) * sizeof(char*) + length);
+
+    // copy argv into the contiguous buffer
+    length = 0;
+    for (int i = 0; i < argc; i++) {
+        new_argv[i] = &(((char*)new_argv)[(ptr_args * sizeof(char*)) + length]);
+        strcpy(new_argv[i], argv[i]);
+        length += (strlen(argv[i]) + 1);
+    }
+
+    // insert NULL terminating ptr at the end of the ptr array
+    new_argv[ptr_args-1] = NULL;
+    return (new_argv);
+}
+*/
+
+extern int cma_rsize;
+
+#if defined(EMUL_CMA)
+#error "EMUL_CMA"
+char *cma_port;
+EMSCRIPTEN_KEEPALIVE int
+pg_getport() {
+    // when using low mem, memory addr of index 0 would not be accessible.
+    cma_port[1]=0;
+    return (int)(&cma_port[0]);
+}
+#else
+EMSCRIPTEN_KEEPALIVE int
+pg_getport() {
+    return 1;
+}
+#endif
+
+int
+main(int argc, char **argv) {
+    #if defined(EMUL_CMA)
+    cma_port = malloc(16384*1024);
+    #endif
+    g_argc =argc;
+    g_argv =argv;
+    setup();
+    if (is_embed) {
+        fprintf(stderr, "\n\n\n   @@@@@@@@@@@@@@@@@@@@@@@@@ EXITING with live runtime port %d @@@@@@@@@@@@@@@@\n\n\n", pg_getport());
+        whereToSendOutput = DestNone;
+        cma_rsize = 0;
+
+    } else {
+        loop();
+        emscripten_force_exit(exit_code);
+    }
+	return exit_code;
+}
+
+#endif // PG_MAIN
diff --git a/patches/postgresql-conflicts/src-bin-pgbench-exprscan.c.diff b/patches/postgresql-conflicts/src-bin-pgbench-exprscan.c.diff
new file mode 100644
index 000000000..12793f6b2
--- /dev/null
+++ b/patches/postgresql-conflicts/src-bin-pgbench-exprscan.c.diff
@@ -0,0 +1,196 @@
+--- postgresql/src/bin/pgbench/exprscan.c
++++ postgresql-wasm/src/bin/pgbench/exprscan.c
+@@ -289,7 +289,7 @@
+ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ 
+ /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+- * if you want the limit (max/min) macros for int types. 
++ * if you want the limit (max/min) macros for int types.
+  */
+ #ifndef __STDC_LIMIT_MACROS
+ #define __STDC_LIMIT_MACROS 1
+@@ -306,7 +306,7 @@
+ typedef signed char flex_int8_t;
+ typedef short int flex_int16_t;
+ typedef int flex_int32_t;
+-typedef unsigned char flex_uint8_t; 
++typedef unsigned char flex_uint8_t;
+ typedef unsigned short int flex_uint16_t;
+ typedef unsigned int flex_uint32_t;
+ 
+@@ -430,10 +430,10 @@
+ #define EOB_ACT_CONTINUE_SCAN 0
+ #define EOB_ACT_END_OF_FILE 1
+ #define EOB_ACT_LAST_MATCH 2
+-    
++
+     #define YY_LESS_LINENO(n)
+     #define YY_LINENO_REWIND_TO(ptr)
+-    
++
+ /* Return all but the first "n" matched characters back to the input stream. */
+ #define yyless(n) \
+ 	do \
+@@ -852,7 +852,7 @@
+     int yy_more_flag;
+     int yy_more_len;
+ 
+-    YYSTYPE * yylval_r;
++    union YYSTYPE * yylval_r;
+ 
+     }; /* end struct yyguts_t */
+ 
+@@ -861,7 +861,7 @@
+     /* This must go here because YYSTYPE and YYLTYPE are included
+      * from bison output in section 1.*/
+     #    define yylval yyg->yylval_r
+-    
++
+ int yylex_init (yyscan_t* scanner);
+ 
+ int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner);
+@@ -899,9 +899,9 @@
+ 
+ void yyset_column ( int _column_no , yyscan_t yyscanner );
+ 
+-YYSTYPE * yyget_lval ( yyscan_t yyscanner );
++union YYSTYPE * yyget_lval ( yyscan_t yyscanner );
+ 
+-void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner );
++void yyset_lval ( union YYSTYPE * yylval_param , yyscan_t yyscanner );
+ 
+ /* Macros after this point can all be overridden by user definitions in
+  * section 1.
+@@ -916,7 +916,7 @@
+ #endif
+ 
+ #ifndef YY_NO_UNPUT
+-    
++
+ #endif
+ 
+ #ifndef yytext_ptr
+@@ -1017,7 +1017,7 @@
+ #define YY_DECL_IS_OURS 1
+ 
+ extern int yylex \
+-               (YYSTYPE * yylval_param , yyscan_t yyscanner);
++               ( union YYSTYPE * yylval_param , yyscan_t yyscanner);
+ 
+ #define YY_DECL int yylex \
+                (YYSTYPE * yylval_param , yyscan_t yyscanner)
+@@ -1987,7 +1987,7 @@
+     YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
+ {
+ 	YY_BUFFER_STATE b;
+-    
++
+ 	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner );
+ 	if ( ! b )
+ 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+@@ -2053,7 +2053,7 @@
+     }
+ 
+         b->yy_is_interactive = 0;
+-    
++
+ 	errno = oerrno;
+ }
+ 
+@@ -2195,7 +2195,7 @@
+ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
+ {
+ 	YY_BUFFER_STATE b;
+-    
++
+ 	if ( size < 2 ||
+ 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+ 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+@@ -2231,7 +2231,7 @@
+  */
+ YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner)
+ {
+-    
++
+ 	return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner);
+ }
+ 
+@@ -2248,7 +2248,7 @@
+ 	char *buf;
+ 	yy_size_t n;
+ 	int i;
+-    
++
+ 	/* Get memory for full buffer, including space for trailing EOB's. */
+ 	n = (yy_size_t) (_yybytes_len + 2);
+ 	buf = (char *) yyalloc( n , yyscanner );
+@@ -2321,7 +2321,7 @@
+ 
+         if (! YY_CURRENT_BUFFER)
+             return 0;
+-    
++
+     return yylineno;
+ }
+ 
+@@ -2334,7 +2334,7 @@
+ 
+         if (! YY_CURRENT_BUFFER)
+             return 0;
+-    
++
+     return yycolumn;
+ }
+ 
+@@ -2396,7 +2396,7 @@
+         /* lineno is only valid if an input buffer exists. */
+         if (! YY_CURRENT_BUFFER )
+            YY_FATAL_ERROR( "yyset_lineno called with no buffer" );
+-    
++
+     yylineno = _line_number;
+ }
+ 
+@@ -2411,7 +2411,7 @@
+         /* column is only valid if an input buffer exists. */
+         if (! YY_CURRENT_BUFFER )
+            YY_FATAL_ERROR( "yyset_column called with no buffer" );
+-    
++
+     yycolumn = _column_no;
+ }
+ 
+@@ -2447,13 +2447,13 @@
+ 
+ /* Accessor methods for yylval and yylloc */
+ 
+-YYSTYPE * yyget_lval  (yyscan_t yyscanner)
++union YYSTYPE * yyget_lval  (yyscan_t yyscanner)
+ {
+     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+     return yylval;
+ }
+ 
+-void yyset_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner)
++void yyset_lval (union YYSTYPE *  yylval_param , yyscan_t yyscanner)
+ {
+     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+     yylval = yylval_param;
+@@ -2650,7 +2650,7 @@
+ {
+ 	PsqlScanState state = yyget_extra(yyscanner);
+ 	int			error_detection_offset = expr_scanner_offset(state) - 1;
+-	YYSTYPE		lval;
++	union YYSTYPE		lval;
+ 	char	   *full_line;
+ 
+ 	/*
+@@ -2689,7 +2689,7 @@
+ expr_lex_one_word(PsqlScanState state, PQExpBuffer word_buf, int *offset)
+ {
+ 	int			lexresult;
+-	YYSTYPE		lval;
++	union YYSTYPE		lval;
+ 
+ 	/* Must be scanning already */
+ 	Assert(state->scanbufhandle != NULL);
diff --git a/patches/postgresql-wasm-16.4/src-interfaces-libpq-fe-connect.c.diff b/patches/postgresql-conflicts/src-interfaces-libpq-fe-connect.c.diff
similarity index 100%
rename from patches/postgresql-wasm-16.4/src-interfaces-libpq-fe-connect.c.diff
rename to patches/postgresql-conflicts/src-interfaces-libpq-fe-connect.c.diff
diff --git a/patches/postgresql-wasm-16.4/src-backend-access-transam-xlogarchive.c.diff b/patches/postgresql-wasm-16.4/src-backend-access-transam-xlogarchive.c.diff
deleted file mode 100644
index 2ec41ed1b..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-access-transam-xlogarchive.c.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- postgresql/src/backend/access/transam/xlogarchive.c
-+++ postgresql-wasm/src/backend/access/transam/xlogarchive.c
-@@ -33,6 +33,10 @@
- #include "storage/ipc.h"
- #include "storage/lwlock.h"
- 
-+#if defined(__wasi__)
-+#define system(cmd) system_wasi(cmd)
-+#endif
-+
- /*
-  * Attempt to retrieve the specified file from off-line archival storage.
-  * If successful, fill "path" with its complete path (note that this will be
diff --git a/patches/postgresql-wasm-16.4/src-backend-bootstrap-bootstrap.c.diff b/patches/postgresql-wasm-16.4/src-backend-bootstrap-bootstrap.c.diff
deleted file mode 100644
index b849d5f40..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-bootstrap-bootstrap.c.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- postgresql/src/backend/bootstrap/bootstrap.c
-+++ postgresql-wasm/src/backend/bootstrap/bootstrap.c
-@@ -199,7 +199,11 @@
-  *	 to shared memory sizing, options work (or at least do not cause an error
-  *	 up to shared memory creation).
-  */
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- void
-+#else
-+int
-+#endif
- BootstrapModeMain(int argc, char *argv[], bool check_only)
- {
- 	int			i;
-@@ -353,7 +357,7 @@
- 	 */
- 	if (pg_link_canary_is_frontend())
- 		elog(ERROR, "backend is incorrectly linked to frontend functions");
--
-+puts("# 360: InitPostgres(boot): " __FILE__ );
- 	InitPostgres(NULL, InvalidOid, NULL, InvalidOid, false, false, NULL);
- 
- 	/* Initialize stuff for bootstrap-file processing */
-@@ -378,7 +382,12 @@
- 
- 	/* Clean up and exit */
- 	cleanup();
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 	proc_exit(0);
-+#else
-+	puts("# 338 cleanup(boot): " __FILE__);
-+	return 0;
-+#endif
- }
- 
- 
diff --git a/patches/postgresql-wasm-16.4/src-backend-commands-dbcommands.c.diff b/patches/postgresql-wasm-16.4/src-backend-commands-dbcommands.c.diff
deleted file mode 100644
index 2617ecd6a..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-commands-dbcommands.c.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- postgresql/src/backend/commands/dbcommands.c
-+++ postgresql-wasm/src/backend/commands/dbcommands.c
-@@ -1776,8 +1776,9 @@
- 	RequestCheckpoint(CHECKPOINT_IMMEDIATE | CHECKPOINT_FORCE | CHECKPOINT_WAIT);
- 
- 	/* Close all smgr fds in all backends. */
-+#if !defined(__wasi__) && !defined(__EMSCRIPTEN__)
- 	WaitForProcSignalBarrier(EmitProcSignalBarrier(PROCSIGNAL_BARRIER_SMGRRELEASE));
--
-+#endif
- 	/*
- 	 * Remove all tablespace subdirs belonging to the database.
- 	 */
diff --git a/patches/postgresql-wasm-16.4/src-backend-libpq-auth.c.diff b/patches/postgresql-wasm-16.4/src-backend-libpq-auth.c.diff
deleted file mode 100644
index 779709813..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-libpq-auth.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- postgresql/src/backend/libpq/auth.c
-+++ postgresql-wasm/src/backend/libpq/auth.c
-@@ -1866,7 +1866,7 @@
- 		return STATUS_ERROR;
- 	}
- 
--#ifndef WIN32
-+#if !defined(WIN32) && !defined(__wasi__)
- 	errno = 0;					/* clear errno before call */
- 	pw = getpwuid(uid);
- 	if (!pw)
diff --git a/patches/postgresql-wasm-16.4/src-backend-libpq-pqcomm.c.diff b/patches/postgresql-wasm-16.4/src-backend-libpq-pqcomm.c.diff
deleted file mode 100644
index ddc7a0e3a..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-libpq-pqcomm.c.diff
+++ /dev/null
@@ -1,204 +0,0 @@
---- postgresql/src/backend/libpq/pqcomm.c
-+++ postgresql-wasm/src/backend/libpq/pqcomm.c
-@@ -123,8 +123,12 @@
- static int	PqSendBufferSize;	/* Size send buffer */
- static int	PqSendPointer;		/* Next index to store a byte in PqSendBuffer */
- static int	PqSendStart;		/* Next index to send a byte in PqSendBuffer */
--
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+static char PqRecvBuffer_static[PQ_RECV_BUFFER_SIZE];
-+static char *PqRecvBuffer;
-+#else
- static char PqRecvBuffer[PQ_RECV_BUFFER_SIZE];
-+#endif
- static int	PqRecvPointer;		/* Next index to read a byte from PqRecvBuffer */
- static int	PqRecvLength;		/* End of data available in PqRecvBuffer */
- 
-@@ -136,6 +140,7 @@
- 
- 
- /* Internal functions */
-+
- static void socket_comm_reset(void);
- static void socket_close(int code, Datum arg);
- static void socket_set_nonblocking(bool nonblocking);
-@@ -147,9 +152,6 @@
- static int	internal_putbytes(const char *s, size_t len);
- static int	internal_flush(void);
- 
--static int	Lock_AF_UNIX(const char *unixSocketDir, const char *unixSocketPath);
--static int	Setup_AF_UNIX(const char *sock_path);
--
- static const PQcommMethods PqCommSocketMethods = {
- 	socket_comm_reset,
- 	socket_flush,
-@@ -159,6 +161,10 @@
- 	socket_putmessage_noblock
- };
- 
-+static int	Lock_AF_UNIX(const char *unixSocketDir, const char *unixSocketPath);
-+static int	Setup_AF_UNIX(const char *sock_path);
-+
-+
- const PQcommMethods *PqCommMethods = &PqCommSocketMethods;
- 
- WaitEventSet *FeBeWaitSet;
-@@ -180,7 +186,7 @@
- 	PqSendPointer = PqSendStart = PqRecvPointer = PqRecvLength = 0;
- 	PqCommBusy = false;
- 	PqCommReadingMsg = false;
--
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 	/* set up process-exit hook to close the socket */
- 	on_proc_exit(socket_close, 0);
- 
-@@ -210,7 +216,12 @@
- 								  MyLatch, NULL);
- 	AddWaitEventToSet(FeBeWaitSet, WL_POSTMASTER_DEATH, PGINVALID_SOCKET,
- 					  NULL, NULL);
--
-+#else
-+    PDEBUG("# 220: FIXME: socketfile");
-+    #pragma message "FIXME: socketfile"
-+    /* because we fill before starting reading message */
-+    PqRecvBuffer = &PqRecvBuffer_static[0];
-+#endif
- 	/*
- 	 * The event positions match the order we added them, but let's sanity
- 	 * check them to be sure.
-@@ -632,7 +643,7 @@
- 	Assert(Unix_socket_group);
- 	if (Unix_socket_group[0] != '\0')
- 	{
--#ifdef WIN32
-+#if defined(WIN32) || defined(__wasi__)
- 		elog(WARNING, "configuration item unix_socket_group is not supported on this platform");
- #else
- 		char	   *endptr;
-@@ -1148,6 +1159,20 @@
-  *		This must be called before any of the pq_get* functions.
-  * --------------------------------
-  */
-+#if defined(I_EMSCRIPTEN) || defined(I_WASI)
-+EMSCRIPTEN_KEEPALIVE void
-+pq_recvbuf_fill(FILE* fp, int packetlen) {
-+    fread( PqRecvBuffer, packetlen, 1, fp);
-+    PqRecvPointer = 0;
-+    PqRecvLength = packetlen;
-+#if PDEBUG
-+        printf("# 1199: pq_recvbuf_fill cma_rsize=%d PqRecvLength=%d buf=%p reply=%p\n", cma_rsize, PqRecvLength, &PqRecvBuffer[0], &PqSendBuffer[0]);
-+#endif
-+
-+}
-+#endif
-+extern int cma_rsize;
-+static char * PqSendBuffer_save;
- void
- pq_startmsgread(void)
- {
-@@ -1159,7 +1184,29 @@
- 		ereport(FATAL,
- 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
- 				 errmsg("terminating connection because protocol synchronization was lost")));
-+#if defined(I_EMSCRIPTEN) || defined(I_WASI)
-+    if (!pq_buffer_has_data()) {
-+        if (cma_rsize) {
-+            PqRecvPointer = 0;
-+            PqRecvLength = cma_rsize;
-+            PqRecvBuffer = (char*)0x1;
-+
-+            PqSendPointer = 0;
-+            PqSendBuffer_save = PqSendBuffer;
-+            PqSendBuffer = 2 + (char*)(cma_rsize);
-+            PqSendBufferSize = (64*1024*1024) - (int)(&PqSendBuffer[0]);
-+        } else {
-+            PqRecvBuffer = &PqRecvBuffer_static[0];
-+            if (PqSendBuffer_save)
-+                PqSendBuffer=PqSendBuffer_save;
-+            PqSendBufferSize = PQ_SEND_BUFFER_SIZE;
-+        }
-+    }
-+#if PDEBUG
-+        printf("# 1199: pq_startmsgread cma_rsize=%d PqRecvLength=%d buf=%p reply=%p\n", cma_rsize, PqRecvLength, &PqRecvBuffer[0], &PqSendBuffer[0]);
-+#endif
- 
-+#endif
- 	PqCommReadingMsg = true;
- }
- 
-@@ -1282,9 +1329,66 @@
- 
- 	return 0;
- }
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+
-+extern FILE* SOCKET_FILE;
-+extern int SOCKET_DATA;
-+
-+static int
-+internal_putbytes(const char *s, size_t len) {
-+	if (PqSendPointer >= PqSendBufferSize)
-+	{
-+        puts("# 1329: overflow");
-+    }
-+
-+    if (!cma_rsize) {
-+        int wc=      fwrite(s, 1, len, SOCKET_FILE);
-+#if 0
-+        fprintf(stderr,"# 1334: sockfile %d +%d top=%p %d/%d\n", SOCKET_DATA, wc, PqSendBuffer, PqSendPointer,PqSendBufferSize);
-+#endif
-+        SOCKET_DATA+=wc;
-+    } else {
-+	    size_t		amount;
-+	    while (len > 0)
-+	    {
-+		    /* If buffer is full, then flush it out */
-+		    if (PqSendPointer >= PqSendBufferSize)
-+		    {
-+			    socket_set_nonblocking(false);
-+			    if (internal_flush())
-+				    return EOF;
-+		    }
-+		    amount = PqSendBufferSize - PqSendPointer;
-+		    if (amount > len)
-+			    amount = len;
-+		    memcpy(PqSendBuffer + PqSendPointer, s, amount);
-+		    PqSendPointer += amount;
-+		    s += amount;
-+		    len -= amount;
-+            SOCKET_DATA+=amount;
-+	    }
-+#if 0
-+        fprintf(stderr,"# 1359: cma buffer wire: %d +%zu top=%p %d/%d\n", SOCKET_DATA, amount, PqSendBuffer, PqSendPointer,PqSendBufferSize);
-+#endif
-+    }
-+    return 0;
-+}
- 
-+static int
-+socket_flush(void) {
-+    return internal_flush();
-+}
- 
- static int
-+internal_flush(void) {
-+    /*  no flush for raw wire */
-+    if (!cma_rsize) {
-+    	PqSendStart = PqSendPointer = 0;
-+    }
-+	return 0;
-+}
-+#else
-+static int
- internal_putbytes(const char *s, size_t len)
- {
- 	size_t		amount;
-@@ -1403,7 +1507,7 @@
- 	PqSendStart = PqSendPointer = 0;
- 	return 0;
- }
--
-+#endif /* wasm */
- /* --------------------------------
-  *		pq_flush_if_writable - flush pending output if writable without blocking
-  *
diff --git a/patches/postgresql-wasm-16.4/src-backend-postmaster-checkpointer.c.diff b/patches/postgresql-wasm-16.4/src-backend-postmaster-checkpointer.c.diff
deleted file mode 100644
index c271c55ae..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-postmaster-checkpointer.c.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- postgresql/src/backend/postmaster/checkpointer.c
-+++ postgresql-wasm/src/backend/postmaster/checkpointer.c
-@@ -936,7 +936,9 @@
- 	/*
- 	 * If in a standalone backend, just do it ourselves.
- 	 */
-+#if !defined(__wasi__) && !defined(__EMSCRIPTEN__)
- 	if (!IsPostmasterEnvironment)
-+#endif
- 	{
- 		/*
- 		 * There's no point in doing slow checkpoints in a standalone backend,
diff --git a/patches/postgresql-wasm-16.4/src-backend-postmaster-postmaster.c.diff b/patches/postgresql-wasm-16.4/src-backend-postmaster-postmaster.c.diff
deleted file mode 100644
index aced05e0e..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-postmaster-postmaster.c.diff
+++ /dev/null
@@ -1,75 +0,0 @@
---- postgresql/src/backend/postmaster/postmaster.c
-+++ postgresql-wasm/src/backend/postmaster/postmaster.c
-@@ -422,7 +422,8 @@
- static void ExitPostmaster(int status) pg_attribute_noreturn();
- static int	ServerLoop(void);
- static int	BackendStartup(Port *port);
--static int	ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done);
-+//static
-+int	ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done);
- static void SendNegotiateProtocolVersion(List *unrecognized_protocol_options);
- static void processCancelRequest(Port *port, void *pkt);
- static void report_fork_failure_to_client(Port *port, int errnum);
-@@ -1533,7 +1534,7 @@
- 	/* Locate the postgres executable itself */
- 	if (find_my_exec(argv0, my_exec_path) < 0)
- 		ereport(FATAL,
--				(errmsg("%s: could not locate my own executable path", argv0)));
-+				(errmsg("%s:1536: could not locate my own executable path", argv0)));
- 
- #ifdef EXEC_BACKEND
- 	/* Locate executable backend before we change working directory */
-@@ -1947,10 +1948,21 @@
-  * should make no assumption here about the order in which the client may make
-  * requests.
-  */
--static int
--ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done)
-+
-+static inline uint32
-+em_bswap32(uint32 x)
-+{
-+	return
-+		((x << 24) & 0xff000000) |
-+		((x << 8) & 0x00ff0000) |
-+		((x >> 8) & 0x0000ff00) |
-+		((x >> 24) & 0x000000ff);
-+}
-+
-+// static int
-+int ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done)
- {
--	int32		len;
-+	uint32		len;
- 	char	   *buf;
- 	ProtocolVersion proto;
- 	MemoryContext oldcontext;
-@@ -1988,15 +2000,15 @@
- 		return STATUS_ERROR;
- 	}
- 
--	len = pg_ntoh32(len);
-+	//len = pg_ntoh32(len);
-+    len = em_bswap32(len);
- 	len -= 4;
--
--	if (len < (int32) sizeof(ProtocolVersion) ||
-+	if (len < (uint32) sizeof(ProtocolVersion) ||
- 		len > MAX_STARTUP_PACKET_LENGTH)
- 	{
- 		ereport(COMMERROR,
- 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
--				 errmsg("invalid length of startup packet")));
-+				 errmsg("# 2000 invalid length of startup packet")));
- 		return STATUS_ERROR;
- 	}
- 
-@@ -2029,7 +2041,7 @@
- 		{
- 			ereport(COMMERROR,
- 					(errcode(ERRCODE_PROTOCOL_VIOLATION),
--					 errmsg("invalid length of startup packet")));
-+					 errmsg("# 2033 invalid length of startup packet")));
- 			return STATUS_ERROR;
- 		}
- 		processCancelRequest(port, buf);
diff --git a/patches/postgresql-wasm-16.4/src-backend-storage-ipc-latch.c.diff b/patches/postgresql-wasm-16.4/src-backend-storage-ipc-latch.c.diff
deleted file mode 100644
index 2318a9d77..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-storage-ipc-latch.c.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- postgresql/src/backend/storage/ipc/latch.c
-+++ postgresql-wasm/src/backend/storage/ipc/latch.c
-@@ -206,6 +206,7 @@
- void
- InitializeLatchSupport(void)
- {
-+#if !defined(__wasi__)
- #if defined(WAIT_USE_SELF_PIPE)
- 	int			pipefd[2];
- 
-@@ -315,6 +316,7 @@
- 	/* Ignore SIGURG, because we'll receive it via kqueue. */
- 	pqsignal(SIGURG, SIG_IGN);
- #endif
-+#endif /* __wasi__ */
- }
- 
- void
diff --git a/patches/postgresql-wasm-16.4/src-backend-storage-ipc-procsignal.c.diff b/patches/postgresql-wasm-16.4/src-backend-storage-ipc-procsignal.c.diff
deleted file mode 100644
index b7c945b63..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-storage-ipc-procsignal.c.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- postgresql/src/backend/storage/ipc/procsignal.c
-+++ postgresql-wasm/src/backend/storage/ipc/procsignal.c
-@@ -420,6 +420,9 @@
- 						(errmsg("still waiting for backend with PID %d to accept ProcSignalBarrier",
- 								(int) slot->pss_pid)));
- 			oldval = pg_atomic_read_u64(&slot->pss_barrierGeneration);
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+            break;
-+#endif
- 		}
- 		ConditionVariableCancelSleep();
- 	}
diff --git a/patches/postgresql-wasm-16.4/src-backend-storage-ipc-signalfuncs.c.diff b/patches/postgresql-wasm-16.4/src-backend-storage-ipc-signalfuncs.c.diff
deleted file mode 100644
index 2975a6221..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-storage-ipc-signalfuncs.c.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- postgresql/src/backend/storage/ipc/signalfuncs.c
-+++ postgresql-wasm/src/backend/storage/ipc/signalfuncs.c
-@@ -98,7 +98,12 @@
- 	 */
- 
- 	/* If we have setsid(), signal the backend's whole process group */
--#ifdef HAVE_SETSID
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+#   if PGDEBUG
-+    printf("# 103: FIXME: kill(pid=%d, sig=%d) ", pid, sig);
-+#   endif
-+    if (0)
-+#elif defined(HAVE_SETSID)
- 	if (kill(-pid, sig))
- #else
- 	if (kill(pid, sig))
-@@ -106,7 +111,7 @@
- 	{
- 		/* Again, just a warning to allow loops */
- 		ereport(WARNING,
--				(errmsg("could not send signal to process %d: %m", pid)));
-+				(errmsg("# 109: could not send signal to process %d: %m", pid)));
- 		return SIGNAL_BACKEND_ERROR;
- 	}
- 	return SIGNAL_BACKEND_SUCCESS;
diff --git a/patches/postgresql-wasm-16.4/src-backend-storage-lmgr-proc.c.diff b/patches/postgresql-wasm-16.4/src-backend-storage-lmgr-proc.c.diff
deleted file mode 100644
index e5b2b7c2d..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-storage-lmgr-proc.c.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- postgresql/src/backend/storage/lmgr/proc.c
-+++ postgresql-wasm/src/backend/storage/lmgr/proc.c
-@@ -306,7 +306,11 @@
- 		elog(PANIC, "proc header uninitialized");
- 
- 	if (MyProc != NULL)
--		elog(ERROR, "you already exist");
-+#if defined(__wasi__) || defined(__EMSCRIPTEN__)
-+		elog(WARNING, "# 309: you already exist");
-+#else
-+		elog(ERROR, "# 309: you already exist");
-+#endif
- 
- 	/* Decide which list should supply our PGPROC. */
- 	if (IsAnyAutoVacuumProcess())
-@@ -519,7 +523,7 @@
- 		elog(PANIC, "proc header uninitialized");
- 
- 	if (MyProc != NULL)
--		elog(ERROR, "you already exist");
-+		elog(ERROR, "# 522: you already exist");
- 
- 	/*
- 	 * We use the ProcStructLock to protect assignment and releasing of
diff --git a/patches/postgresql-wasm-16.4/src-backend-utils-fmgr-dfmgr.c.diff b/patches/postgresql-wasm-16.4/src-backend-utils-fmgr-dfmgr.c.diff
deleted file mode 100644
index 33611068c..000000000
--- a/patches/postgresql-wasm-16.4/src-backend-utils-fmgr-dfmgr.c.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- postgresql/src/backend/utils/fmgr/dfmgr.c
-+++ postgresql-wasm/src/backend/utils/fmgr/dfmgr.c
-@@ -121,12 +121,15 @@
- 
- 	/* Look up the function within the library. */
- 	retval = dlsym(lib_handle, funcname);
--
-+#if !defined(__wasi__)
- 	if (retval == NULL && signalNotFound)
- 		ereport(ERROR,
- 				(errcode(ERRCODE_UNDEFINED_FUNCTION),
- 				 errmsg("could not find function \"%s\" in file \"%s\"",
- 						funcname, fullname)));
-+#else
-+    fprintf(stderr, "could not find function \"%s\" in file \"%s\" rv=%p snf=%b\n", funcname, fullname, retval, signalNotFound);
-+#endif
- 
- 	pfree(fullname);
- 	return retval;
diff --git a/patches/postgresql-wasm-16.4/src-bin-pg_ctl-pg_ctl.c.diff b/patches/postgresql-wasm-16.4/src-bin-pg_ctl-pg_ctl.c.diff
deleted file mode 100644
index 4d88e3c4d..000000000
--- a/patches/postgresql-wasm-16.4/src-bin-pg_ctl-pg_ctl.c.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- postgresql/src/bin/pg_ctl/pg_ctl.c
-+++ postgresql-wasm/src/bin/pg_ctl/pg_ctl.c
-@@ -155,6 +155,16 @@
- static bool wait_for_postmaster_promote(void);
- static bool postmaster_is_alive(pid_t pid);
- 
-+#if defined(__wasi__)
-+#if defined(HAVE_SETSID)
-+#undef HAVE_SETSID
-+#endif
-+
-+#if defined(HAVE_GETRLIMIT)
-+#undef HAVE_GETRLIMIT
-+#endif
-+#endif /* __wasi__ */
-+
- #if defined(HAVE_GETRLIMIT)
- static void unlimit_core_size(void);
- #endif
-@@ -493,9 +503,9 @@
- 	else
- 		cmd = psprintf("exec \"%s\" %s%s < \"%s\" 2>&1",
- 					   exec_path, pgdata_opt, post_opts, DEVNULL);
--
-+#if !defined(__wasi__)
- 	(void) execl("/bin/sh", "/bin/sh", "-c", cmd, (char *) NULL);
--
-+#endif
- 	/* exec failed */
- 	write_stderr(_("%s: could not start server: %s\n"),
- 				 progname, strerror(errno));
diff --git a/patches/postgresql-wasm-16.4/src-bin-pg_dump-parallel.c.diff b/patches/postgresql-wasm-16.4/src-bin-pg_dump-parallel.c.diff
deleted file mode 100644
index 6b9c21432..000000000
--- a/patches/postgresql-wasm-16.4/src-bin-pg_dump-parallel.c.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- postgresql/src/bin/pg_dump/parallel.c
-+++ postgresql-wasm/src/bin/pg_dump/parallel.c
-@@ -49,7 +49,7 @@
-  * The pstate->te[] entry for each worker is valid when it's in WRKR_WORKING
-  * state, and must be NULL in other states.
-  */
--
-+#define PG_DUMP_PARALLEL
- #include "postgres_fe.h"
- 
- #ifndef WIN32
-@@ -445,6 +445,7 @@
- static void
- WaitForTerminatingWorkers(ParallelState *pstate)
- {
-+#if !defined(__wasi__)
- 	while (!HasEveryWorkerTerminated(pstate))
- 	{
- 		ParallelSlot *slot = NULL;
-@@ -504,6 +505,7 @@
- 		slot->workerStatus = WRKR_TERMINATED;
- 		pstate->te[j] = NULL;
- 	}
-+#endif /* __wasi__ */
- }
- 
- 
diff --git a/patches/postgresql-wasm-16.4/src-bin-pg_upgrade-parallel.c.diff b/patches/postgresql-wasm-16.4/src-bin-pg_upgrade-parallel.c.diff
deleted file mode 100644
index cdcc17e6a..000000000
--- a/patches/postgresql-wasm-16.4/src-bin-pg_upgrade-parallel.c.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- postgresql/src/bin/pg_upgrade/parallel.c
-+++ postgresql-wasm/src/bin/pg_upgrade/parallel.c
-@@ -277,6 +277,7 @@
- bool
- reap_child(bool wait_for_child)
- {
-+#if !defined(__wasi__)
- #ifndef WIN32
- 	int			work_status;
- 	pid_t		child;
-@@ -336,6 +337,6 @@
- 
- 	/* do this after job has been removed */
- 	parallel_jobs--;
--
-+#endif /* __wasi__ */
- 	return true;
- }
diff --git a/patches/postgresql-wasm-16.4/src-bin-psql-command.c.diff b/patches/postgresql-wasm-16.4/src-bin-psql-command.c.diff
deleted file mode 100644
index 8c87bb4c5..000000000
--- a/patches/postgresql-wasm-16.4/src-bin-psql-command.c.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- postgresql/src/bin/psql/command.c
-+++ postgresql-wasm/src/bin/psql/command.c
-@@ -5146,6 +5146,10 @@
- static bool
- do_watch(PQExpBuffer query_buf, double sleep, int iter)
- {
-+#if defined(__wasi__)
-+    pg_log_error("#5150 wasi: could not set timer");
-+    return false;
-+#else
- 	long		sleep_ms = (long) (sleep * 1000);
- 	printQueryOpt myopt = pset.popt;
- 	const char *strftime_fmt;
-@@ -5384,6 +5388,7 @@
- 
- 	pg_free(title);
- 	return (res >= 0);
-+#endif /* __wasi__ */
- }
- 
- /*
diff --git a/patches/postgresql-wasm-16.4/src-common-logging.c.diff b/patches/postgresql-wasm-16.4/src-common-logging.c.diff
deleted file mode 100644
index 5d144d415..000000000
--- a/patches/postgresql-wasm-16.4/src-common-logging.c.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- postgresql/src/common/logging.c
-+++ postgresql-wasm/src/common/logging.c
-@@ -19,8 +19,9 @@
- #include "common/logging.h"
- 
- enum pg_log_level __pg_log_level;
--
-+#if !defined(PG_MAIN)
- static const char *progname;
-+#endif
- static int	log_flags;
- 
- static void (*log_pre_callback) (void);
diff --git a/patches/postgresql-wasm-16.4/src-fe_utils-print.c.diff b/patches/postgresql-wasm-16.4/src-fe_utils-print.c.diff
deleted file mode 100644
index bb69de115..000000000
--- a/patches/postgresql-wasm-16.4/src-fe_utils-print.c.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- postgresql/src/fe_utils/print.c
-+++ postgresql-wasm/src/fe_utils/print.c
-@@ -15,6 +15,7 @@
-  *
-  *-------------------------------------------------------------------------
-  */
-+#define FE_UTILS_PRINT
- #include "postgres_fe.h"
- 
- #include <limits.h>
diff --git a/patches/postgresql-wasm-16.4/src-include-common-file_utils.h.diff b/patches/postgresql-wasm-16.4/src-include-common-file_utils.h.diff
deleted file mode 100644
index 78a7c3d5b..000000000
--- a/patches/postgresql-wasm-16.4/src-include-common-file_utils.h.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- postgresql/src/include/common/file_utils.h
-+++ postgresql-wasm/src/include/common/file_utils.h
-@@ -27,10 +27,14 @@
- struct iovec;					/* avoid including port/pg_iovec.h here */
- 
- #ifdef FRONTEND
-+#if !defined(fsync_fname)
- extern int	fsync_fname(const char *fname, bool isdir);
-+#endif
- extern void fsync_pgdata(const char *pg_data, int serverVersion);
- extern void fsync_dir_recurse(const char *dir);
-+#if !defined(durable_rename)
- extern int	durable_rename(const char *oldfile, const char *newfile);
-+#endif
- extern int	fsync_parent_path(const char *fname);
- #endif
- 
diff --git a/patches/postgresql-wasm-16.4/src-include-fmgr.h.diff b/patches/postgresql-wasm-16.4/src-include-fmgr.h.diff
deleted file mode 100644
index 9cc7c86ff..000000000
--- a/patches/postgresql-wasm-16.4/src-include-fmgr.h.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- postgresql/src/include/fmgr.h
-+++ postgresql-wasm/src/include/fmgr.h
-@@ -505,7 +505,10 @@
- 	return &Pg_magic_data; \
- } \
- extern int no_such_variable
--
-+#if defined(__wasi__) && !defined(__EMSCRIPTEN__)
-+#undef PG_MODULE_MAGIC
-+#define PG_MODULE_MAGIC
-+#endif
- 
- /*-------------------------------------------------------------------------
-  *		Support routines and macros for callers of fmgr-compatible functions
diff --git a/patches/postgresql-wasm-16.4/src-include-port-pg_pthread.h.diff b/patches/postgresql-wasm-16.4/src-include-port-pg_pthread.h.diff
deleted file mode 100644
index ca6fab0a5..000000000
--- a/patches/postgresql-wasm-16.4/src-include-port-pg_pthread.h.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- postgresql/src/include/port/pg_pthread.h
-+++ postgresql-wasm/src/include/port/pg_pthread.h
-@@ -12,7 +12,9 @@
- 
- #ifndef PG_PTHREAD_H
- #define PG_PTHREAD_H
--
-+#if defined(__wasi__)
-+#define PYDK
-+#endif /* __wasi__ */
- #include <pthread.h>
- 
- #ifndef HAVE_PTHREAD_BARRIER_WAIT
-@@ -20,7 +22,7 @@
- #ifndef PTHREAD_BARRIER_SERIAL_THREAD
- #define PTHREAD_BARRIER_SERIAL_THREAD (-1)
- #endif
--
-+#if !defined(__wasi__)
- typedef struct pg_pthread_barrier
- {
- 	bool		sense;			/* we only need a one bit phase */
-@@ -29,10 +31,12 @@
- 	pthread_mutex_t mutex;
- 	pthread_cond_t cond;
- } pthread_barrier_t;
--
- extern int	pthread_barrier_init(pthread_barrier_t *barrier,
- 								 const void *attr,
- 								 int count);
-+#else
-+    extern int pthread_barrier_init(pthread_barrier_t *__restrict, const pthread_barrierattr_t *__restrict, unsigned);
-+#endif
- extern int	pthread_barrier_wait(pthread_barrier_t *barrier);
- extern int	pthread_barrier_destroy(pthread_barrier_t *barrier);
- 
diff --git a/patches/postgresql-wasm-16.4/src-include-storage-dsm_impl.h.diff b/patches/postgresql-wasm-16.4/src-include-storage-dsm_impl.h.diff
deleted file mode 100644
index f805bac4d..000000000
--- a/patches/postgresql-wasm-16.4/src-include-storage-dsm_impl.h.diff
+++ /dev/null
@@ -1,72 +0,0 @@
---- postgresql/src/include/storage/dsm_impl.h
-+++ postgresql-wasm/src/include/storage/dsm_impl.h
-@@ -23,20 +23,49 @@
-  * Determine which dynamic shared memory implementations will be supported
-  * on this platform, and which one will be the default.
-  */
-+#if 0 // defined(__wasi__) || defined(__EMSCRIPTEN__)
-+    #define DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE		DSM_IMPL_SYSV
-+    #define USE_DSM_SYSV
-+    extern PGDLLIMPORT int dynamic_shared_memory_type;
-+    extern PGDLLIMPORT int min_dynamic_shared_memory;
-+    #define PG_DYNSHMEM_DIR					"/tmp/pglite"
-+    #define PG_DYNSHMEM_MMAP_FILE_PREFIX	"mmap."
-+
-+#elif 0 // defined(__wasi__) || defined(__EMSCRIPTEN__)
-+    #define DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE		DSM_IMPL_MMAP
-+    #define USE_DSM_MMAP
-+    extern PGDLLIMPORT int dynamic_shared_memory_type;
-+    extern PGDLLIMPORT int min_dynamic_shared_memory;
-+    #define PG_DYNSHMEM_DIR					"/tmp/pglite"
-+    #define PG_DYNSHMEM_MMAP_FILE_PREFIX	"mmap."
-+
-+#elif defined(__wasi__) || defined(__EMSCRIPTEN__)
-+    #define DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE		DSM_IMPL_POSIX
-+    #define USE_DSM_POSIX
-+    extern PGDLLIMPORT int dynamic_shared_memory_type;
-+    extern PGDLLIMPORT int min_dynamic_shared_memory;
-+    #define PG_DYNSHMEM_DIR					"/tmp/pglite"
-+    #define PG_DYNSHMEM_MMAP_FILE_PREFIX	"mmap."
-+
-+#else
-+
- #ifdef WIN32
--#define USE_DSM_WINDOWS
--#define DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE		DSM_IMPL_WINDOWS
-+#   define USE_DSM_WINDOWS
-+#   define DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE		DSM_IMPL_WINDOWS
- #else
--#ifdef HAVE_SHM_OPEN
--#define USE_DSM_POSIX
--#define DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE		DSM_IMPL_POSIX
--#endif
--#define USE_DSM_SYSV
--#ifndef DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE
--#define DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE		DSM_IMPL_SYSV
--#endif
-+#   ifdef HAVE_SHM_OPEN
-+#       define USE_DSM_POSIX
-+#       define DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE		DSM_IMPL_POSIX
-+#   endif
-+#   define USE_DSM_SYSV
-+#   ifndef DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE
-+#       define DEFAULT_DYNAMIC_SHARED_MEMORY_TYPE		DSM_IMPL_SYSV
-+#   endif
- #define USE_DSM_MMAP
--#endif
-+
-+#endif /* defined(__wasi__) || defined(__EMSCRIPTEN__) */
-+
-+
- 
- /* GUC. */
- extern PGDLLIMPORT int dynamic_shared_memory_type;
-@@ -50,7 +79,7 @@
-  */
- #define PG_DYNSHMEM_DIR					"pg_dynshmem"
- #define PG_DYNSHMEM_MMAP_FILE_PREFIX	"mmap."
--
-+#endif
- /* A "name" for a dynamic shared memory segment. */
- typedef uint32 dsm_handle;
- 
diff --git a/patches/postgresql-wasm-16.4/src-include-storage-fd.h.diff b/patches/postgresql-wasm-16.4/src-include-storage-fd.h.diff
deleted file mode 100644
index b8f0f5200..000000000
--- a/patches/postgresql-wasm-16.4/src-include-storage-fd.h.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- postgresql/src/include/storage/fd.h
-+++ postgresql-wasm/src/include/storage/fd.h
-@@ -188,13 +188,17 @@
- extern int	pg_fdatasync(int fd);
- extern void pg_flush_data(int fd, off_t offset, off_t nbytes);
- extern int	pg_truncate(const char *path, off_t length);
--extern void fsync_fname(const char *fname, bool isdir);
-+extern void fd_fsync_fname(const char *fname, bool isdir);
- extern int	fsync_fname_ext(const char *fname, bool isdir, bool ignore_perm, int elevel);
--extern int	durable_rename(const char *oldfile, const char *newfile, int elevel);
-+extern int	fd_durable_rename(const char *oldfile, const char *newfile, int elevel);
- extern int	durable_unlink(const char *fname, int elevel);
- extern void SyncDataDirectory(void);
- extern int	data_sync_elevel(int elevel);
- 
-+#define durable_rename(oldfile, newfile, elevel) fd_durable_rename(oldfile, newfile, elevel)
-+#define fsync_fname(fname, isdir) fd_fsync_fname(fname, isdir)
-+
-+
- /* Filename components */
- #define PG_TEMP_FILES_DIR "pgsql_tmp"
- #define PG_TEMP_FILE_PREFIX "pgsql_tmp"
diff --git a/patches/postgresql-wasm-16.4/src-port-pqsignal.c.diff b/patches/postgresql-wasm-16.4/src-port-pqsignal.c.diff
deleted file mode 100644
index f3c7b8f6f..000000000
--- a/patches/postgresql-wasm-16.4/src-port-pqsignal.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- postgresql/src/port/pqsignal.c
-+++ postgresql-wasm/src/port/pqsignal.c
-@@ -60,3 +60,8 @@
- 	return signal(signo, func);
- #endif
- }
-+
-+/* sneak stubs into libpgport */
-+#if defined(__wasi__)
-+#   include "../../../patches/wasi_port.c"
-+#endif
diff --git a/patches/postgresql-wasm-16.4/src-port-pthread_barrier_wait.c.diff b/patches/postgresql-wasm-16.4/src-port-pthread_barrier_wait.c.diff
deleted file mode 100644
index f4ad3ede1..000000000
--- a/patches/postgresql-wasm-16.4/src-port-pthread_barrier_wait.c.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- postgresql/src/port/pthread_barrier_wait.c
-+++ postgresql-wasm/src/port/pthread_barrier_wait.c
-@@ -14,7 +14,7 @@
- #include "c.h"
- 
- #include "port/pg_pthread.h"
--
-+#if !defined(__wasi__)
- int
- pthread_barrier_init(pthread_barrier_t *barrier, const void *attr, int count)
- {
-@@ -75,3 +75,20 @@
- 	pthread_mutex_destroy(&barrier->mutex);
- 	return 0;
- }
-+#else
-+int
-+pthread_barrier_init(pthread_barrier_t *__restrict barrier, const pthread_barrierattr_t *__restrict attr, unsigned count) {
-+    return 0;
-+}
-+
-+int
-+pthread_barrier_wait(pthread_barrier_t *barrier) {
-+    return 0;
-+}
-+
-+int
-+pthread_barrier_destroy(pthread_barrier_t *barrier) {
-+    return 0;
-+}
-+#endif
-+
diff --git a/patches/postgresql-wasm-16.4/src-test-regress-pg_regress.c.diff b/patches/postgresql-wasm-16.4/src-test-regress-pg_regress.c.diff
deleted file mode 100644
index 8edd1e8ca..000000000
--- a/patches/postgresql-wasm-16.4/src-test-regress-pg_regress.c.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- postgresql/src/test/regress/pg_regress.c
-+++ postgresql-wasm/src/test/regress/pg_regress.c
-@@ -37,6 +37,15 @@
- #include "pg_regress.h"
- #include "portability/instr_time.h"
- 
-+#if defined(__wasi__)
-+#if defined(HAVE_GETRLIMIT)
-+#undef HAVE_GETRLIMIT
-+#endif
-+#define execl(...) (-1)
-+#define wait(...) (INVALID_PID)
-+#define raise(...)
-+#endif /* __wasi__ */
-+
- /* for resultmap we need a list of pairs of strings */
- typedef struct _resultmap
- {
diff --git a/patches/postgresql-wasm/contrib-pgstattuple-pgstatindex.c.diff b/patches/postgresql-wasm/contrib-pgstattuple-pgstatindex.c.diff
deleted file mode 100644
index c552bd28b..000000000
--- a/patches/postgresql-wasm/contrib-pgstattuple-pgstatindex.c.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- postgresql/contrib/pgstattuple/pgstatindex.c
-+++ postgresql-wasm/contrib/pgstattuple/pgstatindex.c
-@@ -656,9 +656,9 @@
- 			stats.unused_pages++;
- 		else if (PageGetSpecialSize(page) !=
- 				 MAXALIGN(sizeof(HashPageOpaqueData)))
--			ereport(ERROR,
-+			ereport(WARNING,
- 					(errcode(ERRCODE_INDEX_CORRUPTED),
--					 errmsg("index \"%s\" contains corrupted page at block %u",
-+					 errmsg("# 661(FATAL block=%d): index \"%s\" contains corrupted page at block %u", blkno,
- 							RelationGetRelationName(rel),
- 							BufferGetBlockNumber(buf))));
- 		else
diff --git a/patches/postgresql-wasm/contrib-xml2-Makefile.diff b/patches/postgresql-wasm/contrib-xml2-Makefile.diff
deleted file mode 100644
index 53db2c8a6..000000000
--- a/patches/postgresql-wasm/contrib-xml2-Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- postgresql/contrib/xml2/Makefile
-+++ postgresql-wasm/contrib/xml2/Makefile
-@@ -11,7 +11,7 @@
- PGFILEDESC = "xml2 - XPath querying and XSLT"
- 
- REGRESS = xml2
--
-+PG_CFLAGS=$(shell xml2-config --cflags)
- SHLIB_LINK += $(filter -lxslt, $(LIBS)) -lxml2
- 
- ifdef USE_PGXS
diff --git a/patches/postgresql-wasm/src-backend-access-nbtree-nbtutils.c.diff b/patches/postgresql-wasm/src-backend-access-nbtree-nbtutils.c.diff
deleted file mode 100644
index d9d91c974..000000000
--- a/patches/postgresql-wasm/src-backend-access-nbtree-nbtutils.c.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- postgresql/src/backend/access/nbtree/nbtutils.c
-+++ postgresql-wasm/src/backend/access/nbtree/nbtutils.c
-@@ -2732,7 +2732,7 @@
- 			break;
- 		}
- 	}
--
-+#if !defined(__EMSCRIPTEN__)
- 	if (debugmessage)
- 	{
- 		if (allequalimage)
-@@ -2742,6 +2742,6 @@
- 			elog(DEBUG1, "index \"%s\" cannot use deduplication",
- 				 RelationGetRelationName(rel));
- 	}
--
-+#endif
- 	return allequalimage;
- }
diff --git a/patches/postgresql-wasm/src-backend-access-transam-xact.c.diff b/patches/postgresql-wasm/src-backend-access-transam-xact.c.diff
deleted file mode 100644
index 66b85e9d4..000000000
--- a/patches/postgresql-wasm/src-backend-access-transam-xact.c.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- postgresql/src/backend/access/transam/xact.c
-+++ postgresql-wasm/src/backend/access/transam/xact.c
-@@ -1740,6 +1740,7 @@
- 	if (TransactionIdDidCommit(xid))
- 		elog(PANIC, "cannot abort transaction %u, it was already committed",
- 			 xid);
-+	else elog(WARNING, "# 1743: aborting transaction %u", xid);
- 
- 	/*
- 	 * Are we using the replication origins feature?  Or, in other words, are
-@@ -2748,7 +2749,9 @@
- 	 * handler.  We do this fairly early in the sequence so that the timeout
- 	 * infrastructure will be functional if needed while aborting.
- 	 */
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 	sigprocmask(SIG_SETMASK, &UnBlockSig, NULL);
-+#endif
- 
- 	/*
- 	 * check the current transaction state
-@@ -5107,7 +5110,10 @@
- 	 * handler.  We do this fairly early in the sequence so that the timeout
- 	 * infrastructure will be functional if needed while aborting.
- 	 */
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 	sigprocmask(SIG_SETMASK, &UnBlockSig, NULL);
-+#endif
-+
- 
- 	/*
- 	 * check the current transaction state
diff --git a/patches/postgresql-wasm/src-backend-catalog-index.c.diff b/patches/postgresql-wasm/src-backend-catalog-index.c.diff
deleted file mode 100644
index 78b54ab66..000000000
--- a/patches/postgresql-wasm/src-backend-catalog-index.c.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- postgresql/src/backend/catalog/index.c
-+++ postgresql-wasm/src/backend/catalog/index.c
-@@ -2995,7 +2995,7 @@
- 		indexInfo->ii_ParallelWorkers =
- 			plan_create_index_workers(RelationGetRelid(heapRelation),
- 									  RelationGetRelid(indexRelation));
--
-+#if !defined(__EMSCRIPTEN__)
- 	if (indexInfo->ii_ParallelWorkers == 0)
- 		ereport(DEBUG1,
- 				(errmsg_internal("building index \"%s\" on table \"%s\" serially",
-@@ -3007,7 +3007,7 @@
- 								 RelationGetRelationName(indexRelation),
- 								 RelationGetRelationName(heapRelation),
- 								 indexInfo->ii_ParallelWorkers)));
--
-+#endif
- 	/*
- 	 * Switch to the table owner's userid, so that any index functions are run
- 	 * as that user.  Also lock down security-restricted operations and
diff --git a/patches/postgresql-wasm/src-backend-commands-collationcmds.c.diff b/patches/postgresql-wasm/src-backend-commands-collationcmds.c.diff
deleted file mode 100644
index a19b9386d..000000000
--- a/patches/postgresql-wasm/src-backend-commands-collationcmds.c.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- postgresql/src/backend/commands/collationcmds.c
-+++ postgresql-wasm/src/backend/commands/collationcmds.c
-@@ -828,14 +828,14 @@
- 		maxaliases = 100;
- 		aliases = (CollAliasData *) palloc(maxaliases * sizeof(CollAliasData));
- 		naliases = 0;
--
- 		locale_a_handle = OpenPipeStream("locale -a", "r");
--		if (locale_a_handle == NULL)
-+		if (locale_a_handle == NULL) {
-+            puts("======================== ERROR ================");
- 			ereport(ERROR,
- 					(errcode_for_file_access(),
- 					 errmsg("could not execute command \"%s\": %m",
- 							"locale -a")));
--
-+        }
- 		while (fgets(localebuf, sizeof(localebuf), locale_a_handle))
- 		{
- 			size_t		len;
diff --git a/patches/postgresql-wasm/src-backend-commands-event_trigger.c.diff b/patches/postgresql-wasm/src-backend-commands-event_trigger.c.diff
deleted file mode 100644
index 2fbde7ad5..000000000
--- a/patches/postgresql-wasm/src-backend-commands-event_trigger.c.diff
+++ /dev/null
@@ -1,67 +0,0 @@
---- postgresql/src/backend/commands/event_trigger.c
-+++ postgresql-wasm/src/backend/commands/event_trigger.c
-@@ -642,6 +642,8 @@
- 	List	   *runlist;
- 	EventTriggerData trigdata;
- 
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+#else
- 	/*
- 	 * Event Triggers are completely disabled in standalone mode.  There are
- 	 * (at least) two reasons for this:
-@@ -660,6 +662,7 @@
- 	 */
- 	if (!IsUnderPostmaster)
- 		return;
-+#endif
- 
- 	runlist = EventTriggerCommonSetup(parsetree,
- 									  EVT_DDLCommandStart,
-@@ -690,12 +693,15 @@
- 	List	   *runlist;
- 	EventTriggerData trigdata;
- 
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+#else
- 	/*
- 	 * See EventTriggerDDLCommandStart for a discussion about why event
- 	 * triggers are disabled in single user mode.
- 	 */
- 	if (!IsUnderPostmaster)
- 		return;
-+#endif
- 
- 	/*
- 	 * Also do nothing if our state isn't set up, which it won't be if there
-@@ -738,12 +744,15 @@
- 	List	   *runlist;
- 	EventTriggerData trigdata;
- 
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+#else
- 	/*
- 	 * See EventTriggerDDLCommandStart for a discussion about why event
- 	 * triggers are disabled in single user mode.
- 	 */
- 	if (!IsUnderPostmaster)
- 		return;
-+#endif
- 
- 	/*
- 	 * Use current state to determine whether this event fires at all.  If
-@@ -809,12 +818,15 @@
- 	List	   *runlist;
- 	EventTriggerData trigdata;
- 
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+#else
- 	/*
- 	 * See EventTriggerDDLCommandStart for a discussion about why event
- 	 * triggers are disabled in single user mode.
- 	 */
- 	if (!IsUnderPostmaster)
- 		return;
-+#endif
- 
- 	/*
- 	 * Also do nothing if our state isn't set up, which it won't be if there
diff --git a/patches/postgresql-wasm/src-backend-libpq-be-fsstubs.c.diff b/patches/postgresql-wasm/src-backend-libpq-be-fsstubs.c.diff
deleted file mode 100644
index 6de768b15..000000000
--- a/patches/postgresql-wasm/src-backend-libpq-be-fsstubs.c.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- postgresql/src/backend/libpq/be-fsstubs.c
-+++ postgresql-wasm/src/backend/libpq/be-fsstubs.c
-@@ -150,8 +150,12 @@
-  *
-  *****************************************************************************/
- 
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+static int
-+#else
- int
--lo_read(int fd, char *buf, int len)
-+#endif
-+lo_read3(int fd, char *buf, int len)
- {
- 	int			status;
- 	LargeObjectDesc *lobj;
-@@ -178,8 +182,12 @@
- 	return status;
- }
- 
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+static int
-+#else
- int
--lo_write(int fd, const char *buf, int len)
-+#endif
-+lo_write3(int fd, const char *buf, int len)
- {
- 	int			status;
- 	LargeObjectDesc *lobj;
-@@ -190,7 +198,7 @@
- 				 errmsg("invalid large-object descriptor: %d", fd)));
- 	lobj = cookies[fd];
- 
--	/* see comment in lo_read() */
-+	/* see comment in lo_read3() */
- 	if ((lobj->flags & IFS_WRLOCK) == 0)
- 		ereport(ERROR,
- 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-@@ -365,7 +373,7 @@
- 		len = 0;
- 
- 	retval = (bytea *) palloc(VARHDRSZ + len);
--	totalread = lo_read(fd, VARDATA(retval), len);
-+	totalread = lo_read3(fd, VARDATA(retval), len);
- 	SET_VARSIZE(retval, totalread + VARHDRSZ);
- 
- 	PG_RETURN_BYTEA_P(retval);
-@@ -382,7 +390,7 @@
- 	PreventCommandIfReadOnly("lowrite()");
- 
- 	bytestowrite = VARSIZE_ANY_EXHDR(wbuf);
--	totalwritten = lo_write(fd, VARDATA_ANY(wbuf), bytestowrite);
-+	totalwritten = lo_write3(fd, VARDATA_ANY(wbuf), bytestowrite);
- 	PG_RETURN_INT32(totalwritten);
- }
- 
-@@ -560,7 +568,7 @@
- 				 errmsg("invalid large-object descriptor: %d", fd)));
- 	lobj = cookies[fd];
- 
--	/* see comment in lo_read() */
-+	/* see comment in lo_read3() */
- 	if ((lobj->flags & IFS_WRLOCK) == 0)
- 		ereport(ERROR,
- 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
diff --git a/patches/postgresql-wasm/src-backend-port-posix_sema.c.diff b/patches/postgresql-wasm/src-backend-port-posix_sema.c.diff
deleted file mode 100644
index 61b8fb5bb..000000000
--- a/patches/postgresql-wasm/src-backend-port-posix_sema.c.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- postgresql/src/backend/port/posix_sema.c
-+++ postgresql-wasm/src/backend/port/posix_sema.c
-@@ -298,10 +298,16 @@
- 	 * There's no direct API for this in POSIX, so we have to ratchet the
- 	 * semaphore down to 0 with repeated trywait's.
- 	 */
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+    sem_trywait(PG_SEM_REF(sema));
-+    return;
-+#else
- 	for (;;)
- 	{
- 		if (sem_trywait(PG_SEM_REF(sema)) < 0)
- 		{
-+
-+
- 			if (errno == EAGAIN || errno == EDEADLK)
- 				break;			/* got it down to 0 */
- 			if (errno == EINTR)
-@@ -309,6 +315,7 @@
- 			elog(FATAL, "sem_trywait failed: %m");
- 		}
- 	}
-+#endif
- }
- 
- /*
diff --git a/patches/postgresql-wasm/src-backend-port-sysv_shmem.c.diff b/patches/postgresql-wasm/src-backend-port-sysv_shmem.c.diff
deleted file mode 100644
index 5db440e32..000000000
--- a/patches/postgresql-wasm/src-backend-port-sysv_shmem.c.diff
+++ /dev/null
@@ -1,62 +0,0 @@
---- postgresql/src/backend/port/sysv_shmem.c
-+++ postgresql-wasm/src/backend/port/sysv_shmem.c
-@@ -17,8 +17,8 @@
-  *
-  *-------------------------------------------------------------------------
-  */
-+#define PG_SHMEM
- #include "postgres.h"
--
- #include <signal.h>
- #include <unistd.h>
- #include <sys/file.h>
-@@ -691,12 +691,47 @@
- PGSharedMemoryCreate(Size size,
- 					 PGShmemHeader **shim)
- {
--	IpcMemoryKey NextShmemSegID;
--	void	   *memAddress;
-+	IpcMemoryKey NextShmemSegID = 0;
-+	void	   *memAddress = NULL;
- 	PGShmemHeader *hdr;
- 	struct stat statbuf;
- 	Size		sysvsize;
- 
-+/*
-+    puts("@\n@\n@\n@\n@\n@\n PGSharedMemoryCreate @\n@\n@\n@\n@\n@\n");
-+
-+	elog(NOTICE, "Init WASM shared memory");
-+
-+	hdr = (PGShmemHeader *) malloc(size);
-+	hdr->creatorPID = getpid();
-+	hdr->magic = PGShmemMagic;
-+	hdr->dsm_control = 0;
-+
-+
-+	hdr->device = statbuf.st_dev;
-+	hdr->inode = statbuf.st_ino;
-+
-+	hdr->totalsize = size;
-+	hdr->freeoffset = MAXALIGN(sizeof(PGShmemHeader));
-+	*shim = hdr;
-+
-+	UsedShmemSegAddr = memAddress;
-+	UsedShmemSegID = (unsigned long) NextShmemSegID;
-+
-+	if (AnonymousShmem == NULL)
-+		return hdr;
-+	memcpy(AnonymousShmem, hdr, sizeof(PGShmemHeader));
-+	return (PGShmemHeader *) AnonymousShmem;
-+*/
-+
-+
-+
-+
-+
-+
-+
-+
-+
- 	/*
- 	 * We use the data directory's ID info (inode and device numbers) to
- 	 * positively identify shmem segments associated with this data dir, and
diff --git a/patches/postgresql-wasm/src-backend-storage-buffer-bufmgr.c.diff b/patches/postgresql-wasm/src-backend-storage-buffer-bufmgr.c.diff
deleted file mode 100644
index 1ee47b9ef..000000000
--- a/patches/postgresql-wasm/src-backend-storage-buffer-bufmgr.c.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- postgresql/src/backend/storage/buffer/bufmgr.c
-+++ postgresql-wasm/src/backend/storage/buffer/bufmgr.c
-@@ -1134,16 +1134,16 @@
- 			{
- 				ereport(WARNING,
- 						(errcode(ERRCODE_DATA_CORRUPTED),
--						 errmsg("invalid page in block %u of relation %s; zeroing out page",
-+						 errmsg("1137: invalid page in block %u of relation %s; zeroing out page",
- 								blockNum,
- 								relpath(smgr->smgr_rlocator, forkNum))));
- 				MemSet((char *) bufBlock, 0, BLCKSZ);
- 			}
- 			else
--				ereport(ERROR,
-+				ereport(WARNING,
- 						(errcode(ERRCODE_DATA_CORRUPTED),
--						 errmsg("invalid page in block %u of relation %s",
--								blockNum,
-+						 errmsg("1145(FATAL): invalid page in block %u fork=%d p=%p sz=%d of relation %s",
-+								blockNum,forkNum,bufBlock, BLCKSZ,
- 								relpath(smgr->smgr_rlocator, forkNum))));
- 		}
- 	}
diff --git a/patches/postgresql-wasm/src-backend-storage-file-fd.c.diff b/patches/postgresql-wasm/src-backend-storage-file-fd.c.diff
deleted file mode 100644
index 1316f32e1..000000000
--- a/patches/postgresql-wasm/src-backend-storage-file-fd.c.diff
+++ /dev/null
@@ -1,67 +0,0 @@
---- postgresql/src/backend/storage/file/fd.c
-+++ postgresql-wasm/src/backend/storage/file/fd.c
-@@ -69,7 +69,7 @@
-  *
-  *-------------------------------------------------------------------------
-  */
--
-+#define PG_FD
- #include "postgres.h"
- 
- #include <dirent.h>
-@@ -478,6 +478,11 @@
- void
- pg_flush_data(int fd, off_t offset, off_t nbytes)
- {
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+    //int res = sync_file_range(fd, offset, nbytes, SYNC_FILE_RANGE_WAIT_BEFORE | SYNC_FILE_RANGE_WRITE | SYNC_FILE_RANGE_WAIT_AFTER);
-+    (void)fsync(fd);
-+    // fprintf(stderr, "# pg_flush_data(int fd=%d, off_t offset=%lld, off_t nbytes=%lld res=%d\n", fd,offset,nbytes, res);
-+#else
- 	/*
- 	 * Right now file flushing is primarily used to avoid making later
- 	 * fsync()/fdatasync() calls have less impact. Thus don't trigger flushes
-@@ -648,6 +653,7 @@
- 		return;
- 	}
- #endif
-+#endif /* wasm */
- }
- 
- /*
-@@ -660,7 +666,7 @@
- 
- retry:
- 	ret = ftruncate(fd, length);
--
-+printf("# 670 pg_ftruncate(int fd=%d, off_t length=%lld)=%d\n" __FILE__, fd, length, ret);
- 	if (ret == -1 && errno == EINTR)
- 		goto retry;
- 
-@@ -692,7 +698,7 @@
- 
- retry:
- 	ret = truncate(path, length);
--
-+printf("# 670 pg_truncate(path=%s, off_t length=%lld)=%d\n" __FILE__, path, length, ret);
- 	if (ret == -1 && errno == EINTR)
- 		goto retry;
- #endif
-@@ -2619,7 +2625,7 @@
- 
- 	return -1;					/* failure */
- }
--
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- /*
-  * Routines that want to initiate a pipe stream should use OpenPipeStream
-  * rather than plain popen().  This lets fd.c deal with freeing FDs if
-@@ -2679,7 +2685,7 @@
- 
- 	return NULL;
- }
--
-+#endif
- /*
-  * Free an AllocateDesc of any type.
-  *
diff --git a/patches/postgresql-wasm/src-backend-storage-ipc-ipc.c.diff b/patches/postgresql-wasm/src-backend-storage-ipc-ipc.c.diff
deleted file mode 100644
index cf7ac7416..000000000
--- a/patches/postgresql-wasm/src-backend-storage-ipc-ipc.c.diff
+++ /dev/null
@@ -1,95 +0,0 @@
---- postgresql/src/backend/storage/ipc/ipc.c
-+++ postgresql-wasm/src/backend/storage/ipc/ipc.c
-@@ -103,6 +103,48 @@
- void
- proc_exit(int code)
- {
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+	if (code==66) {
-+		fprintf(stderr,"# 108:fake shutdown\n");
-+		proc_exit_inprogress = true;
-+		InterruptPending = false;
-+		ProcDiePending = false;
-+		QueryCancelPending = false;
-+		InterruptHoldoffCount = 1;
-+		CritSectionCount = 0;
-+
-+		error_context_stack = NULL;
-+		debug_query_string = NULL;
-+
-+		shmem_exit_inprogress = true;
-+		int save_before_shmem_exit_index = before_shmem_exit_index;
-+		while (--before_shmem_exit_index >= 0) {
-+			if (before_shmem_exit_index!=4) {
-+				printf("# skipped shmem_exit_index=%d/%d\n", before_shmem_exit_index, save_before_shmem_exit_index);
-+				continue;
-+			} else
-+				printf("# before_shmem_exit_index=%d/%d\n", before_shmem_exit_index, save_before_shmem_exit_index);
-+			before_shmem_exit_list[before_shmem_exit_index].function(code, before_shmem_exit_list[before_shmem_exit_index].arg);
-+		}
-+		before_shmem_exit_index = save_before_shmem_exit_index;
-+		puts("# dsm_backend_shutdown ?");
-+		// dsm_backend_shutdown();
-+		shmem_exit_inprogress = false;
-+		/*
-+
-+		int save_on_proc_exit_index = on_proc_exit_index;
-+		while (--on_proc_exit_index >= 0) {
-+			printf("# on_proc_exit_list=%d/%d\n", on_proc_exit_list, save_on_proc_exit_index);
-+			on_proc_exit_list[on_proc_exit_index].function(code, on_proc_exit_list[on_proc_exit_index].arg);
-+		}
-+		on_proc_exit_index = save_on_proc_exit_index;
-+		*/
-+	} else {
-+		proc_exit_inprogress = true;
-+		fprintf(stderr,"# proc_exit(%d) ignored at 118:%s\n",code, __FILE__);
-+    }
-+    return;
-+#endif
- 	/* not safe if forked by system(), etc. */
- 	if (MyProcPid != (int) getpid())
- 		elog(PANIC, "proc_exit() called in child process");
-@@ -152,7 +194,6 @@
- #endif
- 
- 	elog(DEBUG3, "exit(%d)", code);
--
- 	exit(code);
- }
- 
-@@ -228,7 +269,7 @@
- shmem_exit(int code)
- {
- 	shmem_exit_inprogress = true;
--
-+if (code!=66){
- 	/*
- 	 * Call before_shmem_exit callbacks.
- 	 *
-@@ -276,7 +317,7 @@
- 		on_shmem_exit_list[on_shmem_exit_index].function(code,
- 														 on_shmem_exit_list[on_shmem_exit_index].arg);
- 	on_shmem_exit_index = 0;
--
-+}
- 	shmem_exit_inprogress = false;
- }
- 
-@@ -364,6 +405,17 @@
- void
- on_shmem_exit(pg_on_exit_callback function, Datum arg)
- {
-+#if defined(__wasi__) || defined(__EMSCRIPTEN__)
-+    if (!atexit_callback_setup) {
-+        PDEBUG("# 410:" __FILE__ " on_shmem_exit(pg_on_exit_callback function, Datum arg) FIRST CALL");
-+        if (on_shmem_exit_index >= MAX_ON_EXITS) {
-+            PDEBUG("# 412:" __FILE__ " on_shmem_exit(pg_on_exit_callback function, Datum arg) OVERFLOW");
-+        }
-+    } else {
-+        PDEBUG("# 415:" __FILE__ " on_shmem_exit(pg_on_exit_callback function, Datum arg) STUB");
-+        return;
-+    }
-+#endif
- 	if (on_shmem_exit_index >= MAX_ON_EXITS)
- 		ereport(FATAL,
- 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
diff --git a/patches/postgresql-wasm/src-backend-tcop-postgres.c.diff b/patches/postgresql-wasm/src-backend-tcop-postgres.c.diff
deleted file mode 100644
index 97674939d..000000000
--- a/patches/postgresql-wasm/src-backend-tcop-postgres.c.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- postgresql/src/backend/tcop/postgres.c
-+++ postgresql-wasm/src/backend/tcop/postgres.c
-@@ -4052,7 +4052,11 @@
- #endif
- }
- 
--
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+#define PG_MAIN
-+#include PG_MAIN_INCLUDE
-+#undef PG_MAIN
-+#else
- /*
-  * PostgresSingleUserMain
-  *     Entry point for single user mode. argc/argv are the command line
-@@ -4948,7 +4952,7 @@
- 		}
- 	}							/* end of input-reading loop */
- }
--
-+#endif /* wasm */
- /*
-  * Throw an error if we're a WAL sender process.
-  *
-@@ -5067,7 +5071,7 @@
- 					 (long) user.tv_usec,
- 					 (long) sys.tv_sec,
- 					 (long) sys.tv_usec);
--#ifndef WIN32
-+#if !defined(WIN32) && !defined(__wasi__)
- 
- 	/*
- 	 * The following rusage fields are not defined by POSIX, but they're
diff --git a/patches/postgresql-wasm/src-backend-tcop-utility.c.diff b/patches/postgresql-wasm/src-backend-tcop-utility.c.diff
deleted file mode 100644
index a75c6155f..000000000
--- a/patches/postgresql-wasm/src-backend-tcop-utility.c.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- postgresql/src/backend/tcop/utility.c
-+++ postgresql-wasm/src/backend/tcop/utility.c
-@@ -811,7 +811,7 @@
- 				ListenStmt *stmt = (ListenStmt *) parsetree;
- 
- 				CheckRestrictedOperation("LISTEN");
--
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 				/*
- 				 * We don't allow LISTEN in background processes, as there is
- 				 * no mechanism for them to collect NOTIFY messages, so they'd
-@@ -827,7 +827,7 @@
- 					/* translator: %s is name of a SQL command, eg LISTEN */
- 							 errmsg("cannot execute %s within a background process",
- 									"LISTEN")));
--
-+#endif
- 				Async_Listen(stmt->conditionname);
- 			}
- 			break;
diff --git a/patches/postgresql-wasm/src-backend-utils-adt-ruleutils.c.diff b/patches/postgresql-wasm/src-backend-utils-adt-ruleutils.c.diff
deleted file mode 100644
index 2c9f81ebf..000000000
--- a/patches/postgresql-wasm/src-backend-utils-adt-ruleutils.c.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- postgresql/src/backend/utils/adt/ruleutils.c
-+++ postgresql-wasm/src/backend/utils/adt/ruleutils.c
-@@ -321,8 +321,9 @@
- static const char *query_getviewrule = "SELECT * FROM pg_catalog.pg_rewrite WHERE ev_class = $1 AND rulename = $2";
- 
- /* GUC parameters */
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- bool		quote_all_identifiers = false;
--
-+#endif
- 
- /* ----------
-  * Local functions
diff --git a/patches/postgresql-wasm/src-backend-utils-error-elog.c.diff b/patches/postgresql-wasm/src-backend-utils-error-elog.c.diff
deleted file mode 100644
index 3c277290e..000000000
--- a/patches/postgresql-wasm/src-backend-utils-error-elog.c.diff
+++ /dev/null
@@ -1,62 +0,0 @@
---- postgresql/src/backend/utils/error/elog.c
-+++ postgresql-wasm/src/backend/utils/error/elog.c
-@@ -349,12 +349,16 @@
- 	ErrorData  *edata;
- 	bool		output_to_server;
- 	bool		output_to_client = false;
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+#   warning "FIXME: error levels"
-+#else
- 	int			i;
- 
- 	/*
- 	 * Check some cases in which we want to promote an error into a more
- 	 * severe error.  None of this logic applies for non-error messages.
- 	 */
-+
- 	if (elevel >= ERROR)
- 	{
- 		/*
-@@ -395,7 +399,7 @@
- 		for (i = 0; i <= errordata_stack_depth; i++)
- 			elevel = Max(elevel, errordata[i].elevel);
- 	}
--
-+#endif
- 	/*
- 	 * Now decide whether we need to process this report at all; if it's
- 	 * warning or less and not enabled for logging, just return false without
-@@ -540,7 +544,13 @@
- 		 */
- 
- 		recursion_depth--;
-+#if 0 //defined(__EMSCRIPTEN__) || defined(__wasi__)
-+        fprintf(stderr, "# 547: PG_RE_THROW(ERROR : %d) ignored\n", recursion_depth);
-+        trap();
-+#else
-+        fprintf(stderr, "# 549: PG_RE_THROW(ERROR : %d)\n", recursion_depth);
- 		PG_RE_THROW();
-+#endif
- 	}
- 
- 	/* Emit the message to the right places */
-@@ -588,7 +598,11 @@
- 		 * FATAL termination.  The postmaster may or may not consider this
- 		 * worthy of panic, depending on which subprocess returns it.
- 		 */
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+        puts("# 599: proc_exit(FATAL) ignored");
-+#else
- 		proc_exit(1);
-+#endif
- 	}
- 
- 	if (elevel >= PANIC)
-@@ -698,6 +712,7 @@
- 	 */
- 	if (edata->elevel >= ERROR)
- 	{
-+puts("#712");
- 		errfinish(filename, lineno, funcname);
- 		pg_unreachable();
- 	}
diff --git a/patches/postgresql-wasm/src-backend-utils-init-miscinit.c.diff b/patches/postgresql-wasm/src-backend-utils-init-miscinit.c.diff
deleted file mode 100644
index 2a5bef745..000000000
--- a/patches/postgresql-wasm/src-backend-utils-init-miscinit.c.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- postgresql/src/backend/utils/init/miscinit.c
-+++ postgresql-wasm/src/backend/utils/init/miscinit.c
-@@ -143,7 +143,7 @@
- 	 * children, but for consistency we make all postmaster child processes do
- 	 * this.
- 	 */
--#ifdef HAVE_SETSID
-+#if defined(HAVE_SETSID) && !defined(__wasi__)
- 	if (setsid() < 0)
- 		elog(FATAL, "setsid() failed: %m");
- #endif
-@@ -209,7 +209,7 @@
- 	if (my_exec_path[0] == '\0')
- 	{
- 		if (find_my_exec(argv0, my_exec_path) < 0)
--			elog(FATAL, "%s: could not locate my own executable path",
-+			elog(WARNING, "%s:212: could not locate my own executable path",
- 				 argv0);
- 	}
- 
-@@ -368,7 +368,7 @@
- 	 *
- 	 * XXX can we safely enable this check on Windows?
- 	 */
--#if !defined(WIN32) && !defined(__CYGWIN__)
-+#if !defined(WIN32) && !defined(__CYGWIN__) && !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 	if (stat_buf.st_uid != geteuid())
- 		ereport(FATAL,
- 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-@@ -388,7 +388,7 @@
- 	 * be proper support for Unix-y file permissions.  Need to think of a
- 	 * reasonable check to apply on Windows.
- 	 */
--#if !defined(WIN32) && !defined(__CYGWIN__)
-+#if !defined(WIN32) && !defined(__CYGWIN__) && !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 	if (stat_buf.st_mode & PG_MODE_MASK_GROUP)
- 		ereport(FATAL,
- 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-@@ -409,7 +409,7 @@
- 	 * Suppress when on Windows, because there may not be proper support for
- 	 * Unix-y file permissions.
- 	 */
--#if !defined(WIN32) && !defined(__CYGWIN__)
-+#if !defined(WIN32) && !defined(__CYGWIN__) && !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 	SetDataDirectoryCreatePerm(stat_buf.st_mode);
- 
- 	umask(pg_mode_mask);
-@@ -1223,7 +1223,13 @@
- 		 * Think not to make the file protection weaker than 0600/0640.  See
- 		 * comments below.
- 		 */
-+
-+#if defined(__wasi__)
-+printf("# 1228: CreateLockFile(%s) w+ (forced)\n", filename);
-+		fd = fileno(fopen(filename, "w+"));
-+#else
- 		fd = open(filename, O_RDWR | O_CREAT | O_EXCL, pg_file_create_mode);
-+#endif
- 		if (fd >= 0)
- 			break;				/* Success; exit the retry loop */
- 
diff --git a/patches/postgresql-wasm/src-backend-utils-init-postinit.c.diff b/patches/postgresql-wasm/src-backend-utils-init-postinit.c.diff
deleted file mode 100644
index f0db1209d..000000000
--- a/patches/postgresql-wasm/src-backend-utils-init-postinit.c.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- postgresql/src/backend/utils/init/postinit.c
-+++ postgresql-wasm/src/backend/utils/init/postinit.c
-@@ -13,6 +13,7 @@
-  *
-  *-------------------------------------------------------------------------
-  */
-+#define PG_POSTINIT
- #include "postgres.h"
- 
- #include <ctype.h>
-@@ -714,6 +715,7 @@
-  *		Be very careful with the order of calls in the InitPostgres function.
-  * --------------------------------
-  */
-+
- void
- InitPostgres(const char *in_dbname, Oid dboid,
- 			 const char *username, Oid useroid,
-@@ -883,8 +885,18 @@
- 	}
- 	else if (!IsUnderPostmaster)
- 	{
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+if (!strcmp( username , WASM_USERNAME )) {
-+#endif
- 		InitializeSessionUserIdStandalone();
- 		am_superuser = true;
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+} else {
-+        //puts("# 894: switching session id");
-+        InitializeSessionUserId(username, InvalidOid);
-+		am_superuser = superuser();
-+}
-+#endif
- 		if (!ThereIsAtLeastOneRole())
- 			ereport(WARNING,
- 					(errcode(ERRCODE_UNDEFINED_OBJECT),
-@@ -1239,6 +1251,32 @@
- 		CommitTransactionCommand();
- }
- 
-+/* ========================================================================*/
-+/*
-+void
-+ReInitPostgres(const char *in_dbname, Oid dboid,
-+			 const char *username, Oid useroid,
-+			 bool load_session_libraries,
-+			 bool override_allow_connections,
-+			 char *out_dbname)
-+{
-+    puts("ReInitPostgres:Begin");
-+    InitPostgres(in_dbname, dboid, username, useroid, load_session_libraries, override_allow_connections, out_dbname);
-+    puts("ReInitPostgres:End");
-+}
-+*/
-+/* ========================================================================*/
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- /*
-  * Process any command-line switches and any additional GUC variable
-  * settings passed in the startup packet.
-@@ -1345,14 +1383,15 @@
- static void
- ShutdownPostgres(int code, Datum arg)
- {
-+puts("# 1348: " __FILE__);
- 	/* Make sure we've killed any active transaction */
- 	AbortOutOfAnyTransaction();
--
- 	/*
- 	 * User locks are not released by transaction end, so be sure to release
- 	 * them explicitly.
- 	 */
- 	LockReleaseAll(USER_LOCKMETHOD, true);
-+puts("# 1356: " __FILE__);
- }
- 
- 
diff --git a/patches/postgresql-wasm/src-backend-utils-misc-timeout.c.diff b/patches/postgresql-wasm/src-backend-utils-misc-timeout.c.diff
deleted file mode 100644
index fab44f6d4..000000000
--- a/patches/postgresql-wasm/src-backend-utils-misc-timeout.c.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- postgresql/src/backend/utils/misc/timeout.c
-+++ postgresql-wasm/src/backend/utils/misc/timeout.c
-@@ -110,10 +110,20 @@
-  * Insert specified timeout reason into the list of active timeouts
-  * at the given index.
-  */
-+
-+bool insert_timeout_warned = false;
- static void
- insert_timeout(TimeoutId id, int index)
- {
- 	int			i;
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+    if (!insert_timeout_warned) //(index<0)
-+    {
-+        insert_timeout_warned = true;
-+        fprintf(stderr, "# 117(FATAL): insert_timeout(TimeoutId id=%d, int index=%d): " __FILE__ "\n", id, index);
-+    }
-+    return;
-+#endif
- 
- 	if (index < 0 || index > num_active_timeouts)
- 		elog(FATAL, "timeout index %d out of range 0..%d", index,
-@@ -128,6 +138,7 @@
- 	active_timeouts[index] = &all_timeouts[id];
- 
- 	num_active_timeouts++;
-+
- }
- 
- /*
-@@ -209,6 +220,10 @@
- static void
- schedule_alarm(TimestampTz now)
- {
-+#if defined(__wasi__)
-+    puts("# 224: schedule_alarm(TimestampTz now)");
-+    (void)signal_due_at;
-+#else
- 	if (num_active_timeouts > 0)
- 	{
- 		struct itimerval timeval;
-@@ -347,6 +362,7 @@
- 			elog(FATAL, "could not enable SIGALRM timer: %m");
- 		}
- 	}
-+#endif
- }
- 
- 
diff --git a/patches/postgresql-wasm/src-bin-pg_config-pg_config.c.diff b/patches/postgresql-wasm/src-bin-pg_config-pg_config.c.diff
deleted file mode 100644
index df9ee8a8d..000000000
--- a/patches/postgresql-wasm/src-bin-pg_config-pg_config.c.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- postgresql/src/bin/pg_config/pg_config.c
-+++ postgresql-wasm/src/bin/pg_config/pg_config.c
-@@ -152,7 +152,9 @@
- 	if (find_my_exec(argv[0], my_exec_path) < 0)
- 	{
- 		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 		exit(1);
-+#endif
- 	}
- 
- 	configdata = get_configdata(my_exec_path, &configdata_len);
-@@ -162,6 +164,7 @@
- 		for (i = 0; i < configdata_len; i++)
- 			printf("%s = %s\n", configdata[i].name, configdata[i].setting);
- 		exit(0);
-+
- 	}
- 
- 	/* otherwise print requested items */
diff --git a/patches/postgresql-wasm/src-bin-pg_dump-pg_dump.c.diff b/patches/postgresql-wasm/src-bin-pg_dump-pg_dump.c.diff
deleted file mode 100644
index 8eb6295d9..000000000
--- a/patches/postgresql-wasm/src-bin-pg_dump-pg_dump.c.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- postgresql/src/bin/pg_dump/pg_dump.c
-+++ postgresql-wasm/src/bin/pg_dump/pg_dump.c
-@@ -30,6 +30,13 @@
-  *-------------------------------------------------------------------------
-  */
- #include "postgres_fe.h"
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
-+#ifdef quote_all_identifiers
-+#undef quote_all_identifiers
-+#endif
-+#define fe_utils_quote_all_identifiers quote_all_identifiers
-+static bool quote_all_identifiers;
-+#endif
- 
- #include <unistd.h>
- #include <ctype.h>
-@@ -328,8 +335,11 @@
- static void setupDumpWorker(Archive *AH);
- static TableInfo *getRootTableInfo(const TableInfo *tbinfo);
- static bool forcePartitionRootLoad(const TableInfo *tbinfo);
--
--
-+#if defined(__wasi__)
-+__attribute__((export_name("_setup"))) void setup() {
-+    puts("WASM_SYM_EXPORTED");
-+}
-+#endif
- int
- main(int argc, char **argv)
- {
-@@ -411,7 +421,7 @@
- 		{"lock-wait-timeout", required_argument, NULL, 2},
- 		{"no-table-access-method", no_argument, &dopt.outputNoTableAm, 1},
- 		{"no-tablespaces", no_argument, &dopt.outputNoTablespaces, 1},
--		{"quote-all-identifiers", no_argument, &quote_all_identifiers, 1},
-+		{"quote-all-identifiers", no_argument, &fe_utils_quote_all_identifiers, true},
- 		{"load-via-partition-root", no_argument, &dopt.load_via_partition_root, 1},
- 		{"role", required_argument, NULL, 3},
- 		{"section", required_argument, NULL, 5},
-@@ -435,7 +445,9 @@
- 
- 		{NULL, 0, NULL, 0}
- 	};
--
-+#if defined(__wasi__)
-+chdir("/");
-+#endif
- 	pg_logging_init(argv[0]);
- 	pg_logging_set_level(PG_LOG_WARNING);
- 	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_dump"));
-@@ -803,9 +815,12 @@
- 	 * Open the database using the Archiver, so it knows about it. Errors mean
- 	 * death.
- 	 */
-+puts("# 813 : " __FILE__);
-+    //setup();
- 	ConnectDatabase(fout, &dopt.cparams, false);
-+puts("# 815 : " __FILE__);
- 	setup_connection(fout, dumpencoding, dumpsnapshot, use_role);
--
-+puts("# 817 : " __FILE__);
- 	/*
- 	 * On hot standbys, never try to dump unlogged table data, since it will
- 	 * just throw an error.
-@@ -1152,9 +1167,10 @@
- 				 const char *dumpsnapshot, char *use_role)
- {
- 	DumpOptions *dopt = AH->dopt;
-+puts("# 1164 : get_connection : "__FILE__);
- 	PGconn	   *conn = GetConnection(AH);
- 	const char *std_strings;
--
-+puts("# 1164 : setup_connection");
- 	PQclear(ExecuteSqlQueryForSingleRow(AH, ALWAYS_SECURE_SEARCH_PATH_SQL));
- 
- 	/*
-@@ -1239,8 +1255,8 @@
- 	/*
- 	 * Quote all identifiers, if requested.
- 	 */
--	if (quote_all_identifiers)
--		ExecuteSqlStatement(AH, "SET quote_all_identifiers = true");
-+	if (fe_utils_quote_all_identifiers)
-+		ExecuteSqlStatement(AH, "SET fe_utils_quote_all_identifiers = true");
- 
- 	/*
- 	 * Adjust row-security mode, if supported.
diff --git a/patches/postgresql-wasm/src-bin-pg_dump-pg_dumpall.c.diff b/patches/postgresql-wasm/src-bin-pg_dump-pg_dumpall.c.diff
deleted file mode 100644
index 4dc0e1b64..000000000
--- a/patches/postgresql-wasm/src-bin-pg_dump-pg_dumpall.c.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- postgresql/src/bin/pg_dump/pg_dumpall.c
-+++ postgresql-wasm/src/bin/pg_dump/pg_dumpall.c
-@@ -14,7 +14,13 @@
-  */
- 
- #include "postgres_fe.h"
--
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
-+#ifdef quote_all_identifiers
-+#undef quote_all_identifiers
-+#endif
-+#define fe_utils_quote_all_identifiers quote_all_identifiers
-+static bool quote_all_identifiers;
-+#endif
- #include <time.h>
- #include <unistd.h>
- 
-@@ -163,7 +169,7 @@
- 		{"lock-wait-timeout", required_argument, NULL, 2},
- 		{"no-table-access-method", no_argument, &no_table_access_method, 1},
- 		{"no-tablespaces", no_argument, &no_tablespaces, 1},
--		{"quote-all-identifiers", no_argument, &quote_all_identifiers, 1},
-+		{"quote-all-identifiers", no_argument, &fe_utils_quote_all_identifiers, true},
- 		{"load-via-partition-root", no_argument, &load_via_partition_root, 1},
- 		{"role", required_argument, NULL, 3},
- 		{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
-@@ -434,7 +440,7 @@
- 		appendPQExpBufferStr(pgdumpopts, " --no-table-access-method");
- 	if (no_tablespaces)
- 		appendPQExpBufferStr(pgdumpopts, " --no-tablespaces");
--	if (quote_all_identifiers)
-+	if (fe_utils_quote_all_identifiers)
- 		appendPQExpBufferStr(pgdumpopts, " --quote-all-identifiers");
- 	if (load_via_partition_root)
- 		appendPQExpBufferStr(pgdumpopts, " --load-via-partition-root");
-@@ -534,8 +540,8 @@
- 	}
- 
- 	/* Force quoting of all identifiers if requested. */
--	if (quote_all_identifiers)
--		executeCommand(conn, "SET quote_all_identifiers = true");
-+	if (fe_utils_quote_all_identifiers)
-+		executeCommand(conn, "SET fe_utils_quote_all_identifiers = true");
- 
- 	fprintf(OPF, "--\n-- PostgreSQL database cluster dump\n--\n\n");
- 	if (verbose)
diff --git a/patches/postgresql-wasm/src-bin-pg_resetwal-pg_resetwal.c.diff b/patches/postgresql-wasm/src-bin-pg_resetwal-pg_resetwal.c.diff
deleted file mode 100644
index d3ceadab3..000000000
--- a/patches/postgresql-wasm/src-bin-pg_resetwal-pg_resetwal.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- postgresql/src/bin/pg_resetwal/pg_resetwal.c
-+++ postgresql-wasm/src/bin/pg_resetwal/pg_resetwal.c
-@@ -330,7 +330,7 @@
- 	 * -- any other user won't have sufficient permissions to modify files in
- 	 * the data directory.
- 	 */
--#ifndef WIN32
-+#if !defined(WIN32) && !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 	if (geteuid() == 0)
- 	{
- 		pg_log_error("cannot be executed by \"root\"");
diff --git a/patches/postgresql-wasm/src-common-exec.c.diff b/patches/postgresql-wasm/src-common-exec.c.diff
deleted file mode 100644
index 896a51fb0..000000000
--- a/patches/postgresql-wasm/src-common-exec.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- postgresql/src/common/exec.c
-+++ postgresql-wasm/src/common/exec.c
-@@ -22,7 +22,7 @@
-  * This should be harmless everywhere else.
-  */
- #define _DARWIN_BETTER_REALPATH
--
-+#define PG_EXEC
- #ifndef FRONTEND
- #include "postgres.h"
- #else
diff --git a/patches/postgresql-wasm/src-fe_utils-string_utils.c.diff b/patches/postgresql-wasm/src-fe_utils-string_utils.c.diff
deleted file mode 100644
index 3b11077d6..000000000
--- a/patches/postgresql-wasm/src-fe_utils-string_utils.c.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- postgresql/src/fe_utils/string_utils.c
-+++ postgresql-wasm/src/fe_utils/string_utils.c
-@@ -23,7 +23,9 @@
- static PQExpBuffer defaultGetLocalPQExpBuffer(void);
- 
- /* Globals exported by this file */
--int			quote_all_identifiers = 0;
-+bool			fe_utils_quote_all_identifiers = false;
-+
-+
- PQExpBuffer (*getLocalPQExpBuffer) (void) = defaultGetLocalPQExpBuffer;
- 
- 
-@@ -72,7 +74,7 @@
- 	 * These checks need to match the identifier production in scan.l. Don't
- 	 * use islower() etc.
- 	 */
--	if (quote_all_identifiers)
-+	if (fe_utils_quote_all_identifiers)
- 		need_quotes = true;
- 	/* slightly different rules for first character */
- 	else if (!((rawid[0] >= 'a' && rawid[0] <= 'z') || rawid[0] == '_'))
diff --git a/patches/postgresql-wasm/src-include-bootstrap-bootstrap.h.diff b/patches/postgresql-wasm/src-include-bootstrap-bootstrap.h.diff
deleted file mode 100644
index d6cd21be7..000000000
--- a/patches/postgresql-wasm/src-include-bootstrap-bootstrap.h.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- postgresql/src/include/bootstrap/bootstrap.h
-+++ postgresql-wasm/src/include/bootstrap/bootstrap.h
-@@ -31,8 +31,11 @@
- extern PGDLLIMPORT Form_pg_attribute attrtypes[MAXATTR];
- extern PGDLLIMPORT int numattr;
- 
--
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+    int BootstrapModeMain(int argc, char *argv[], bool check_only);
-+#else
- extern void BootstrapModeMain(int argc, char *argv[], bool check_only) pg_attribute_noreturn();
-+#endif
- 
- extern void closerel(char *relname);
- extern void boot_openrel(char *relname);
diff --git a/patches/postgresql-wasm/src-include-common-logging.h.diff b/patches/postgresql-wasm/src-include-common-logging.h.diff
deleted file mode 100644
index 6e78df2fd..000000000
--- a/patches/postgresql-wasm/src-include-common-logging.h.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- postgresql/src/include/common/logging.h
-+++ postgresql-wasm/src/include/common/logging.h
-@@ -91,7 +91,6 @@
- void		pg_logging_increase_verbosity(void);
- void		pg_logging_set_pre_callback(void (*cb) (void));
- void		pg_logging_set_locus_callback(void (*cb) (const char **filename, uint64 *lineno));
--
- void		pg_log_generic(enum pg_log_level level, enum pg_log_part part,
- 						   const char *pg_restrict fmt,...)
- 			pg_attribute_printf(3, 4);
diff --git a/patches/postgresql-wasm/src-include-fe_utils-string_utils.h.diff b/patches/postgresql-wasm/src-include-fe_utils-string_utils.h.diff
deleted file mode 100644
index e487e570a..000000000
--- a/patches/postgresql-wasm/src-include-fe_utils-string_utils.h.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- postgresql/src/include/fe_utils/string_utils.h
-+++ postgresql-wasm/src/include/fe_utils/string_utils.h
-@@ -16,11 +16,16 @@
- #ifndef STRING_UTILS_H
- #define STRING_UTILS_H
- 
-+#if !defined(__wasi__)
- #include "libpq-fe.h"
- #include "pqexpbuffer.h"
-+#else
-+#include "../interfaces/libpq/libpq-fe.h"
-+#include "../interfaces/libpq/pqexpbuffer.h"
-+#endif
- 
- /* Global variables controlling behavior of fmtId() and fmtQualifiedId() */
--extern PGDLLIMPORT int quote_all_identifiers;
-+extern PGDLLIMPORT bool quote_all_identifiers;
- extern PQExpBuffer (*getLocalPQExpBuffer) (void);
- 
- /* Functions */
diff --git a/patches/postgresql-wasm/src-include-libpq-be-fsstubs.h.diff b/patches/postgresql-wasm/src-include-libpq-be-fsstubs.h.diff
deleted file mode 100644
index 4fd069881..000000000
--- a/patches/postgresql-wasm/src-include-libpq-be-fsstubs.h.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- postgresql/src/include/libpq/be-fsstubs.h
-+++ postgresql-wasm/src/include/libpq/be-fsstubs.h
-@@ -19,8 +19,10 @@
-  * Probably these should have had the underscore-free names,
-  * but too late now...
-  */
--extern int	lo_read(int fd, char *buf, int len);
--extern int	lo_write(int fd, const char *buf, int len);
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
-+extern int	lo_read3(int fd, char *buf, int len);
-+extern int	lo_write3(int fd, const char *buf, int len);
-+#endif
- 
- /*
-  * Cleanup LOs at xact commit/abort
diff --git a/patches/postgresql-wasm/src-include-port-wasi.h.diff b/patches/postgresql-wasm/src-include-port-wasi.h.diff
deleted file mode 100644
index 67ed943f1..000000000
--- a/patches/postgresql-wasm/src-include-port-wasi.h.diff
+++ /dev/null
@@ -1,262 +0,0 @@
---- postgresql/src/include/port/wasi.h
-+++ postgresql-wasm/src/include/port/wasi.h
-@@ -0,0 +1,259 @@
-+#ifndef I_WASI
-+#define I_WASI
-+
-+#if defined(HAVE_SETSID)
-+#undef HAVE_SETSID
-+#endif
-+
-+#if defined(HAVE_GETRLIMIT)
-+#undef HAVE_GETRLIMIT
-+#endif
-+
-+
-+#define PLATFORM_DEFAULT_SYNC_METHOD    SYNC_METHOD_FDATASYNC
-+
-+#define EMSCRIPTEN_KEEPALIVE __attribute__((used))
-+#define __declspec( dllimport ) __attribute__((used))
-+
-+#define em_callback_func void
-+#define emscripten_set_main_loop(...)
-+#define emscripten_force_exit(...)
-+#define EM_JS(...)
-+
-+#include "/tmp/pglite/include/wasm_common.h"
-+
-+
-+static pid_t
-+fork(void) {
-+    puts("# 31: fork -1");
-+    return -1;
-+}
-+
-+
-+// TODO: socket here
-+// ==================================================================
-+
-+#include <sys/socket.h>
-+static int
-+listen(int sockfd, int backlog) {
-+    return 0;
-+}
-+
-+static struct group *_Nullable
-+getgrnam(const char *_Nullable name) {
-+    return NULL;
-+}
-+
-+static int
-+getsockname(int sockfd, struct sockaddr *restrict addr, socklen_t *restrict addrlen) {
-+    return -1;
-+}
-+
-+static int
-+getaddrinfo(const char *restrict node,
-+                   const char *restrict service,
-+                   void *restrict hints,
-+                   void **restrict res) {
-+    puts("# 60: getaddrinfo");
-+    return -1;
-+}
-+static void
-+freeaddrinfo(void *res) {
-+    puts("# 65: freeaddrinfo");
-+}
-+
-+extern ssize_t recvfrom_bc(int socket, void *buffer, size_t length, int flags, void *address, socklen_t *address_len);
-+
-+// ======== signal ========================
-+#define SA_RESTART 4
-+#define SIG_SETMASK   2
-+
-+#define SIG_BLOCK     0
-+#define SIG_UNBLOCK   1
-+
-+/* A signal handler.  */
-+typedef void (*handler_t) (int signal);
-+typedef unsigned char sigset_t;
-+typedef void (*__sighandler_t) (int);
-+
-+struct sigaction {
-+    __sighandler_t sa_handler;
-+    unsigned long sa_flags;
-+#ifdef SA_RESTORER
-+    __sigrestore_t sa_restorer;
-+#endif
-+    sigset_t sa_mask;
-+};
-+extern int sigemptyset(sigset_t *set);
-+extern int sigaction(int signum, const struct sigaction *act, struct sigaction *oldact);
-+extern int sigdelset (sigset_t *set, int sig);
-+extern int sigfillset (sigset_t *set);
-+extern int sigprocmask (int operation, const sigset_t *set, sigset_t *old_set);
-+extern int sigaddset (sigset_t *set, int sig);
-+
-+// STUBS
-+extern int pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset);
-+extern int sigismember(const sigset_t *set, int signum);
-+extern int sigpending(sigset_t *set);
-+extern int sigwait(const sigset_t *restrict set, int *restrict sig);
-+
-+// ====================================================
-+// unistd
-+extern unsigned int alarm(unsigned int seconds);
-+
-+// ====================================================
-+
-+
-+#include <setjmp.h>
-+
-+static int
-+sigsetjmp(sigjmp_buf env, int savesigs) {
-+//    puts("# 120: sigsetjmp");
-+    return 0;
-+}
-+
-+static void
-+siglongjmp(sigjmp_buf env, int val) {
-+    puts("# 120: siglongjmp");
-+}
-+
-+
-+
-+// WIP :
-+
-+#include <unistd.h>
-+static uid_t
-+getuid(void) {
-+    return 1000;
-+}
-+
-+static int
-+dup(int fd) {
-+    puts("# 128: dup");
-+    return fd;
-+}
-+static int
-+dup2(int old, int new) {
-+    puts("# 140: dup2");
-+    return -1;
-+}
-+static int
-+pipe(int fd[2]) {
-+    puts("# 145: pipe");
-+    abort();
-+    return -1;
-+}
-+
-+#include <sys/resource.h>
-+#define RLIMIT_NOFILE 7
-+#define RLIMIT_STACK 3
-+#define RLIM_INFINITY ((unsigned long int)(~0UL))
-+
-+struct rlimit {
-+    unsigned long   rlim_cur;
-+    unsigned long   rlim_max;
-+};
-+static int
-+getrlimit(int resource, struct rlimit *rlim) {
-+    return -1;
-+}
-+
-+
-+static const char *gai_strerror_msg = "# 165: gai_strerror_msg";
-+static const char *
-+gai_strerror(int errcode) {
-+    return gai_strerror_msg;
-+}
-+
-+
-+static int
-+getrusage(int who, struct rusage *usage) {
-+    return -1;
-+}
-+
-+// WIP: semaphores here
-+// ==================================================================
-+#include <sys/sem.h>
-+
-+static int
-+semctl(int semid, int semnum, int cmd, ...) {
-+    return 0; // -1;
-+}
-+
-+static int
-+semget(key_t key, int nsems, int semflg) {
-+#if 0 // PGDEBUG
-+    printf("# 213: semget(key_t key = %d, int nsems=%d, int semflg=%d)\n", key, nsems, semflg);
-+#endif
-+    return 1;
-+}
-+
-+static int
-+semop(int semid, struct sembuf *sops, size_t nsops) {
-+    return 0;  // -1;
-+}
-+
-+
-+
-+#include <sys/mman.h>
-+#if defined(PYDK)
-+extern int shm_open(const char *name, int oflag, mode_t mode);
-+extern int shm_unlink(const char *name);
-+#else
-+static int
-+shm_open(const char *name, int oflag, mode_t mode) {
-+    char tmpnam[128];
-+    int fd;
-+    snprintf(tmpnam, 128, "/tmp%s", name);
-+    fd=fileno(fopen(tmpnam, "w+"));
-+    fprintf(stderr, "# 212: shm_open(%s) => %d\n", tmpnam, fd);
-+    return fd;
-+}
-+
-+static int
-+shm_unlink(const char *name) {
-+    char tmpnam[128];
-+    snprintf(tmpnam, 128, "/tmp%s", name);
-+    fprintf(stderr, "# 220: shm_unlink(%s) STUB\n", tmpnam);
-+    return remove(tmpnam); // -1
-+}
-+
-+#endif
-+
-+// initdb chmod
-+#if defined(__wasi__)
-+    #define chmod(...) 0
-+#endif
-+
-+// popen
-+extern int pg_pclose(FILE *stream);
-+extern FILE * pg_popen(const char *command, const char *type);
-+#define popen(command, mode) pg_popen(command, mode)
-+#define pclose(stream) pg_pclose(stream)
-+
-+
-+
-+#define system(command) system_wasi(command)
-+extern int system_wasi(const char *command);
-+
-+
-+
-+// time.h
-+
-+static void
-+tzset(void) {
-+    puts("# 241: tzset(void) STUB");
-+}
-+
-+#if defined(PG_INITDB) || defined(FE_UTILS_PRINT) || defined(PG_DUMP_PARALLEL)
-+static void
-+__SIG_IGN(int param) {
-+}
-+#endif
-+
-+
-+extern void sock_flush();
-+
-+
-+#endif // I_WASI
-+
diff --git a/patches/postgresql-wasm/src-include-port-wasm_common.h.diff b/patches/postgresql-wasm/src-include-port-wasm_common.h.diff
deleted file mode 100644
index 01dc24fd5..000000000
--- a/patches/postgresql-wasm/src-include-port-wasm_common.h.diff
+++ /dev/null
@@ -1,312 +0,0 @@
---- postgresql/src/include/port/wasm_common.h
-+++ postgresql-wasm/src/include/port/wasm_common.h
-@@ -0,0 +1,309 @@
-+#define WAIT_USE_POLL 1
-+
-+#define HAVE_LINUX_EIDRM_BUG
-+/*
-+ * Set the default wal_sync_method to fdatasync.  With recent Linux versions,
-+ * xlogdefs.h's normal rules will prefer open_datasync, which (a) doesn't
-+ * perform better and (b) causes outright failures on ext4 data=journal
-+ * filesystems, because those don't support O_DIRECT.
-+ */
-+#define PLATFORM_DEFAULT_WAL_SYNC_METHOD	WAL_SYNC_METHOD_FDATASYNC
-+
-+// force the name used with --single
-+#if !defined(WASM_USERNAME)
-+#define WASM_USERNAME "postgres"
-+#endif
-+
-+// MEMFS ok files
-+#define IDB_PIPE_BOOT "/tmp/initdb.boot.txt"
-+#define IDB_PIPE_SINGLE "/tmp/initdb.single.txt"
-+
-+/* --------------- how to configure those when installed ? ---------------- */
-+
-+// socket emulation via file, need to go in PGDATA for nodefs mount in web mode
-+#define PGS_ILOCK "/tmp/pglite/base/.s.PGSQL.5432.lock.in"
-+#define PGS_IN    "/tmp/pglite/base/.s.PGSQL.5432.in"
-+#define PGS_OLOCK "/tmp/pglite/base/.s.PGSQL.5432.lock.out"
-+#define PGS_OUT   "/tmp/pglite/base/.s.PGSQL.5432.out"
-+
-+
-+#define PG_DEBUG_HEADER <pg_debug.h>
-+
-+
-+#if defined(PREFIX)
-+#define em_xstr(s) em_str(s)
-+#define em_str(s) #s
-+#   define WASM_PREFIX em_xstr(PREFIX)
-+#   define PG_MAIN_INCLUDE  em_xstr(PATCH_MAIN)
-+#   define PG_PLUGIN_INCLUDE  em_xstr(PATCH_PLUGIN
-+#   undef PG_DEBUG_HEADER
-+#   define PG_DEBUG_HEADER  em_xstr(PATCH_PG_DEBUG)
-+#else
-+#   define WASM_PREFIX "/pgdata"
-+#   define PG_MAIN_INCLUDE "/pgdata/pg_main.c"
-+#   define PG_PLUGIN_INCLUDE "/pgdata/pg_plugin.h"
-+#endif
-+
-+// #include PG_DEBUG_HEADER
-+#include "/tmp/pglite/include/pg_debug.h"
-+
-+
-+
-+
-+
-+// #define COPY_INTERNAL
-+#define COPY_OFF
-+#define PGDLLIMPORT
-+#define PG_FORCE_DISABLE_INLINE
-+
-+
-+
-+#define WASM_PGOPTS \
-+        "-c", "log_checkpoints=false",\
-+        "-c", "search_path=pg_catalog",\
-+        "-c", "exit_on_error=true",\
-+        "-c", "ignore_invalid_pages=on",\
-+        "-c", "temp_buffers=8MB",\
-+        "-c", "work_mem=4MB",\
-+        "-c", "fsync=on",\
-+        "-c", "synchronous_commit=on",\
-+        "-c", "wal_buffers=4MB",\
-+        "-c", "min_wal_size=80MB",\
-+        "-c", "shared_buffers=128MB"
-+
-+// we want client and server in the same lib for now.
-+#if defined(PG_INITDB) && defined(PG_MAIN)
-+extern const char *progname;
-+#endif
-+
-+// exported in ./src/fe_utils/string_utils.c
-+#include <stdbool.h>
-+extern PGDLLIMPORT bool fe_utils_quote_all_identifiers;
-+
-+extern int	pg_char_to_encoding_private(const char *name);
-+extern const char *pg_encoding_to_char_private(int encoding);
-+extern int	pg_valid_server_encoding_id_private(int encoding);
-+
-+#if defined(pg_char_to_encoding)
-+#undef pg_char_to_encoding
-+#endif
-+#define pg_char_to_encoding(encoding) pg_char_to_encoding_private(encoding)
-+
-+#if defined(pg_encoding_to_char)
-+#undef pg_encoding_to_char
-+#endif
-+#define pg_encoding_to_char(encoding) pg_encoding_to_char_private(encoding)
-+
-+#if defined(pg_valid_server_encoding_id)
-+#undef pg_valid_server_encoding_id
-+#endif
-+#define pg_valid_server_encoding_id(encoding) pg_valid_server_encoding_id_private(encoding)
-+
-+
-+/*
-+ * 'proc_exit' is a wasi system call, so change its name everywhere.
-+ */
-+
-+#define proc_exit(arg) pg_proc_exit(arg)
-+
-+
-+/*
-+ * popen is routed via pg_popen to stderr or a IDB_PIPE_* file
-+ * link a pclose replacement when we are in exec.c ( PG_EXEC defined )
-+ */
-+
-+
-+#if defined(PG_EXEC)
-+#define pclose(stream) pg_pclose(stream)
-+#include <stdio.h> // FILE
-+
-+EMSCRIPTEN_KEEPALIVE FILE*
-+SOCKET_FILE = NULL;
-+
-+EMSCRIPTEN_KEEPALIVE int
-+SOCKET_DATA = 0;
-+
-+EMSCRIPTEN_KEEPALIVE FILE*
-+IDB_PIPE_FP = NULL;
-+
-+EMSCRIPTEN_KEEPALIVE int
-+IDB_STAGE = 0;
-+
-+int pg_pclose(FILE *stream);
-+
-+int pg_pclose(FILE *stream) {
-+    if (IDB_STAGE==1)
-+        fprintf(stderr,"# pg_pclose(%s) 133:" __FILE__ "\n" , IDB_PIPE_BOOT);
-+    if (IDB_STAGE==2)
-+        fprintf(stderr,"# pg_pclose(%s) 135:" __FILE__ "\n" , IDB_PIPE_SINGLE);
-+
-+    if (IDB_PIPE_FP) {
-+        fflush(IDB_PIPE_FP);
-+        fclose(IDB_PIPE_FP);
-+        IDB_PIPE_FP = NULL;
-+    }
-+    return 0;
-+}
-+
-+
-+#endif // PG_EXEC
-+
-+
-+
-+/*
-+ * OpenPipeStream : another kind of pipe open in fd.c
-+ * known to try "locale -a" from collationcmds.c when in initdb.
-+ *
-+ */
-+#if defined(PG_FD)
-+#include <string.h>  // strlen
-+#include <unistd.h> // access+F_OK
-+#include <stdio.h> // FILE+fprintf
-+
-+FILE *wasm_OpenPipeStream(const char *command, const char *mode);
-+FILE *
-+wasm_OpenPipeStream(const char *command, const char *mode) {
-+
-+    FILE *result = NULL;
-+    const char *prefix = getenv("PGSYSCONFDIR");
-+    const char *locale = "/locale";
-+    char *localefile = malloc( strlen(prefix) + strlen(locale) + 1 );
-+    localefile = strcat(prefix,locale);
-+#if PGDEBUG
-+    fprintf(stderr, "# 232:%s: OpenPipeStream(command=%s, mode=%s)\n#\tredirected to %s\n", __FILE__, command, mode, localefile);
-+#endif
-+    if (localefile) {
-+        if (access(localefile, F_OK) != 0) {
-+            FILE *fakeloc = fopen(localefile, "w");
-+            {
-+                const char* encoding = getenv("PGCLIENTENCODING");
-+                fprintf(fakeloc, "C\nC.%s\nPOSIX\n%s\n", encoding, encoding);
-+            }
-+            if (fakeloc)
-+                fclose(fakeloc);
-+        }
-+        result = fopen(localefile, "r");
-+        free(localefile);
-+    }
-+
-+    return result;
-+}
-+
-+#else
-+#   define OpenPipeStream(cmd, mode) wasm_OpenPipeStream(cmd, mode)
-+#endif
-+
-+
-+
-+
-+
-+
-+/*
-+ *  handle pg_shmem.c special case
-+ */
-+
-+#if defined(PG_SHMEM)
-+#include <stdio.h>  // print
-+#include <stdlib.h> // malloc
-+#include <unistd.h> // SC_
-+#include <sys/shm.h>
-+#include <sys/stat.h>
-+
-+/*
-+ * Shared memory control operation.
-+ */
-+
-+//extern int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf);
-+
-+int
-+shmctl (int __shmid, int __cmd, struct shmid_ds *__buf) {
-+	printf("FIXME: int shmctl (int __shmid=%d, int __cmd=%d, struct shmid_ds *__buf=%p)\n", __shmid, __cmd, __buf);
-+	return 0;
-+}
-+
-+
-+volatile void *FAKE_SHM ;
-+volatile key_t FAKE_KEY = 0;
-+
-+/* Get shared memory segment.  */
-+// extern int shmget (key_t __key, size_t __size, int __shmflg);
-+int
-+shmget (key_t __key, size_t __size, int __shmflg) {
-+	printf("# FIXING: int shmget (key_t __key=%d, size_t __size=%zu, int __shmflg=%d) pagesize default=%d\n", __key, __size, __shmflg, getpagesize());
-+    if (!FAKE_KEY) {
-+    	FAKE_SHM =  malloc(__size);
-+        FAKE_KEY = 666;
-+        return (int)FAKE_KEY;
-+    } else {
-+    	printf("# ERROR: int shmget (key_t __key=%d, size_t __size=%zu, int __shmflg=%d)\n", __key, __size, __shmflg);
-+        //abort();
-+        return (int)FAKE_KEY;
-+    }
-+	return -1;
-+}
-+
-+/* Attach shared memory segment.  */
-+// extern void *shmat (int __shmid, const void *__shmaddr, int __shmflg);
-+void *shmat (int __shmid, const void *__shmaddr, int __shmflg) {
-+	printf("# FIXING: void *shmat (int __shmid=%d, const void *__shmaddr=%p, int __shmflg=%d)\n", __shmid, __shmaddr, __shmflg);
-+	if (__shmid==666) {
-+		return (void *)FAKE_SHM;
-+    } else {
-+    	printf("# ERROR: void *shmat (int __shmid=%d, const void *__shmaddr=%p, int __shmflg=%d)\n", __shmid, __shmaddr, __shmflg);
-+        abort();
-+    }
-+	return NULL;
-+}
-+
-+/* Detach shared memory segment.  */
-+// extern int shmdt (const void *__shmaddr);
-+int
-+shmdt (const void *__shmaddr) {
-+	puts("# FIXME: int shmdt (const void *__shmaddr)");
-+	return 0;
-+}
-+
-+
-+/*
-+typedef struct {
-+    pthread_mutex_t mutex;
-+    pthread_cond_t cond;
-+    int count;
-+} sem_t;
-+
-+int sem_init(sem_t *sem, int pshared, unsigned int value){
-+    if(pshared > 1) {
-+        return -1;
-+    }
-+    sem->count = value;
-+    pthread_mutex_init(&sem->mutex, NULL);
-+    pthread_cond_init(&sem->cond, NULL);
-+    return 0;
-+}
-+
-+int sem_destroy(sem_t *sem){
-+    pthread_mutex_destroy(&sem->mutex);
-+    pthread_cond_destroy(&sem->cond);
-+    return 0;
-+}
-+
-+int sem_wait(sem_t *sem){
-+    pthread_mutex_lock(&sem->mutex);
-+    while(sem->count == 0){
-+        pthread_cond_wait(&sem->cond, &sem->mutex);
-+    }
-+    sem->count--;
-+    pthread_mutex_unlock(&sem->mutex);
-+    return 0;
-+}
-+
-+int sem_post(sem_t *sem){
-+    pthread_mutex_lock(&sem->mutex);
-+    sem->count++;
-+    pthread_cond_signal(&sem->cond);
-+    pthread_mutex_unlock(&sem->mutex);
-+    return 0;
-+}
-+*/
-+
-+#endif // PG_SHMEM
diff --git a/patches/postgresql-wasm/src-include-storage-ipc.h.diff b/patches/postgresql-wasm/src-include-storage-ipc.h.diff
deleted file mode 100644
index 453484234..000000000
--- a/patches/postgresql-wasm/src-include-storage-ipc.h.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- postgresql/src/include/storage/ipc.h
-+++ postgresql-wasm/src/include/storage/ipc.h
-@@ -64,8 +64,11 @@
- /* ipc.c */
- extern PGDLLIMPORT bool proc_exit_inprogress;
- extern PGDLLIMPORT bool shmem_exit_inprogress;
--
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+extern void pg_proc_exit(int code);
-+#else
- extern void proc_exit(int code) pg_attribute_noreturn();
-+#endif
- extern void shmem_exit(int code);
- extern void on_proc_exit(pg_on_exit_callback function, Datum arg);
- extern void on_shmem_exit(pg_on_exit_callback function, Datum arg);
diff --git a/patches/postgresql-wasm/src-include-utils-elog.h.diff b/patches/postgresql-wasm/src-include-utils-elog.h.diff
deleted file mode 100644
index b304f8d4b..000000000
--- a/patches/postgresql-wasm/src-include-utils-elog.h.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- postgresql/src/include/utils/elog.h
-+++ postgresql-wasm/src/include/utils/elog.h
-@@ -137,6 +137,19 @@
-  * prevents gcc from making the unreachability deduction at optlevel -O0.
-  *----------
-  */
-+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-+#define ereport_domain(elevel, domain, ...)	\
-+	do { \
-+		pg_prevent_errno_in_scope(); \
-+		if (__builtin_constant_p(elevel) && (elevel) >= ERROR ? \
-+			errstart_cold(elevel, domain) : \
-+			errstart(elevel, domain)) \
-+			__VA_ARGS__, errfinish(__FILE__, __LINE__, __func__); \
-+		if (__builtin_constant_p(elevel) && (elevel) >= ERROR) \
-+			{ puts("# 149:pg_unreachable():" __FILE__); pg_unreachable(); } \
-+	} while(0)
-+
-+#else
- #ifdef HAVE__BUILTIN_CONSTANT_P
- #define ereport_domain(elevel, domain, ...)	\
- 	do { \
-@@ -159,7 +172,7 @@
- 			pg_unreachable(); \
- 	} while(0)
- #endif							/* HAVE__BUILTIN_CONSTANT_P */
--
-+#endif
- #define ereport(elevel, ...)	\
- 	ereport_domain(elevel, TEXTDOMAIN, __VA_ARGS__)
- 
diff --git a/patches/postgresql-wasm/src-include-utils-palloc.h.diff b/patches/postgresql-wasm/src-include-utils-palloc.h.diff
deleted file mode 100644
index a7115086e..000000000
--- a/patches/postgresql-wasm/src-include-utils-palloc.h.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- postgresql/src/include/utils/palloc.h
-+++ postgresql-wasm/src/include/utils/palloc.h
-@@ -56,7 +56,9 @@
-  * Avoid accessing it directly!  Instead, use MemoryContextSwitchTo()
-  * to change the setting.
-  */
-+#if !defined(PG_EXTERN)
- extern PGDLLIMPORT MemoryContext CurrentMemoryContext;
-+#endif
- 
- /*
-  * Flags for MemoryContextAllocExtended.
-@@ -132,7 +134,7 @@
-  * it's necessary to hide the inline definition of MemoryContextSwitchTo in
-  * this scenario; hence the #ifndef FRONTEND.
-  */
--
-+#if !defined(PG_EXTERN)
- #ifndef FRONTEND
- static inline MemoryContext
- MemoryContextSwitchTo(MemoryContext context)
-@@ -143,7 +145,8 @@
- 	return old;
- }
- #endif							/* FRONTEND */
--
-+#else
-+#endif
- /* Registration of memory context reset/delete callbacks */
- extern void MemoryContextRegisterResetCallback(MemoryContext context,
- 											   MemoryContextCallback *cb);
diff --git a/patches/postgresql-wasm/src-interfaces-libpq-fe-auth.c.diff b/patches/postgresql-wasm/src-interfaces-libpq-fe-auth.c.diff
deleted file mode 100644
index d66a268ba..000000000
--- a/patches/postgresql-wasm/src-interfaces-libpq-fe-auth.c.diff
+++ /dev/null
@@ -1,68 +0,0 @@
---- postgresql/src/interfaces/libpq/fe-auth.c
-+++ postgresql-wasm/src/interfaces/libpq/fe-auth.c
-@@ -962,10 +962,10 @@
- pg_fe_sendauth(AuthRequest areq, int payloadlen, PGconn *conn)
- {
- 	int			oldmsglen;
--
-+puts("965");
- 	if (!check_expected_areq(areq, conn))
- 		return STATUS_ERROR;
--
-+puts("968");
- 	switch (areq)
- 	{
- 		case AUTH_REQ_OK:
-@@ -1091,7 +1091,7 @@
- 		case AUTH_REQ_PASSWORD:
- 			{
- 				char	   *password;
--
-+puts("1094");
- 				conn->password_needed = true;
- 				password = conn->connhost[conn->whichhost].password;
- 				if (password == NULL)
-@@ -1106,9 +1106,10 @@
- 				{
- 					appendPQExpBufferStr(&conn->errorMessage,
- 										 "fe_sendauth: error sending password authentication\n");
-+puts("1109");
- 					return STATUS_ERROR;
- 				}
--
-+puts("1112");
- 				/* We expect no further authentication requests. */
- 				conn->client_finished_auth = true;
- 				break;
-@@ -1148,10 +1149,11 @@
- 			break;
- 
- 		default:
-+puts(" ----------- 1151 ---------------");
- 			libpq_append_conn_error(conn, "authentication method %u not supported", areq);
- 			return STATUS_ERROR;
- 	}
--
-+puts("1156");
- 	return STATUS_OK;
- }
- 
-@@ -1170,6 +1172,7 @@
- pg_fe_getusername(uid_t user_id, PQExpBuffer errorMessage)
- {
- 	char	   *result = NULL;
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- 	const char *name = NULL;
- 
- #ifdef WIN32
-@@ -1202,7 +1205,9 @@
- 	else if (errorMessage)
- 		appendPQExpBuffer(errorMessage, "%s\n", pwdbuf);
- #endif
--
-+#else
-+	const char *name = getenv("PGUSER");
-+#endif
- 	if (name)
- 	{
- 		result = strdup(name);
diff --git a/patches/postgresql-wasm/src-interfaces-libpq-fe-exec.c.diff b/patches/postgresql-wasm/src-interfaces-libpq-fe-exec.c.diff
deleted file mode 100644
index ddffa692b..000000000
--- a/patches/postgresql-wasm/src-interfaces-libpq-fe-exec.c.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- postgresql/src/interfaces/libpq/fe-exec.c
-+++ postgresql-wasm/src/interfaces/libpq/fe-exec.c
-@@ -1680,6 +1680,7 @@
- static bool
- PQsendQueryStart(PGconn *conn, bool newQuery)
- {
-+PDEBUG("PQsendQueryStart");
- 	if (!conn)
- 		return false;
- 
diff --git a/patches/postgresql-wasm/src-interfaces-libpq-legacy-pqsignal.c.diff b/patches/postgresql-wasm/src-interfaces-libpq-legacy-pqsignal.c.diff
deleted file mode 100644
index b2f0b19c8..000000000
--- a/patches/postgresql-wasm/src-interfaces-libpq-legacy-pqsignal.c.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- postgresql/src/interfaces/libpq/legacy-pqsignal.c
-+++ postgresql-wasm/src/interfaces/libpq/legacy-pqsignal.c
-@@ -32,6 +32,7 @@
-  * non-ENABLE_THREAD_SAFETY builds), so the incompatibility isn't
-  * troublesome for internal references.
-  */
-+#if !defined(__EMSCRIPTEN__) && !defined(__wasi__)
- pqsigfunc
- pqsignal(int signo, pqsigfunc func)
- {
-@@ -55,3 +56,4 @@
- 	return signal(signo, func);
- #endif
- }
-+#endif /* __EMSCRIPTEN__ || __wasi__ */
diff --git a/patches/postgresql-wasm/src-makefiles-Makefile.wasi.diff b/patches/postgresql-wasm/src-makefiles-Makefile.wasi.diff
deleted file mode 100644
index 87fe9ebd9..000000000
--- a/patches/postgresql-wasm/src-makefiles-Makefile.wasi.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- postgresql/src/makefiles/Makefile.wasi
-+++ postgresql-wasm/src/makefiles/Makefile.wasi
-@@ -0,0 +1,8 @@
-+# Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH.
-+# This allows LD_LIBRARY_PATH to still work when needed.
-+rpath = 
-+AROPT = crs
-+
-+# Rule for building a shared library from a single .o file
-+%.so: %.o
-+	$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
diff --git a/patches/postgresql-wasm/src-template-wasi.diff b/patches/postgresql-wasm/src-template-wasi.diff
deleted file mode 100644
index 0b12d8b60..000000000
--- a/patches/postgresql-wasm/src-template-wasi.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- postgresql/src/template/wasi
-+++ postgresql-wasm/src/template/wasi
-@@ -0,0 +1,14 @@
-+# src/template/emscripten
-+
-+# Prefer unnamed POSIX semaphores if available, unless user overrides choice
-+if test x"$PREFERRED_SEMAPHORES" = x"" ; then
-+  PREFERRED_SEMAPHORES=UNNAMED_POSIX
-+fi
-+
-+# Force _GNU_SOURCE on; plperl is broken with Perl 5.8.0 otherwise
-+# This is also required for ppoll(2), and perhaps other things
-+CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-+
-+# Extra CFLAGS for code that will go into a shared library
-+CFLAGS_SL="-fPIC"
-+
diff --git a/patches/wasi_port.c b/patches/wasi_port.c
index 14fd3638b..2f6207d82 100644
--- a/patches/wasi_port.c
+++ b/patches/wasi_port.c
@@ -594,4 +594,9 @@ ssize_t recv(int sockfd, void *buf, size_t len, int flags) {
 }
 
 
+pid_t waitpid(pid_t pid, int *status, int options) {
+    fputs(__FILE__ ": pid_t waitpid(pid_t pid, int *status, int options) STUB", stderr);
+    return -1;
+}
+