extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-11-22 16:03:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove ulockmgr support, since it isn't needed

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@11 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2008-03-23 05:04:23 +00:00
parent 1953986995
commit e8e2a6a610
4 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -66,8 +66,6 @@ AC_CHECK_LIB(fuse,fuse_new, [FUSE_LIBS="-lfuse"],
and rerun configure, eg: and rerun configure, eg:
export LDFLAGS=-L/usr/local/lib ])],) export LDFLAGS=-L/usr/local/lib ])],)
AC_CHECK_HEADERS([ulockmgr.h])
AC_CHECK_LIB(ulockmgr,ulockmgr_op, [FUSE_LIBS="$FUSE_LIBS -lulockmgr"])
AC_SUBST(FUSE_LIBS) AC_SUBST(FUSE_LIBS)
# check for a supported FUSE_MAJOR_VERSION. # check for a supported FUSE_MAJOR_VERSION.

34
encfs/encfs.cpp
View File

@ -37,12 +37,6 @@
#include <sys/xattr.h> #include <sys/xattr.h>
#endif #endif
#ifdef HAVE_ULOCKMGR_H
extern "C" {
#include <ulockmgr.h>
}
#endif
#include <string> #include <string>
#include <map> #include <map>
@ -756,31 +750,3 @@ int encfs_removexattr( const char *path, const char *name )
} }
#endif // HAVE_XATTR #endif // HAVE_XATTR
#ifdef HAVE_ULOCKMGR_H
int _do_lock(FileNode *fnode,
tuple<int, struct flock *, struct fuse_file_info *> data)
{
int cmd = data.get<0>();
struct flock *lock = data.get<1>();
struct fuse_file_info *fi = data.get<2>();
int fh = fnode->open( O_RDONLY );
if(fh >= 0)
{
return ulockmgr_op(fh, cmd, lock, &fi->lock_owner,
sizeof(fi->lock_owner));
} else
{
rInfo("open failed in lock of %s", fnode->cipherName());
return fh;
}
}
int encfs_lock( const char *path, struct fuse_file_info *fi, int cmd,
struct flock *lock)
{
return withFileNode( "lock", path, fi,
_do_lock, make_tuple(cmd, lock, fi) );
}
#endif

6
encfs/encfs.h
View File

@ -92,12 +92,6 @@ int encfs_listxattr( const char *path, char *list, size_t size );
int encfs_removexattr( const char *path, const char *name ); int encfs_removexattr( const char *path, const char *name );
#endif #endif
#ifdef HAVE_ULOCKMGR_H
struct flock;
int encfs_lock( const char *path, struct fuse_file_info *fi, int cmd,
struct flock *lock );
#endif
int encfs_utimens( const char *path, const struct timespec ts[2] ); int encfs_utimens( const char *path, const struct timespec ts[2] );
#endif #endif

3
encfs/main.cpp
View File

@ -558,9 +558,6 @@ int main(int argc, char *argv[])
//encfs_oper.create = encfs_create; //encfs_oper.create = encfs_create;
encfs_oper.ftruncate = encfs_ftruncate; encfs_oper.ftruncate = encfs_ftruncate;
encfs_oper.fgetattr = encfs_fgetattr; encfs_oper.fgetattr = encfs_fgetattr;
#ifdef HAVE_ULOCKMGR_H
encfs_oper.lock = encfs_lock;
#endif // HAVE_ULOCKMGR_H
encfs_oper.utimens = encfs_utimens; encfs_oper.utimens = encfs_utimens;
//encfs_oper.bmap = encfs_bmap; //encfs_oper.bmap = encfs_bmap;