Skip to content

Commit 34b8df2

Browse files
committed
Исправлена функция files::readBytes c offset и length. Fix #4
1 parent 00db00c commit 34b8df2

File tree

1 file changed

+10
-10
lines changed
  • src/main/java/com/annimon/ownlang/modules/files

1 file changed

+10
-10
lines changed

src/main/java/com/annimon/ownlang/modules/files/files.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,11 @@ protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
301301
}
302302

303303
final byte[] buffer = new byte[length];
304-
final int readed = fileInfo.dis.read(buffer, offset, length);
305-
for (int i = 0; i < readed; i++) {
306-
array.set(i, NumberValue.of(buffer[i]));
304+
final int read = fileInfo.dis.read(buffer, 0, length);
305+
for (int i = 0; i < read; i++) {
306+
array.set(offset + i, NumberValue.of(buffer[i]));
307307
}
308-
return NumberValue.of(readed);
308+
return NumberValue.of(read);
309309
}
310310
}
311311

@@ -315,9 +315,9 @@ protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
315315
final int bufferSize = 4096;
316316
final byte[] buffer = new byte[bufferSize];
317317
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
318-
int readed;
319-
while ((readed = fileInfo.dis.read(buffer, 0, bufferSize)) != -1) {
320-
baos.write(buffer, 0, readed);
318+
int read;
319+
while ((read = fileInfo.dis.read(buffer, 0, bufferSize)) != -1) {
320+
baos.write(buffer, 0, read);
321321
}
322322
baos.flush();
323323
baos.close();
@@ -389,9 +389,9 @@ private static class readText extends FileFunction {
389389
protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
390390
final StringBuilder result = new StringBuilder();
391391
final char[] buffer = new char[BUFFER_SIZE];
392-
int readed;
393-
while ((readed = fileInfo.reader.read(buffer, 0, BUFFER_SIZE)) != -1) {
394-
result.append(buffer, 0, readed);
392+
int read;
393+
while ((read = fileInfo.reader.read(buffer, 0, BUFFER_SIZE)) != -1) {
394+
result.append(buffer, 0, read);
395395
}
396396
return new StringValue(result.toString());
397397
}

0 commit comments

Comments
 (0)