refactor sanitizePath a bit more.

archiverjs · Jan 11, 2014 · 07fe041 · 07fe041
1 parent 2f12cf0
commit 07fe041
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/lib/util/index.js b/lib/util/index.js
@@ -65,18 +65,8 @@ util.isStream = function(source) {
 };
 
 util.sanitizePath = function() {
-  var filepath = util.unixifyPath.apply(util, arguments);
-  filepath = filepath.replace(':', '');
-
-  if (filepath === '.') {
-    filepath = '';
-  }
-
-  while (filepath.substring(0, 1) === '/') {
-    filepath = filepath.substring(1);
-  }
-
-  return filepath;
+  var filepath = path.join.apply(path, arguments);
+  return filepath.replace(/\\/g, '/').replace(/:/g, '').replace(/^\/+/, '');
 };
 
 util.unixifyPath = function() {

diff --git a/lib/zip-stream.js b/lib/zip-stream.js
@@ -151,13 +151,15 @@ ZipStream.prototype._newProcessStream = function(store) {
 ZipStream.prototype._normalizeFileData = function(data) {
   data = util.defaults(data, {
     type: 'file',
-    name: '',
+    name: null,
     date: null,
     store: false,
     comment: ''
   });
 
-  data.name = util.sanitizePath(data.name);
+  if (data.name) {
+    data.name = util.sanitizePath(data.name);
+  }
 
   if (typeof data.lastModifiedDate !== 'number') {
     data.lastModifiedDate = util.dosDateTime(data.date, this.options.forceUTC);