From 0fc4c2f05f3d4d43055150f04fd12628c2e75ee0 Mon Sep 17 00:00:00 2001
From: Farrin Reid <blakmatrix@gmail.com>
Date: Sat, 23 Jun 2012 05:17:15 -0800
Subject: [PATCH] [fix] Changed require('sys') to require('util') for
 compatibility with node v0.8

---
 benchmarks/benchmark.js        | 10 ++--
 lib/diff/diff.js               |  4 +-
 lib/git/actor.js               |  2 +-
 lib/git/binary_parser.js       | 14 ++---
 lib/git/commit.js              |  2 +-
 lib/git/file_index.js          |  2 +-
 lib/git/file_window.js         |  4 +-
 lib/git/git.js                 |  2 +-
 lib/git/git_file_operations.js |  4 +-
 lib/git/git_index.js           |  2 +-
 lib/git/head.js                |  2 +-
 lib/git/internal/git_blob.js   |  2 +-
 lib/git/internal/git_commit.js |  4 +-
 lib/git/internal/git_tag.js    |  4 +-
 lib/git/internal/git_tree.js   |  2 +-
 lib/git/loose_storage.js       |  2 +-
 lib/git/mime/mime_types.js     |  2 +-
 lib/git/pack_storage.js        |  2 +-
 lib/git/raw_object.js          |  2 +-
 lib/git/repo.js                |  2 +-
 lib/git/repository.js          |  2 +-
 lib/git/status.js              |  2 +-
 lib/git/status_file.js         |  2 +-
 lib/git/sub_module.js          |  2 +-
 lib/git/tree.js                |  2 +-
 lib/git/user_info.js           |  2 +-
 lib/zlib/zlib.js               | 96 +++++++++++++++++-----------------
 test/diff/test_diff.js         |  2 +-
 28 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/benchmarks/benchmark.js b/benchmarks/benchmark.js
index b9fb012..1000338 100644
--- a/benchmarks/benchmark.js
+++ b/benchmarks/benchmark.js
@@ -1,6 +1,6 @@
 
 var Repo = require('git/repo').Repo,
-  sys = require('sys'),
+  util = require('util'),
   fs = require('fs'),
   exec  = require('child_process').exec;
 
@@ -14,7 +14,7 @@ var create_tmp_directory = function(clone_path, callback) {
   // Copy the old directory to the new one
   var child = exec('cp -R ' + clone_path + ' ' + tmp_path, function (error, stdout, stderr) {
       if (error !== null) {
-        sys.puts('exec error: ' + error);
+        util.puts('exec error: ' + error);
         return callback(error, null);
       }
       return callback(null, tmp_path);
@@ -25,7 +25,7 @@ var destroy_directory = function(directory, callback) {
   // Copy the old directory to the new one
   var child = exec('rm -rf ' + directory, function (error, stdout, stderr) {
       if (error !== null) {
-        sys.puts('exec error: ' + error);
+        util.puts('exec error: ' + error);
         return callback(error, null);
       }
       return callback(null, null);    
@@ -125,7 +125,7 @@ var execute_process = function(type) {
         
         var end_time = new Date();
         var total_miliseconds = end_time.getTime() - start_time.getTime();
-        sys.puts("[" + type + "]::executed in: " + (total_miliseconds/1000) + " seconds");        
+        util.puts("[" + type + "]::executed in: " + (total_miliseconds/1000) + " seconds");        
         // Delete the directory
         destroy_directory(target_path, function(err, result) {});
       });      
@@ -144,7 +144,7 @@ if(process.argv.length > 2 && process.argv[2].match(/packobj|commits1|commits2|b
     execute_process(process.argv[2]);
   }  
 } else {
-  sys.puts("Please provide the benchmark you wish to run in the form <node benchmarks [packobj|commits1|commits2|big_revlist|log|diff|commit_diff|heads|all]>")
+  util.puts("Please provide the benchmark you wish to run in the form <node benchmarks [packobj|commits1|commits2|big_revlist|log|diff|commit_diff|heads|all]>")
 }
   
 
diff --git a/lib/diff/diff.js b/lib/diff/diff.js
index aa8c09b..da6455a 100644
--- a/lib/diff/diff.js
+++ b/lib/diff/diff.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   SequenceCallbacks = require('./callbacks').SequenceCallbacks,
   ContextChange = require('./change').ContextChange,
   Change = require('./change').Change,
@@ -762,7 +762,7 @@ Difference.LCS.__normalize_patchset = function(patchset) {
         });
       }      
     } else {
-      throw "Cannot normalize the hunk: " + sys.inspect(hunk);
+      throw "Cannot normalize the hunk: " + util.inspect(hunk);
     }    
   }));
 }
