patches/qbittorrent-01-filesystemwatcher.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3734 bf06364afbe2
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3734
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
     1
--- qbittorrent-2.8.4/src/filesystemwatcher.h.orig	2011-08-09 17:25:33.000000000 +0000
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
     2
+++ qbittorrent-2.8.4/src/filesystemwatcher.h	2011-08-29 00:11:21.834669128 +0000
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
     3
@@ -16,6 +16,9 @@
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
     4
 #include <sys/param.h>
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
     5
 #include <sys/mount.h>
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
     6
 #include <string.h>
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
     7
+#elif defined (Q_OS_SOLARIS)
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
     8
+#include <sys/types.h>
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
     9
+#include <sys/statvfs.h>
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    10
 #else
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    11
 #include <sys/vfs.h>
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    12
 #endif
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    13
@@ -62,11 +65,18 @@
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    14
     if(!file.endsWith(QDir::separator()))
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    15
       file += QDir::separator();
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    16
     file += ".";
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    17
+#ifdef Q_OS_SOLARIS
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    18
+    struct statvfs buf;
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    19
+    if(!statvfs(file.toLocal8Bit().constData(), &buf)) {
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    20
+#else
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    21
     struct statfs buf;
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    22
     if(!statfs(file.toLocal8Bit().constData(), &buf)) {
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    23
+#endif
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    24
 #ifdef Q_WS_MAC
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    25
       // XXX: should we make sure HAVE_STRUCT_FSSTAT_F_FSTYPENAME is defined?
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    26
       return (strcmp(buf.f_fstypename, "nfs") == 0 || strcmp(buf.f_fstypename, "cifs") == 0 || strcmp(buf.f_fstypename, "smbfs") == 0);
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    27
+#elif defined (Q_OS_SOLARIS)
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    28
+      return (buf.f_fsid == (long)CIFS_MAGIC_NUMBER || buf.f_fsid == (long)NFS_SUPER_MAGIC || buf.f_fsid == (long)SMB_SUPER_MAGIC);
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    29
 #else
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    30
       return (buf.f_type == (long)CIFS_MAGIC_NUMBER || buf.f_type == (long)NFS_SUPER_MAGIC || buf.f_type == (long)SMB_SUPER_MAGIC);
bf06364afbe2 SFEqbittorrent.spec: initial spec
viskov
parents:
diff changeset
    31
 #endif