refactor to same pattern as v3

Author: mafintosh

index.js

@@ -261,7 +261,7 @@ exports.extract = function (cwd, opts) {
       if (win32) return next() // skip symlinks on win for now before it can be tested
       xfs.unlink(name, function () {
         var dst = path.resolve(path.dirname(name), header.linkname)
-        if (!dst.startsWith(path.resolve(cwd))) return next(new Error(name + ' is not a valid symlink'))
+        if (!inCwd(dst, cwd)) return next(new Error(name + ' is not a valid symlink'))
 
         xfs.symlink(header.linkname, name, stat)
       })
@@ -273,7 +273,7 @@ exports.extract = function (cwd, opts) {
         var srcpath = path.join(cwd, path.join('/', header.linkname))
 
         xfs.realpath(srcpath, function (err, dst) {
-          if (err || !dst.startsWith(path.resolve(cwd))) return next(new Error(name + ' is not a valid hardlink'))
+          if (err || !inCwd(dst, cwd)) return next(new Error(name + ' is not a valid hardlink'))
 
           xfs.link(dst, name, function (err) {
             if (err && err.code === 'EPERM' && opts.hardlinkAsFilesFallback) {
@@ -356,3 +356,8 @@ function mkdirfix (name, opts, cb) {
     }
   })
 }
+
+function inCwd (dst, cwd) {
+  cwd = path.resolve(cwd)
+  return cwd === dst || dst.startsWith(cwd + path.sep)
+}