From 192a9d54d1f042c7cc5d3d350f984e85a33af961 Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Thu, 4 Aug 2016 17:10:02 -0400 Subject: [PATCH] make fs_attr compile on unsupported platforms --- src/fs_attr.cpp | 116 ++------------------------------ src/fs_attr_linux.icpp | 127 +++++++++++++++++++++++++++++++++++ src/fs_attr_unsupported.icpp | 37 ++++++++++ 3 files changed, 169 insertions(+), 111 deletions(-) create mode 100644 src/fs_attr_linux.icpp create mode 100644 src/fs_attr_unsupported.icpp diff --git a/src/fs_attr.cpp b/src/fs_attr.cpp index d9860f7b..6a5ea619 100644 --- a/src/fs_attr.cpp +++ b/src/fs_attr.cpp @@ -14,114 +14,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include - -#include - -using std::string; - -namespace fs -{ - namespace attr - { - static - int - get_fs_ioc_flags(const int fd, - int &flags) - { - return ::ioctl(fd,FS_IOC_GETFLAGS,&flags); - } - - static - int - get_fs_ioc_flags(const string &file, - int &flags) - { - int fd; - int rv; - const int openflags = O_RDONLY|O_NONBLOCK; - - fd = ::open(file.c_str(),openflags); - if(fd == -1) - return -1; - - rv = get_fs_ioc_flags(fd,flags); - if(rv == -1) - { - int error = errno; - ::close(fd); - errno = error; - return -1; - } - - return ::close(fd); - } - - static - int - set_fs_ioc_flags(const int fd, - const int flags) - { - return ::ioctl(fd,FS_IOC_SETFLAGS,&flags); - } - - static - int - set_fs_ioc_flags(const string &file, - const int flags) - { - int fd; - int rv; - const int openflags = O_RDONLY|O_NONBLOCK; - - fd = ::open(file.c_str(),openflags); - if(fd == -1) - return -1; - - rv = set_fs_ioc_flags(fd,flags); - if(rv == -1) - { - int error = errno; - ::close(fd); - errno = error; - return -1; - } - - return ::close(fd); - } - - int - copy(const int fdin, - const int fdout) - { - int rv; - int flags; - - rv = get_fs_ioc_flags(fdin,flags); - if(rv == -1) - return -1; - - return set_fs_ioc_flags(fdout,flags); - } - - int - copy(const string &from, - const string &to) - { - int rv; - int flags; - - rv = get_fs_ioc_flags(from,flags); - if(rv == -1) - return -1; - - return set_fs_ioc_flags(to,flags); - } - } -} +#ifdef __linux__ +# include "fs_attr_linux.icpp" +#else +# include "fs_attr_unsupported.icpp" +#endif diff --git a/src/fs_attr_linux.icpp b/src/fs_attr_linux.icpp new file mode 100644 index 00000000..d9860f7b --- /dev/null +++ b/src/fs_attr_linux.icpp @@ -0,0 +1,127 @@ +/* + Copyright (c) 2016, Antonio SJ Musumeci + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#include +#include +#include +#include +#include +#include +#include + +#include + +using std::string; + +namespace fs +{ + namespace attr + { + static + int + get_fs_ioc_flags(const int fd, + int &flags) + { + return ::ioctl(fd,FS_IOC_GETFLAGS,&flags); + } + + static + int + get_fs_ioc_flags(const string &file, + int &flags) + { + int fd; + int rv; + const int openflags = O_RDONLY|O_NONBLOCK; + + fd = ::open(file.c_str(),openflags); + if(fd == -1) + return -1; + + rv = get_fs_ioc_flags(fd,flags); + if(rv == -1) + { + int error = errno; + ::close(fd); + errno = error; + return -1; + } + + return ::close(fd); + } + + static + int + set_fs_ioc_flags(const int fd, + const int flags) + { + return ::ioctl(fd,FS_IOC_SETFLAGS,&flags); + } + + static + int + set_fs_ioc_flags(const string &file, + const int flags) + { + int fd; + int rv; + const int openflags = O_RDONLY|O_NONBLOCK; + + fd = ::open(file.c_str(),openflags); + if(fd == -1) + return -1; + + rv = set_fs_ioc_flags(fd,flags); + if(rv == -1) + { + int error = errno; + ::close(fd); + errno = error; + return -1; + } + + return ::close(fd); + } + + int + copy(const int fdin, + const int fdout) + { + int rv; + int flags; + + rv = get_fs_ioc_flags(fdin,flags); + if(rv == -1) + return -1; + + return set_fs_ioc_flags(fdout,flags); + } + + int + copy(const string &from, + const string &to) + { + int rv; + int flags; + + rv = get_fs_ioc_flags(from,flags); + if(rv == -1) + return -1; + + return set_fs_ioc_flags(to,flags); + } + } +} diff --git a/src/fs_attr_unsupported.icpp b/src/fs_attr_unsupported.icpp new file mode 100644 index 00000000..68c87b79 --- /dev/null +++ b/src/fs_attr_unsupported.icpp @@ -0,0 +1,37 @@ +/* + Copyright (c) 2016, Antonio SJ Musumeci + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#include + +namespace fs +{ + namespace attr + { + int + copy(const int fdin, + const int fdout) + { + return ENOTSUP; + } + + int + copy(const string &from, + const string &to) + { + return ENOTSUP; + } + } +}