Use nxdialog as nxclient replacement

if neither NX_CLIENT ist provided nor /usr/NX/bin/nxclient is existing try /usr/bin/nxdialog. Currently the path is hardcoded.

Use nxdialog as nxclient replacement
46c8dce9 · Ulrich Sibiller · Mike Gabriel · db105546 · 46c8dce9
Commit 46c8dce9 authored May 05, 2020 by Ulrich Sibiller Committed by Mike Gabriel May 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 5 deletions

Loop.cpp nxcomp/src/Loop.cpp +15 -5

No files found.
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -9842,19 +9842,29 @@ char *GetClientPath()
      //
      // Try to guess the location of the client.
      //
-
-      clientEnv = "/usr/NX/bin/nxclient";
+      // FIXME: replace hardcoded paths by built-time variables if possible

      #ifdef __APPLE__

      clientEnv = "/Applications/NX Client for OSX.app/Contents/MacOS/nxclient";

-      #endif
-
-      #ifdef __CYGWIN32__
+      #else
+      #  if defined(__CYGWIN32__)

      clientEnv = "C:\\Program Files\\NX Client for Windows\\nxclient";

+      #  else
+
+      clientEnv = "/usr/NX/bin/nxclient";
+
+      struct stat fileStat;
+
+      if ((stat(clientEnv, &fileStat) == -1) && (EGET() == ENOENT))
+      {
+        clientEnv = "/usr/bin/nxdialog";
+      }
+
+      #  endif
      #endif
    }