[PATCH] Allow CRLF in config files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Change config fopen to binary mode, allowing LF and CRLF EOL characters so
ceph-dokan can work with native windows configuration files going forward.
The carriage return is ignored and trimmed as whitespace during parsing via
isspace().

Signed-off-by: James Devine <fxmulder@xxxxxxxxx>
---
 src/common/ConfUtils.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/ConfUtils.cc b/src/common/ConfUtils.cc
index 1ae5df5..a717077 100644
--- a/src/common/ConfUtils.cc
+++ b/src/common/ConfUtils.cc
@@ -99,7 +99,7 @@ parse_file(const std::string &fname, std::deque<std::string> *errors,
   int ret = 0;
   size_t sz;
   char *buf = NULL;
-  FILE *fp = fopen(fname.c_str(), "r");
+  FILE *fp = fopen(fname.c_str(), "rb");
   if (!fp) {
     ret = -errno;
     return ret;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [CEPH Users]     [Ceph Large]     [Information on CEPH]     [Linux BTRFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux