From 9196e8bc6f2ff2c59a9b4fde4813e7bc26b8c23d Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Fri, 26 Jan 2018 23:21:49 +0000
Subject: Extract joinPath and splitPath for zip files

---
 lib/docx/docx-reader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/docx/docx-reader.js')

diff --git a/lib/docx/docx-reader.js b/lib/docx/docx-reader.js
index beade38..cbeaccd 100644
--- a/lib/docx/docx-reader.js
+++ b/lib/docx/docx-reader.js
@@ -6,6 +6,7 @@ var path = require("path");
 var promises = require("../promises");
 var documents = require("../documents");
 var Result = require("../results").Result;
+var zipfile = require("../zipfile");
 
 var readXmlFromZipFile = require("./office-xml-reader").readXmlFromZipFile;
 var createBodyReader = require("./body-reader").createBodyReader;
@@ -151,9 +152,8 @@ function readXmlFileWithBody(filename, options, func) {
 }
 
 function relationshipsFilename(filename) {
-    var parts = filename.split("/");
-    return parts.slice(0, parts.length - 1).join("/") +
-        "/_rels/" + parts[parts.length - 1] + ".rels";
+    var split = zipfile.splitPath(filename);
+    return zipfile.joinPath(split.dirname, "_rels", split.basename + ".rels");
 }
 
 var readContentTypesFromZipFile = xmlFileReader({
-- 
cgit v1.2.3