From eda9dfbf13f8f7330a9fecaead32b4a192d402a7 Mon Sep 17 00:00:00 2001 From: SheetJS Date: Sun, 15 Sep 2013 12:05:46 -0700 Subject: [PATCH] version bump 0.2.1: cleanup --- cfb.js | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cfb.js b/cfb.js index 4133f93..baa423c 100644 --- a/cfb.js +++ b/cfb.js @@ -103,11 +103,11 @@ function ReadShift(size, t) { case 'utf8': size = t; o = this.utf8(this.l, this.l + size); break; case 'utf16le': size = 2*t; o = this.utf16le(this.l, this.l + size); break; - case 'cstr': size = 0, o = ""; - while((w=this.readUInt8(this.l + size++))!=0) o+= String.fromCharCode(w); + case 'cstr': size = 0; o = ""; + while((w=this.readUInt8(this.l + size++))!==0) o+= String.fromCharCode(w); break; - case 'wstr': size = 0, o = ""; - while((w=this.readUInt16LE(this.l +size))!=0) o+= String.fromCharCode(w),size+=2; + case 'wstr': size = 0; o = ""; + while((w=this.readUInt16LE(this.l +size))!==0){o+= String.fromCharCode(w);size+=2;} size+=2; break; } this.l+=size; return o; @@ -156,8 +156,8 @@ var fat_addrs = []; // locations of FAT sectors var blob = file.slice(0,512); prep_blob(blob); var read = ReadShift.bind(blob), chk = CheckField.bind(blob); -var wrn = WarnField.bind(blob); -var j = 0; +//var wrn = WarnField.bind(blob); +var j = 0, q; // header signature 8 chk(HEADER_SIGNATURE, 'Header Signature: '); @@ -290,9 +290,9 @@ sector_list[fat_addrs[0]].name = "!FAT"; /* [MS-CFB] 2.6.1 Compound File Directory Entry */ var files = {}, Paths = []; function read_directory(idx) { - var blob, read; + var blob, read, w; var sector = sector_list[idx].data; - for(var i = 0; i != sector.length; i+= 128, l = 64) { + for(var i = 0; i != sector.length; i+= 128) { blob = sector.slice(i, i+128); prep_blob(blob, 64); read = ReadShift.bind(blob); diff --git a/package.json b/package.json index d2974a4..3a10dc7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cfb", - "version": "0.2.0", + "version": "0.2.1", "author": "Niggler", "description": "Compound File Binary File Format extractor", "keywords": [ "cfb", "compression", "office" ],