From 9ecff0c16fed46a68cde28697ee40de9fb548c89 Mon Sep 17 00:00:00 2001
From: Lyle Underwood <lyle.underwood@bkwld.com>
Date: Sun, 14 Oct 2012 23:21:36 -0700
Subject: [PATCH] don't set cwd_ in ls

---
 src/filer.js     | 23 ++++++++++-------------
 src/filer.min.js |  8 ++++----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/filer.js b/src/filer.js
index 996c2ee..ded3b55 100755
--- a/src/filer.js
+++ b/src/filer.js
@@ -1,22 +1,22 @@
-/** 
+/**
  * Copyright 2012 - Eric Bidelman
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- 
+
  * @fileoverview
  * Convenient wrapper library for the HTML5 Filesystem API, implementing
  * familiar UNIX commands (cp, mv, ls) for its API.
- * 
+ *
  * @author Eric Bidelman (ebidel@gmail.com)
  * @version: 0.4
  */
@@ -84,7 +84,7 @@ var Util = {
   strToObjectURL: function(binStr, opt_contentType) {
 
     var ui8a = new Uint8Array(binStr.length);
-    for (var i = 0; i < ui8a.length; ++i) { 
+    for (var i = 0; i < ui8a.length; ++i) {
       ui8a[i] = binStr.charCodeAt(i);
     }
 
@@ -446,7 +446,7 @@ var Filer = new function() {
 
       opt_successCallback && opt_successCallback(fs);
     };
-    
+
     if (this.type == self.PERSISTENT && !!self.storageInfo) {
       self.storageInfo.requestQuota(this.type, size, function(grantedBytes) {
         self.requestFileSystem(
@@ -475,14 +475,11 @@ var Filer = new function() {
     }
 
     var callback = function(dirEntry) {
-
-      cwd_ = dirEntry;
-
-      // Read contents of current working directory. According to spec, need to
+      // Read contents of directory. According to spec, need to
       // keep calling readEntries() until length of result array is 0. We're
       // guarenteed the same entry won't be returned again.
       var entries_ = [];
-      var reader = cwd_.createReader();
+      var reader = dirEntry.createReader();
 
       var readEntries = function() {
         reader.readEntries(function(results) {
diff --git a/src/filer.min.js b/src/filer.min.js
index 3b3ce15..646126f 100644
--- a/src/filer.min.js
+++ b/src/filer.min.js
@@ -3,11 +3,11 @@ var Util={toArray:function(a){return Array.prototype.slice.call(a||[],0)},strToD
 d.onerror=function(a){c&&c(a)};d.readAsArrayBuffer(a)},dataURLToBlob:function(a){if(-1==a.indexOf(";base64,")){var b=a.split(","),a=b[0].split(":")[1],b=b[1];return new Blob([b],{type:a})}for(var b=a.split(";base64,"),a=b[0].split(":")[1],b=window.atob(b[1]),c=b.length,d=new Uint8Array(c),i=0;i<c;++i)d[i]=b.charCodeAt(i);return new Blob([d],{type:a})},arrayBufferToBlob:function(a,b){var c=new Uint8Array(a);return new Blob([c],b?{type:b}:{})},arrayBufferToBinaryString:function(a,b,c){var d=new FileReader;
 d.onload=function(a){b(a.target.result)};d.onerror=function(a){c&&c(a)};a=new Uint8Array(a);d.readAsBinaryString(new Blob([a]))},arrayToBinaryString:function(a){if("object"!=typeof a)return null;for(var b=a.length,c=Array(b);b--;)c[b]=String.fromCharCode(a[b]);return c.join("")},getFileExtension:function(a){var b=a.lastIndexOf(".");return-1!=b?a.substring(b):""}},MyFileError=function(a){this.prototype=FileError.prototype;this.code=a.code;this.name=a.name};FileError.BROWSER_NOT_SUPPORTED=1E3;
 FileError.prototype.__defineGetter__("name",function(){for(var a=Object.keys(FileError),b=0,c;c=a[b];++b)if(FileError[c]==this.code)return c;return"Unknown Error"});
-var Filer=new function(){function a(e){if(b=e||null)c=b.root,d=!0}var b=null,c=null,d=!1,i=function(e){return 0==e.indexOf("filesystem:")},l=function(e){i(e)||(e="/"==e[0]?b.root.toURL()+e.substring(1):0==e.indexOf("./")||0==e.indexOf("../")?"../"==e&&c!=b.root?c.toURL()+"/"+e:c.toURL()+e:c.toURL()+"/"+e);return e},m=function(e,a){var b=arguments[1],c=arguments[2],g=function(e){if(e.code==FileError.NOT_FOUND_ERR){if(c)throw Error('"'+b+'" or "'+c+'" does not exist.');throw Error('"'+b+'" does not exist.');
-}throw Error("Problem getting Entry for one or more paths.");},j=l(b);if(3==arguments.length){var d=l(c);self.resolveLocalFileSystemURL(j,function(a){self.resolveLocalFileSystemURL(d,function(b){e(a,b)},g)},g)}else self.resolveLocalFileSystemURL(j,e,g)},p=function(e,a,c,f,g,j){if(!b)throw Error("Filesystem has not been initialized.");if(typeof e!=typeof a)throw Error("These method arguments are not supported.");var d=c||null,n=void 0!=j?j:!1;(e.isFile||a.isDirectory)&&a.isDirectory?n?e.moveTo(a,d,
+var Filer=new function(){function a(e){if(b=e||null)c=b.root,d=!0}var b=null,c=null,d=!1,i=function(e){return 0==e.indexOf("filesystem:")},l=function(e){i(e)||(e="/"==e[0]?b.root.toURL()+e.substring(1):0==e.indexOf("./")||0==e.indexOf("../")?"../"==e&&c!=b.root?c.toURL()+"/"+e:c.toURL()+e:c.toURL()+"/"+e);return e},m=function(e,a){var b=arguments[1],f=arguments[2],c=function(e){if(e.code==FileError.NOT_FOUND_ERR){if(f)throw Error('"'+b+'" or "'+f+'" does not exist.');throw Error('"'+b+'" does not exist.');
+}throw Error("Problem getting Entry for one or more paths.");},j=l(b);if(3==arguments.length){var d=l(f);self.resolveLocalFileSystemURL(j,function(a){self.resolveLocalFileSystemURL(d,function(b){e(a,b)},c)},c)}else self.resolveLocalFileSystemURL(j,e,c)},p=function(e,a,c,f,g,j){if(!b)throw Error("Filesystem has not been initialized.");if(typeof e!=typeof a)throw Error("These method arguments are not supported.");var d=c||null,n=void 0!=j?j:!1;(e.isFile||a.isDirectory)&&a.isDirectory?n?e.moveTo(a,d,
 f,g):e.copyTo(a,d,f,g):m(function(e,a){if(a.isDirectory)n?e.moveTo(a,d,f,g):e.copyTo(a,d,f,g);else{var b=Error('Oops! "'+a.name+" is not a directory!");if(g)g(b);else throw b;}},e,a)};a.DEFAULT_FS_SIZE=1048576;a.version="0.4";a.prototype={get fs(){return b},get isOpen(){return d},get cwd(){return c}};a.prototype.pathToFilesystemURL=function(a){return l(a)};a.prototype.init=function(a,k,h){if(!self.requestFileSystem)throw new MyFileError({code:FileError.BROWSER_NOT_SUPPORTED,name:"BROWSER_NOT_SUPPORTED"});
-var a=a?a:{},f=a.size||1048576;this.type=self.TEMPORARY;if("persistent"in a&&a.persistent)this.type=self.PERSISTENT;var g=function(a){this.size=f;b=a;c=b.root;d=!0;k&&k(a)};this.type==self.PERSISTENT&&self.storageInfo?self.storageInfo.requestQuota(this.type,f,function(a){self.requestFileSystem(this.type,a,g.bind(this),h)}.bind(this),h):self.requestFileSystem(this.type,f,g.bind(this),h)};a.prototype.ls=function(a,k,d){if(!b)throw Error("Filesystem has not been initialized.");var f=function(a){c=a;
-var e=[],b=c.createReader(),f=function(){b.readEntries(function(a){a.length?(e=e.concat(Util.toArray(a)),f()):(e.sort(function(a,e){return a.name<e.name?-1:e.name<a.name?1:0}),k(e))},d)};f()};a.isDirectory?f(a):i(a)?m(f,l(a)):c.getDirectory(a,{},f,d)};a.prototype.mkdir=function(a,k,d,f){if(!b)throw Error("Filesystem has not been initialized.");var g=null!=k?k:!1,j=a.split("/"),o=function(b,c){if("."==c[0]||""==c[0])c=c.slice(1);b.getDirectory(c[0],{create:!0,exclusive:g},function(b){if(b.isDirectory)c.length&&
+var a=a?a:{},f=a.size||1048576;this.type=self.TEMPORARY;if("persistent"in a&&a.persistent)this.type=self.PERSISTENT;var g=function(a){this.size=f;b=a;c=b.root;d=!0;k&&k(a)};this.type==self.PERSISTENT&&self.storageInfo?self.storageInfo.requestQuota(this.type,f,function(a){self.requestFileSystem(this.type,a,g.bind(this),h)}.bind(this),h):self.requestFileSystem(this.type,f,g.bind(this),h)};a.prototype.ls=function(a,k,d){if(!b)throw Error("Filesystem has not been initialized.");var f=function(a){var e=
+[],b=a.createReader(),c=function(){b.readEntries(function(a){a.length?(e=e.concat(Util.toArray(a)),c()):(e.sort(function(a,e){return a.name<e.name?-1:e.name<a.name?1:0}),k(e))},d)};c()};a.isDirectory?f(a):i(a)?m(f,l(a)):c.getDirectory(a,{},f,d)};a.prototype.mkdir=function(a,k,d,f){if(!b)throw Error("Filesystem has not been initialized.");var g=null!=k?k:!1,j=a.split("/"),o=function(b,c){if("."==c[0]||""==c[0])c=c.slice(1);b.getDirectory(c[0],{create:!0,exclusive:g},function(b){if(b.isDirectory)c.length&&
 1!=j.length?o(b,c.slice(1)):d(b);else if(b=Error(a+" is not a directory"),f)f(b);else throw b;},function(b){if(b.code==FileError.INVALID_MODIFICATION_ERR)if(b.message="'"+a+"' already exists",f)f(b);else throw b;})};o(c,j)};a.prototype.open=function(a,c,d){if(!b)throw Error("Filesystem has not been initialized.");a.isFile?a.file(c,d):m(function(a){a.file(c,d)},l(a))};a.prototype.create=function(a,d,h,f){if(!b)throw Error("Filesystem has not been initialized.");c.getFile(a,{create:!0,exclusive:null!=
 d?d:!0},h,function(b){if(b.code==FileError.INVALID_MODIFICATION_ERR)b.message="'"+a+"' already exists";if(f)f(b);else throw b;})};a.prototype.mv=function(a,b,c,f,d){p.bind(this,a,b,c,f,d,!0)()};a.prototype.rm=function(a,c,d){if(!b)throw Error("Filesystem has not been initialized.");var f=function(a){a.isFile?a.remove(c,d):a.isDirectory&&a.removeRecursively(c,d)};a.isFile||a.isDirectory?f(a):m(f,a)};a.prototype.cd=function(a,d,h){if(!b)throw Error("Filesystem has not been initialized.");a.isDirectory?
 (c=a,d&&d(c)):(a=l(a),m(function(a){if(a.isDirectory)c=a,d&&d(c);else if(a=Error("Path was not a directory."),h)h(a);else throw a;},a))};a.prototype.cp=function(a,b,c,d,g){p.bind(this,a,b,c,d,g)()};a.prototype.write=function(a,d,h,f){if(!b)throw Error("Filesystem has not been initialized.");var g=function(a){a.createWriter(function(b){b.onerror=f;if(d.append)b.onwriteend=function(){h(a,this)},b.seek(b.length);else{var c=!1;b.onwriteend=function(){c?h(a,this):(c=!0,this.truncate(this.position))}}if(d.data.__proto__==