From f1e050c83f9e2c24c6634f8f3679af8c75ff241d Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Tue, 8 Aug 2017 17:45:28 -0400 Subject: [PATCH] compile on OS X --- src/finder_info.cpp | 2 +- src/resource_fork.cpp | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/finder_info.cpp b/src/finder_info.cpp index 1540555..187ddf6 100644 --- a/src/finder_info.cpp +++ b/src/finder_info.cpp @@ -52,7 +52,7 @@ namespace { void remap_enoattr(std::error_code &ec) { if (ec.value() == ENOATTR) - ec = std::make_error_code(std::errc:no_message_available); + ec = std::make_error_code(std::errc::no_message_available); } #else void remap_enoattr(std::error_code &ec) {} diff --git a/src/resource_fork.cpp b/src/resource_fork.cpp index 97f4455..2a54fe8 100644 --- a/src/resource_fork.cpp +++ b/src/resource_fork.cpp @@ -21,9 +21,12 @@ #include "xattr.h" #endif -#ifdef __APPLE_ +#ifdef __APPLE__ #include #include +#ifndef _PATH_RSRCFORKSPEC +#define _PATH_RSRCFORKSPEC "/..namedfork/rsrc" +#endif #endif #if defined(__linux__) @@ -51,7 +54,7 @@ namespace { void remap_enoattr(std::error_code &ec) { if (ec.value() == ENOATTR) - ec = std::make_error_code(std::errc:no_message_available); + ec = std::make_error_code(std::errc::no_message_available); } #else void remap_enoattr(std::error_code &ec) {} @@ -330,7 +333,7 @@ namespace afp { int umode = 0; switch(mode) { case read_only: umode = O_RDONLY; break; - case write_only umode = O_WRONLY | O_CREAT; break; + case write_only: umode = O_WRONLY | O_CREAT; break; case read_write: umode = O_RDWR | O_CREAT; break; } @@ -354,7 +357,7 @@ namespace afp { #ifdef __APPLE__ #define FD_RESOURCE_FORK - bool open(const std::string &path, open_mode mode, std::error_code &ec) { + bool resource_fork::open(const std::string &path, open_mode mode, std::error_code &ec) { ec.clear(); close(); @@ -367,7 +370,7 @@ namespace afp { int umode = 0; switch(mode) { case read_only: umode = O_RDONLY; break; - case write_only umode = O_WRONLY | O_CREAT; break; + case write_only: umode = O_WRONLY | O_CREAT; break; case read_write: umode = O_RDWR | O_CREAT; break; } @@ -385,7 +388,7 @@ namespace afp { #endif #ifdef FD_RESOURCE_FORK - size_t resource_fork::read(void *buffer, size_t n, std::error_code &) { + size_t resource_fork::read(void *buffer, size_t n, std::error_code &ec) { ec.clear(); auto rv = _(::read(_fd, buffer, n), ec); if (ec) return 0; @@ -393,7 +396,7 @@ namespace afp { return rv; } - size_t resource_fork::write(const void *buffer, size_t n, std::error_code &) { + size_t resource_fork::write(const void *buffer, size_t n, std::error_code &ec) { ec.clear(); auto rv = _(::write(_fd, buffer, n), ec); if (ec) return 0;