ported .copy()

diff --git a/index.js b/index.js
index f56b93e54d07b4baf1327c407b0b33c445c28e8b..2f7514e5f0ec9b960eda3093a5989d1ec1ec9b49 100644 (file)
--- a/index.js
+++ b/index.js
@@ -294,9 +294,42 @@ Buffer.prototype.slice = function(start, end) {
   return new Buffer(this, end - start, +start);
 };
 
-Buffer.prototype.copy = function(target, targetstart, sourcestart, sourceend) {
+// copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length)
+Buffer.prototype.copy = function(target, target_start, start, end) {
+  var source = this;
+  start || (start = 0);
+  end || (end = this.length);
+  target_start || (target_start = 0);
+
+  if (end < start) throw new Error('sourceEnd < sourceStart');
+
+  // Copy 0 bytes; we're done
+  if (end === start) return 0;
+  if (target.length == 0 || source.length == 0) return 0;
+
+  if (target_start < 0 || target_start >= target.length) {
+    throw new Error('targetStart out of bounds');
+  }
+
+  if (start < 0 || start >= source.length) {
+    throw new Error('sourceStart out of bounds');
+  }
+
+  if (end < 0 || end > source.length) {
+    throw new Error('sourceEnd out of bounds');
+  }
+
+  // Are we oob?
+  if (end > this.length) {
+    end = this.length;
+  }
+
+  if (target.length - target_start < end - start) {
+    end = target.length - target_start + start;
+  }
+
   var temp = [];
-  for (var i=sourcestart; i<sourceend; i++) {
+  for (var i=start; i<end; i++) {
     assert.ok(typeof this[i] !== 'undefined', "copying undefined buffer bytes!");
     temp.push(this[i]);
   }

diff --git a/old_buffer.js b/old_buffer.js
index 321b725f33ac6ec30b14f9a853f7fe6c96191645..9202fbaec83095a6db1f94cc3fe3fd492dd64255 100644 (file)
--- a/old_buffer.js
+++ b/old_buffer.js
@@ -1,44 +1,3 @@
-// copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length)
-Buffer.prototype.copy = function(target, target_start, start, end) {
-  var source = this;
-  start || (start = 0);
-  end || (end = this.length);
-  target_start || (target_start = 0);
-
-  if (end < start) throw new Error('sourceEnd < sourceStart');
-
-  // Copy 0 bytes; we're done
-  if (end === start) return 0;
-  if (target.length == 0 || source.length == 0) return 0;
-
-  if (target_start < 0 || target_start >= target.length) {
-    throw new Error('targetStart out of bounds');
-  }
-
-  if (start < 0 || start >= source.length) {
-    throw new Error('sourceStart out of bounds');
-  }
-
-  if (end < 0 || end > source.length) {
-    throw new Error('sourceEnd out of bounds');
-  }
-
-  // Are we oob?
-  if (end > this.length) {
-    end = this.length;
-  }
-
-  if (target.length - target_start < end - start) {
-    end = target.length - target_start + start;
-  }
-
-  return this.parent.copy(target.parent,
-                          target_start + target.offset,
-                          start + this.offset,
-                          end + this.offset);
-};
-
-
 // slice(start, end)
 Buffer.prototype.slice = function(start, end) {
   if (end === undefined) end = this.length;