diff --git a/lib/git/actor.js b/lib/git/actor.js
index 923d1e3..6c1deb5 100644
--- a/lib/git/actor.js
+++ b/lib/git/actor.js
@@ -1,4 +1,4 @@
-var sys = require('sys');
+var util = require('util');
 
 Actor = exports.Actor = function(name, email) {
   var _name = name, _email = email;  
diff --git a/lib/git/binary_parser.js b/lib/git/binary_parser.js
index a65a913..a574d02 100644
--- a/lib/git/binary_parser.js
+++ b/lib/git/binary_parser.js
@@ -222,25 +222,25 @@ p.encode_utf8 = function(s) {
 };
 
 p.pprint = function(s) {
-  var sys = require('sys');
+  var util = require('util');
   
   for (var i=0; i<s.length; i++) {
-    if (s.charCodeAt(i)<32) {sys.puts(s.charCodeAt(i)+' : ');}
-    else {sys.puts(s.charCodeAt(i)+' : '+ s.charAt(i));}
+    if (s.charCodeAt(i)<32) {util.puts(s.charCodeAt(i)+' : ');}
+    else {util.puts(s.charCodeAt(i)+' : '+ s.charAt(i));}
   }
 };
 
 p.hprint = function(s) {
-  var sys = require('sys');
+  var util = require('util');
   
   for (var i=0; i<s.length; i++) {
-    if (s.charCodeAt(i)<32) {sys.puts(s.charCodeAt(i)+' : ');}
-    else {sys.puts(s.charCodeAt(i).toString(16)+' : '+ s.charAt(i));}
+    if (s.charCodeAt(i)<32) {util.puts(s.charCodeAt(i)+' : ');}
+    else {util.puts(s.charCodeAt(i).toString(16)+' : '+ s.charAt(i));}
   }
 };
 
 p.hex = function(s) {
-  var sys = require('sys');
+  var util = require('util');
   var string = ''
   
   for (var i=0; i<s.length; i++) {
diff --git a/lib/git/commit.js b/lib/git/commit.js
index 7bf827a..83aec7b 100644
--- a/lib/git/commit.js
+++ b/lib/git/commit.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   Actor = require('./actor').Actor,
   Diff = require('./diff').Diff;
   Tree = require('./tree').Tree;
diff --git a/lib/git/file_index.js b/lib/git/file_index.js
index 041d338..1fd8b32 100644
--- a/lib/git/file_index.js
+++ b/lib/git/file_index.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   fs = require('fs');
 
 var FileIndex = exports.FileIndex = function(repo_path, callback) {
diff --git a/lib/git/file_window.js b/lib/git/file_window.js
index 846fd44..c5a77de 100644
--- a/lib/git/file_window.js
+++ b/lib/git/file_window.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   fs = require('fs'),
   Buffer = require('buffer').Buffer;
 
@@ -32,7 +32,7 @@ FileWindow.prototype.index = function(idx) {
     offset = idx[0];
     len = idx[1]
   } else {
-    throw "invalid index param: " + sys.inspect(idx);
+    throw "invalid index param: " + util.inspect(idx);
   }
   
   // Seek position equivalent using a position in the read
diff --git a/lib/git/git.js b/lib/git/git.js
index a7d6a4b..fc87476 100644
--- a/lib/git/git.js
+++ b/lib/git/git.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
     fs = require('fs'),
     GitFileOperations = require('./git_file_operations').GitFileOperations,
     exec = require('child_process').exec,
diff --git a/lib/git/git_file_operations.js b/lib/git/git_file_operations.js
index 8d511ea..0bfc95c 100644
--- a/lib/git/git_file_operations.js
+++ b/lib/git/git_file_operations.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   fs = require('fs'),
   exec  = require('child_process').exec;
 
@@ -117,7 +117,7 @@ GitFileOperations.fs_rmdir_r = function(dir, callback) {
   // Copy the old directory to the new one
   var child = exec('rm -rf ' + dir, function (error, stdout, stderr) {
       if (error !== null) {
-        sys.puts('exec error: ' + error);
+        util.puts('exec error: ' + error);
         return callback(error, null);
       }
       return callback(null, null);    
diff --git a/lib/git/git_index.js b/lib/git/git_index.js
index 4674863..ed30aab 100644
--- a/lib/git/git_index.js
+++ b/lib/git/git_index.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   Tree = require('./tree').Tree,
   Config = require('./config').Config;
 
diff --git a/lib/git/head.js b/lib/git/head.js
index da42d98..e851703 100644
--- a/lib/git/head.js
+++ b/lib/git/head.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   Commit = require('./commit').Commit;
 
 var Head = exports.Head = function(name, commit) {
diff --git a/lib/git/internal/git_blob.js b/lib/git/internal/git_blob.js
index e0758cd..584e20e 100644
--- a/lib/git/internal/git_blob.js
+++ b/lib/git/internal/git_blob.js
@@ -1,4 +1,4 @@
-var sys = require('sys');
+var util = require('util');
 
 var GitBlob = exports.GitBlob = function(content, repository) {
   var _content = content, _repository = repository;
diff --git a/lib/git/internal/git_commit.js b/lib/git/internal/git_commit.js
index 0d18b2c..6c6cb77 100644
--- a/lib/git/internal/git_commit.js
+++ b/lib/git/internal/git_commit.js
@@ -1,4 +1,4 @@
-var sys = require('sys'), 
+var util = require('util'), 
   UserInfo = require('../user_info').UserInfo;
 
 var GitCommit = exports.GitCommit = function(tree, parent, author, committer, message, headers, repository) {
@@ -51,7 +51,7 @@ GitCommit.from_raw = function(raw_object, repository) {
       committer = new UserInfo(value);
     } else {
       // Unknow header
-      sys.puts("unknow header '" + key + "' in commit " + raw_object.sha_hex())
+      util.puts("unknow header '" + key + "' in commit " + raw_object.sha_hex())
     }
   })
   
diff --git a/lib/git/internal/git_tag.js b/lib/git/internal/git_tag.js
index 7f1f480..ee7886a 100644
--- a/lib/git/internal/git_tag.js
+++ b/lib/git/internal/git_tag.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   UserInfo = require('../user_info').UserInfo;
 
 var GitTag = exports.GitTag = function(object, type, tag, tagger, message, repository) {
@@ -48,7 +48,7 @@ GitTag.from_raw = function(raw_object, repository) {
     } else if(key == 'tagger') {
       tagger = new UserInfo(value);
     } else {
-      sys.puts("unknown header '" + key);
+      util.puts("unknown header '" + key);
     }
   });
   
diff --git a/lib/git/internal/git_tree.js b/lib/git/internal/git_tree.js
index 9a50df9..82661c4 100644
--- a/lib/git/internal/git_tree.js
+++ b/lib/git/internal/git_tree.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   BinaryParser = require('../binary_parser').BinaryParser,
   DirectoryEntry = require('../internal/directory_entry').DirectoryEntry;
 
diff --git a/lib/git/loose_storage.js b/lib/git/loose_storage.js
index bab41e6..5ad0027 100644
--- a/lib/git/loose_storage.js
+++ b/lib/git/loose_storage.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   fs = require('fs'),
   BinaryParser = require('./binary_parser').BinaryParser,
   Zlib = require('../zlib/zlib').Zlib,
diff --git a/lib/git/mime/mime_types.js b/lib/git/mime/mime_types.js
index 399a54b..4c20949 100644
--- a/lib/git/mime/mime_types.js
+++ b/lib/git/mime/mime_types.js
@@ -1,4 +1,4 @@
-var sys = require('sys');
+var util = require('util');
 
 // All the mime types
 var mime_definition = "  # application/*\n\
diff --git a/lib/git/pack_storage.js b/lib/git/pack_storage.js
index 2a1e41e..113b8b3 100644
--- a/lib/git/pack_storage.js
+++ b/lib/git/pack_storage.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   fs = require('fs'),
   Buffer = require('buffer').Buffer,
   BinaryParser = require('./binary_parser').BinaryParser,
diff --git a/lib/git/raw_object.js b/lib/git/raw_object.js
index ecb1d10..c363e5c 100644
--- a/lib/git/raw_object.js
+++ b/lib/git/raw_object.js
@@ -1,5 +1,5 @@
 var crypto = require('crypto'),
-  sys = require('sys'),
+  util = require('util'),
   Buffer = require('buffer').Buffer,
   BinaryParser = require('./binary_parser').BinaryParser;
 
diff --git a/lib/git/repo.js b/lib/git/repo.js
index 92db8ad..9434999 100644
--- a/lib/git/repo.js
+++ b/lib/git/repo.js
@@ -2,7 +2,7 @@ var Head = require('./head').Head,
   Git = require('./git').Git,
   Commit = require('./commit').Commit,
   fs = require('fs'),
-  sys = require('sys'),
+  util = require('util'),
   Tree = require('./tree').Tree,
   Blob = require('./blob').Blob,
   Head = require('./head').Head,
diff --git a/lib/git/repository.js b/lib/git/repository.js
index 6bc7a69..67e5dcd 100644
--- a/lib/git/repository.js
+++ b/lib/git/repository.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   GitObject = require('./git_object').GitObject,
   fs = require('fs'),
   LooseStorage = require('./loose_storage').LooseStorage,
diff --git a/lib/git/status.js b/lib/git/status.js
index bc352c9..13a9693 100644
--- a/lib/git/status.js
+++ b/lib/git/status.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   GitFileOperations = require('./git_file_operations').GitFileOperations,
   StatusFile = require('./status_file').StatusFile;
 
diff --git a/lib/git/status_file.js b/lib/git/status_file.js
index 244c87d..b46ecc7 100644
--- a/lib/git/status_file.js
+++ b/lib/git/status_file.js
@@ -1,4 +1,4 @@
-var sys = require('sys');
+var util = require('util');
 
 var StatusFile = exports.StatusFile = function(repo , hash) {
   var _repo = repo;
diff --git a/lib/git/sub_module.js b/lib/git/sub_module.js
index 8774e47..76a5220 100644
--- a/lib/git/sub_module.js
+++ b/lib/git/sub_module.js
@@ -1,4 +1,4 @@
-var sys = require('sys');
+var util = require('util');
 
 var Submodule = exports.Submodule = function(repo, id, mode, name) {
   var _repo = repo, _id = id, _mode = mode, _name = name;
diff --git a/lib/git/tree.js b/lib/git/tree.js
index d20950f..05358e0 100644
--- a/lib/git/tree.js
+++ b/lib/git/tree.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   Submodule = require('./sub_module').Submodule,
   Blob = require('./blob').Blob;
 
diff --git a/lib/git/user_info.js b/lib/git/user_info.js
index 685215f..88b43d9 100644
--- a/lib/git/user_info.js
+++ b/lib/git/user_info.js
@@ -1,4 +1,4 @@
-var sys = require('sys'),
+var util = require('util'),
   StringUtil = require('../sprintf/sprintf').StringUtil;
 
 var UserInfo = exports.UserInfo = function(string) {
diff --git a/lib/zlib/zlib.js b/lib/zlib/zlib.js
index 38f84ec..e4b46fe 100644
--- a/lib/zlib/zlib.js
+++ b/lib/zlib/zlib.js
@@ -37,7 +37,7 @@
   * @see <a href="http://www.cs.tut.fi/~albert/Dev/gunzip/gunzip.c">http://www.cs.tut.fi/~albert/Dev/gunzip/gunzip.c</a>
   * @see <a href="http://www.cs.tut.fi/~albert">http://www.cs.tut.fi/~albert</a>
   */
-var sys = require('sys');
+var util = require('util');
 var Zlib = exports.Zlib = {};
       
 /**
@@ -136,7 +136,7 @@ Zlib.Unzip = function (barray){
         if (bytepos<bA.length){
             //if (debug)
             //    document.write(bytepos+": "+bA[bytepos]+"<br>");
-            // sys.debug(bA[bytepos++].toString(16))
+            // util.debug(bA[bytepos++].toString(16))
             // return String.fromCharCode(bA[bytepos++]);
             return bA[bytepos++];
         } else
@@ -227,7 +227,7 @@ Zlib.Unzip = function (barray){
         var curplace = Places[treepos];
         var tmp;
         if (debug)
-          sys.debug("len: " + len + " treepos: " + treepos)
+          util.debug("len: " + len + " treepos: " + treepos)
         if(len==17) { //war 17
             return -1;
         }
@@ -236,16 +236,16 @@ Zlib.Unzip = function (barray){
     	
         tmp = IsPat();
         if (debug)
-          sys.debug("IsPat " + tmp)
+          util.debug("IsPat " + tmp)
         if(tmp >= 0) {
             curplace.b0 = tmp;    /* leaf cell for 0-bit */
             if (debug)
-              sys.debug("b0 " + curplace.b0)
+              util.debug("b0 " + curplace.b0)
         } else {
         /* Not a Leaf cell */
         curplace.b0 = 0x8000;
         if (debug)
-          sys.debug("b0 " + curplace.b0)
+          util.debug("b0 " + curplace.b0)
         if(Rec())
             return -1;
         }
@@ -253,13 +253,13 @@ Zlib.Unzip = function (barray){
         if(tmp >= 0) {
             curplace.b1 = tmp;    /* leaf cell for 1-bit */
             if (debug)
-              sys.debug("b1 " + curplace.b1);
+              util.debug("b1 " + curplace.b1);
             curplace.jump = null;    /* Just for the display routine */
         } else {
             /* Not a Leaf cell */
             curplace.b1 = 0x8000;
             if (debug)
-              sys.debug("b1 " + curplace.b1);
+              util.debug("b1 " + curplace.b1);
             curplace.jump = Places[treepos];
             curplace.jumppos = treepos;
             if(Rec())
@@ -274,7 +274,7 @@ Zlib.Unzip = function (barray){
         /* Create the Huffman decode tree/table */
         //document.write("<br>createtree<br>");
         if (debug)
-          sys.debug("currentTree " + currentTree + " numval " + numval + " lengths " + lengths + " show " + show);
+          util.debug("currentTree " + currentTree + " numval " + numval + " lengths " + lengths + " show " + show);
         Places = currentTree;
         treepos=0;
         flens = lengths;
@@ -285,14 +285,14 @@ Zlib.Unzip = function (barray){
         if(Rec()) {
             //fprintf(stderr, "invalid huffman tree\n");
             if (debug)
-              sys.debug("invalid huffman tree");
+              util.debug("invalid huffman tree");
             return -1;
         }
         if (debug){
-          sys.debug("Tree: " + Places.length);
+          util.debug("Tree: " + Places.length);
         	for (var a=0;a<32;a++){
-        	  sys.debug("Places[" + a + "].b0=" + Places[a].b0);
-        	  sys.debug("Places[" + a + "].b1=" + Places[a].b1);
+        	  util.debug("Places[" + a + "].b0=" + Places[a].b0);
+        	  util.debug("Places[" + a + "].b1=" + Places[a].b1);
         	}
         }
     
@@ -324,11 +324,11 @@ Zlib.Unzip = function (barray){
         while(1) {
             b=readBit();
             if (debug)
-              sys.debug("b=" + b);
+              util.debug("b=" + b);
             if(b) {
                 if(!(X.b1 & 0x8000)){
                 	if (debug)
-                	  sys.debug("ret1");
+                	  util.debug("ret1");
                     return X.b1;    /* If leaf node, return data */
                 }
                 X = X.jump;
@@ -343,7 +343,7 @@ Zlib.Unzip = function (barray){
             } else {
                 if(!(X.b0 & 0x8000)){
                 	if (debug)
-                	  sys.debug("ret2");
+                	  util.debug("ret2");
                     return X.b0;    /* If leaf node, return data */
                 }
                 //X++; //??????????????????
@@ -352,7 +352,7 @@ Zlib.Unzip = function (barray){
             }
         }
         if (debug)
-          sys.debug("ret3");
+          util.debug("ret3");
         return -1;
     };
     
@@ -371,23 +371,23 @@ Zlib.Unzip = function (barray){
         switch(type) {
             case 0:
             	if (debug)
-            	    sys.debug("Stored");
+            	    util.debug("Stored");
                 break;
             case 1:
             	if (debug)
-                  sys.debug("Fixed Huffman codes");
+                  util.debug("Fixed Huffman codes");
                 break;
             case 2:
             	if (debug)
-            	    sys.debug("Dynamic Huffman codes");
+            	    util.debug("Dynamic Huffman codes");
                 break;
             case 3:
             	if (debug)
-                  sys.debug("Reserved block type!!");
+                  util.debug("Reserved block type!!");
                 break;
             default:
             	if (debug)
-                  sys.debug("Unexpected value " + type);
+                  util.debug("Unexpected value " + type);
                 break;
         }
         
@@ -403,7 +403,7 @@ Zlib.Unzip = function (barray){
             cSum |= (readByte()<<8);
 
             if(((blockLen ^ ~cSum) & 0xffff)) {
-              sys.debug("BlockLen checksum mismatch");
+              util.debug("BlockLen checksum mismatch");
             }
             while(blockLen--) {
                 c = readByte();
@@ -508,9 +508,9 @@ Zlib.Unzip = function (barray){
                 return 1;
             }
             if (debug){
-              sys.debug("distanceTree");
+              util.debug("distanceTree");
             	for(var a=0;a<distanceTree.length;a++){
-                  sys.debug("" + distanceTree[a].b0 + " " + distanceTree[a].b1 + " " + distanceTree[a].jump + " " + distanceTree[a].jumppos);
+                  util.debug("" + distanceTree[a].b0 + " " + distanceTree[a].b1 + " " + distanceTree[a].jump + " " + distanceTree[a].jumppos);
                 	/*if (distanceTree[a].jumppos!=-1)
                     	document.write(" "+distanceTree[a].jump.b0+" "+distanceTree[a].jump.b1);
                 	*/
@@ -523,12 +523,12 @@ Zlib.Unzip = function (barray){
             i = 0;
             var z=-1;
             if (debug)
-              sys.debug("n=" + n + " bits: " + bits);
+              util.debug("n=" + n + " bits: " + bits);
             while(i < n) {
                 z++;
                 j = DecodeValue(distanceTree);
                 if (debug)
-                  sys.debug("" + z + " i:" + i + " decode: " + j + "    bits" + bits);
+                  util.debug("" + z + " i:" + i + " decode: " + j + "    bits" + bits);
                 if(j<16) {    // length of code in bits (0..15)
                        ll[i++] = j;
                 } else if(j==16) {    // repeat last length 3 to 6 times 
@@ -583,7 +583,7 @@ Zlib.Unzip = function (barray){
                 return 1;
             }
             if (debug)
-              sys.debug("literalTree");
+              util.debug("literalTree");
             while(1) {
                 j = DecodeValue(literalTree);
                 if(j >= 256) {        // In C64: if carry set
@@ -636,7 +636,7 @@ Zlib.Unzip.prototype.unzipFile = function(name) {
 Zlib.Unzip.prototype.unzip = function() {
 	//convertToByteArray(input);
 	if (debug)
-	  sys.debug(bA);
+	  util.debug(bA);
 	/*for (i=0;i<bA.length*8;i++){
 		document.write(readBit());
 		if ((i+1)%8==0)
@@ -660,7 +660,7 @@ Zlib.Unzip.prototype.unzip = function() {
     
  function nextFile(){
  	if (debug)
- 	  sys.debug("NEXTFILE");
+ 	  util.debug("NEXTFILE");
  	outputArr = [];
  	var tmp = [];
  	modeZIP = false;
@@ -668,24 +668,24 @@ Zlib.Unzip.prototype.unzip = function() {
 	tmp[1] = readByte();
 	
 	if (debug)
-	  sys.debug("type: " + tmp[0] + " " + tmp[1]);
+	  util.debug("type: " + tmp[0] + " " + tmp[1]);
 	if (tmp[0] == parseInt("78",16) && (tmp[1] == parseInt("156",10) || tmp[1] == parseInt("1", 10))){ //GZIP
 		if (debug)
-		  sys.debug("GEONExT-GZIP");
+		  util.debug("GEONExT-GZIP");
 		DeflateLoop();
 		if (debug)
-	    sys.debug(outputArr.join(''));
+	    util.debug(outputArr.join(''));
     // unzipped[files] = new Array(2);
     	unzipped[files] = outputArr.join('');
     	files++;
 	}
 	if (tmp[0] == parseInt("1f",16) && tmp[1] == parseInt("8b",16)){ //GZIP
 		if (debug)
-      sys.debug("GZIP");
+      util.debug("GZIP");
 		//DeflateLoop();
 		skipdir();
 		if (debug)
-      sys.debug(outputArr.join(''));
+      util.debug(outputArr.join(''));
 		unzipped[files] = new Array(2);
     	unzipped[files][0] = outputArr.join('');
     	unzipped[files][1] = "file";
@@ -700,17 +700,17 @@ Zlib.Unzip.prototype.unzip = function() {
 			tmp[0] = readByte();
 			tmp[1] = readByte();
 			if (debug)
-        sys.debug("ZIP-Version: "+tmp[1]+" "+tmp[0]/10+"."+tmp[0]%10);
+        util.debug("ZIP-Version: "+tmp[1]+" "+tmp[0]/10+"."+tmp[0]%10);
 			
 			gpflags = readByte();
 			gpflags |= (readByte()<<8);
 			if (debug)
-        sys.debug("gpflags: "+gpflags);
+        util.debug("gpflags: "+gpflags);
 			
 			var method = readByte();
 			method |= (readByte()<<8);
 			if (debug)
-        sys.debug("method: "+method);
+        util.debug("method: "+method);
 			
 			readByte();
 			readByte();
@@ -733,7 +733,7 @@ Zlib.Unzip.prototype.unzip = function() {
 			size |= (readByte()<<24);
 			
 			if (debug)
-			  sys.debug("local CRC: "+crc+"\nlocal Size: "+size+"\nlocal CompSize: "+compSize);
+			  util.debug("local CRC: "+crc+"\nlocal Size: "+size+"\nlocal CompSize: "+compSize);
 			
 			var filelen = readByte();
 			filelen |= (readByte()<<8);
@@ -742,7 +742,7 @@ Zlib.Unzip.prototype.unzip = function() {
 			extralen |= (readByte()<<8);
 			
 			if (debug)
-			  sys.debug("filelen "+filelen);
+			  util.debug("filelen "+filelen);
 			i = 0;
 			nameBuf = [];
 			while (filelen--){ 
@@ -753,7 +753,7 @@ Zlib.Unzip.prototype.unzip = function() {
 					nameBuf[i++] = String.fromCharCode(c);
 			}
 			if (debug)
-			  sys.debug("nameBuf: "+nameBuf);
+			  util.debug("nameBuf: "+nameBuf);
 			
 			//nameBuf[i] = "\0";
 			if (!fileout)
@@ -771,12 +771,12 @@ Zlib.Unzip.prototype.unzip = function() {
 			if (size = 0 && fileOut.charAt(fileout.length-1)=="/"){
 				//skipdir
 				if (debug)
-				  sys.debug("skipdir");
+				  util.debug("skipdir");
 			}
 			if (method == 8){
 				DeflateLoop();
 				if (debug)
-				  sys.debug(outputArr.join(''));
+				  util.debug(outputArr.join(''));
 				unzipped[files] = new Array(2);
 				unzipped[files][0] = outputArr.join('');
     			unzipped[files][1] = nameBuf.join('');
@@ -823,7 +823,7 @@ function skipdir(){
 		size |= (readByte()<<24);
 		
 		if (debug)
-		  sys.debug("CRC:");
+		  util.debug("CRC:");
 	}
 
 	if (modeZIP)
@@ -832,14 +832,14 @@ function skipdir(){
 	tmp[0] = readByte();
 	if (tmp[0] != 8) {
 		if (debug)
-		  sys.debug("Unknown compression method!");
+		  util.debug("Unknown compression method!");
         return 0;	
 	}
 	
 	gpflags = readByte();
 	if (debug){
 		if ((gpflags & ~(parseInt("1f",16))))
-		  sys.debug("Unknown flags set!");
+		  util.debug("Unknown flags set!");
 	}
 	
 	readByte();
@@ -855,7 +855,7 @@ function skipdir(){
 		tmp[2] = readByte();
 		len = tmp[0] + 256*tmp[1];
 		if (debug)
-		  sys.debug("Extra field size: "+len);
+		  util.debug("Extra field size: "+len);
 		for (i=0;i<len;i++)
 			readByte();
 	}
@@ -871,7 +871,7 @@ function skipdir(){
 		}
 		//nameBuf[i] = "\0";
 		if (debug)
-		  sys.debug("original file name: "+nameBuf);
+		  util.debug("original file name: "+nameBuf);
 	}
 		
 	if ((gpflags & 16)){
diff --git a/test/diff/test_diff.js b/test/diff/test_diff.js
index 604e224..8c9ef41 100644
--- a/test/diff/test_diff.js
+++ b/test/diff/test_diff.js
@@ -1,6 +1,6 @@
 
 TestSuite = require('async_testing').TestSuite,
-  sys = require('sys'),
+  util = require('util'),
   Difference = require('diff/diff').Difference,
   ContextChange = require('diff/change').ContextChange,
   Change = require('diff/change').Change;