tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small windows build fixes

Browse Source
This commit is contained in:
Jean-Francois Dockes 2022-01-17 15:46:32 +00:00
parent b118c93b4f
commit 266967bea7
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/utils/pxattr.cpp
View File

@ -50,8 +50,12 @@
#define HAS_NO_XATTR #define HAS_NO_XATTR
#endif #endif
#if defined(__FreeBSD__) || defined(PXALINUX) || defined(__APPLE__) \ #if defined(_MSC_VER)
|| defined(HAS_NO_XATTR) #define ssize_t int
#endif
#if defined(__FreeBSD__) || defined(PXALINUX) || defined(__APPLE__) || defined(HAS_NO_XATTR)
#ifndef TEST_PXATTR #ifndef TEST_PXATTR
@ -73,6 +77,9 @@
#endif #endif
#include "pxattr.h" #include "pxattr.h"
#ifndef PRETEND_USE
#define PRETEND_USE(var) ((void)var)
#endif
namespace pxattr { namespace pxattr {
@ -102,7 +109,6 @@ get(int fd, const string& path, const string& _name, string *value,
ssize_t ret = -1; ssize_t ret = -1;
AutoBuf buf; AutoBuf buf;
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
if (fd < 0) { if (fd < 0) {
if (flags & PXATTR_NOFOLLOW) { if (flags & PXATTR_NOFOLLOW) {
@ -179,6 +185,9 @@ get(int fd, const string& path, const string& _name, string *value,
ret = fgetxattr(fd, name.c_str(), buf.buf, ret, 0, 0); ret = fgetxattr(fd, name.c_str(), buf.buf, ret, 0, 0);
} }
#else #else
PRETEND_USE(fd);
PRETEND_USE(flags);
PRETEND_USE(path);
errno = ENOTSUP; errno = ENOTSUP;
#endif #endif
@ -276,6 +285,10 @@ set(int fd, const string& path, const string& _name,
value.length(), 0, opts); value.length(), 0, opts);
} }
#else #else
PRETEND_USE(fd);
PRETEND_USE(flags);
PRETEND_USE(value);
PRETEND_USE(path);
errno = ENOTSUP; errno = ENOTSUP;
#endif #endif
return ret >= 0; return ret >= 0;
@ -323,6 +336,9 @@ del(int fd, const string& path, const string& _name, flags flags, nspace dom)
ret = fremovexattr(fd, name.c_str(), 0); ret = fremovexattr(fd, name.c_str(), 0);
} }
#else #else
PRETEND_USE(fd);
PRETEND_USE(flags);
PRETEND_USE(path);
errno = ENOTSUP; errno = ENOTSUP;
#endif #endif
return ret >= 0; return ret >= 0;
@ -407,6 +423,10 @@ list(int fd, const string& path, vector<string>* names, flags flags, nspace dom)
ret = flistxattr(fd, buf.buf, ret, 0); ret = flistxattr(fd, buf.buf, ret, 0);
} }
#else #else
PRETEND_USE(fd);
PRETEND_USE(flags);
PRETEND_USE(dom);
PRETEND_USE(path);
errno = ENOTSUP; errno = ENOTSUP;
#endif #endif
@ -497,7 +517,7 @@ bool sysname(nspace dom, const string& pname, string* sname)
return true; return true;
} }
bool pxname(nspace dom, const string& sname, string* pname) bool pxname(nspace, const string& sname, string* pname)
{ {
if (!userstring.empty() && sname.find(userstring) != 0) { if (!userstring.empty() && sname.find(userstring) != 0) {
errno = EINVAL; errno = EINVAL;

6
src/windows/mimeconf
View File

@ -11,8 +11,6 @@ application/x-compress = uncompress rcluncomp.py 7z %f %t
application/x-bzip2 = uncompress rcluncomp.py 7z %f %t application/x-bzip2 = uncompress rcluncomp.py 7z %f %t
application/x-xz = uncompress rcluncomp.py 7z %f %t application/x-xz = uncompress rcluncomp.py 7z %f %t
application/x-lzma = uncompress rcluncomp.py 7z %f %t application/x-lzma = uncompress rcluncomp.py 7z %f %t
application/x-scribus =
application/x-tex =
[index] [index]
@ -21,7 +19,11 @@ application/vnd.wordperfect = exec wpd/wpd2html;mimetype=text/html
application/x-dvi = application/x-dvi =
application/x-gnuinfo = application/x-gnuinfo =
application/x-ipynb+json = execm rclipynb.py application/x-ipynb+json = execm rclipynb.py
application/x-kword =
application/x-lyx =
application/x-scribus =
application/x-tar = application/x-tar =
application/x-tex =
image/gif = execm rclimg.exe image/gif = execm rclimg.exe
image/jp2 = execm rclimg.exe image/jp2 = execm rclimg.exe
image/jpeg = execm rclimg.exe image/jpeg = execm rclimg.exe