(couchdb) 01/01: Fix couch_cfile on Windows

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch fix-cfile-on-windows
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 2fe18854d2ef531be81b2b39e369ac0c8a642ce7
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Sat Feb 22 14:35:35 2025 -0500

    Fix couch_cfile on Windows
    
    Load it opportunisticly, and if it's not available on some platforms
    keep returning {error, einval}, couch_file already expects that.
---
 src/couch/priv/couch_cfile/couch_cfile.c |  4 +--
 src/couch/src/couch_cfile.erl            | 45 ++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/couch/priv/couch_cfile/couch_cfile.c b/src/couch/priv/couch_cfile/couch_cfile.c
index 36ac0c673..06328b069 100644
--- a/src/couch/priv/couch_cfile/couch_cfile.c
+++ b/src/couch/priv/couch_cfile/couch_cfile.c
@@ -25,8 +25,6 @@
 #include "erl_driver.h"
 #include "erl_nif.h"
 
-#endif
-
 static ErlNifResourceType* HANDLE_T;
 static ErlNifPid JANITOR_PID;
 
@@ -719,3 +717,5 @@ static ErlNifFunc funcs[] = {
 };
 
 ERL_NIF_INIT(couch_cfile, funcs, load, NULL, NULL, NULL);
+
+#endif
diff --git a/src/couch/src/couch_cfile.erl b/src/couch/src/couch_cfile.erl
index e4d2835fc..3511fc162 100644
--- a/src/couch/src/couch_cfile.erl
+++ b/src/couch/src/couch_cfile.erl
@@ -216,16 +216,21 @@ write_1(Ref, IOVec) ->
     end.
 
 init() ->
-    PrivDir =
-        case code:priv_dir(?MODULE) of
-            {error, _} ->
-                EbinDir = filename:dirname(code:which(?MODULE)),
-                AppPath = filename:dirname(EbinDir),
-                filename:join(AppPath, "priv");
-            Path ->
-                Path
-        end,
-    erlang:load_nif(filename:join(PrivDir, "couch_cfile"), spawn_janitor()).
+    case os:type() of
+        {unix, _} ->
+            PrivDir =
+                case code:priv_dir(?MODULE) of
+                    {error, _} ->
+                        EbinDir = filename:dirname(code:which(?MODULE)),
+                        AppPath = filename:dirname(EbinDir),
+                        filename:join(AppPath, "priv");
+                    Path ->
+                        Path
+                end,
+            erlang:load_nif(filename:join(PrivDir, "couch_cfile"), spawn_janitor());
+        {_, _} ->
+            ok
+    end.
 
 % Spawn a janitor process to run all the delayed close calls on the dirty IO
 % schedulers. This is what OTP does, so we stick to the same pattern in order
@@ -255,31 +260,31 @@ loop() ->
     loop().
 
 dup_nif(_) ->
-    erlang:nif_error(nif_not_loaded).
+    {error, einval}.
 
 close_nif(_) ->
-    erlang:nif_error(nif_not_loaded).
+    {error, einval}.
 
 close_fd_nif(_) ->
-    erlang:nif_error(nif_not_loaded).
+    {error, einval}.
 
 pread_nif(_, _, _) ->
-    erlang:nif_error(nif_not_loaded).
+    {error, einval}.
 
 eof_nif(_) ->
-    erlang:nif_error(nif_not_loaded).
+    {error, einval}.
 
 info_nif(_) ->
-    erlang:nif_error(nif_not_loaded).
+    {error, einval}.
 
 seek_nif(_, _, _) ->
-    erlang:nif_error(nif_not_loaded).
+    {error, einval}.
 
 write_nif(_, _) ->
-    erlang:nif_error(nif_not_loaded).
+    {error, einval}.
 
 datasync_nif(_) ->
-    erlang:nif_error(nif_not_loaded).
+    {error, einval}.
 
 truncate_nif(_) ->
-    erlang:nif_error(nif_not_loaded).
+    {error, einval}.