perhaps POSIX fcntl() should be used instead of flock() for setting file locking options, at least for SunOS

[risto3]

Please find the patch needed to complete the build on SunOS:

Code: Select all

--- src/putty/unix/uxshare.c.orig       2014-12-18 15:15:44.000000000 +0000
+++ src/putty/unix/uxshare.c
@@ -295,6 +295,13 @@ int platform_ssh_share(const char *pi_na
     int lockfd;
     Socket retsock;
 
+    struct flock lock;
+
+    lock.l_type = F_WRLCK;
+    lock.l_whence = SEEK_SET;
+    lock.l_start = 0;
+    lock.l_len = 0;
+
     /*
      * Sort out what we're going to call the directory in which we
      * keep the socket. This has the side effect of potentially
@@ -326,9 +333,15 @@ int platform_ssh_share(const char *pi_na
         sfree(lockname);
         return SHARE_NONE;
     }
+#ifdef __sun
+    if (fcntl(lockfd, F_SETLK, &lock) == -1) {
+        *logtext = dupprintf("%s: fcntl(F_SETLK): %s",
+                             lockname, strerror(errno));
+#else
     if (flock(lockfd, LOCK_EX) < 0) {
         *logtext = dupprintf("%s: flock(LOCK_EX): %s",
                              lockname, strerror(errno));
+#endif
         sfree(dirname);
         sfree(lockname);
         close(lockfd);

[botg]

Hmm, that's in PuTTY code. I wonder why PuTTY uses flock at all instead of fcntl.

Sadly unconditionally changing it to fcntl is problematic if one were to run unchanged and changed versions on the same platform

I'll bring this up for discussion on the PuTTY mailinglist.

[awatkins1966]

Thanks for the patch to get FileZilla client working on Oracle Solaris 11.4.

Yes, it would be great if this code could find it's way into putty.

Thanks

[boco]

Given the date of the last post, it could be in, already.

[awatkins1966]

Nope!
Checked latest putty version and it has the old version in it. So, still waiting for putty to be updated.