Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix write() truncation with ext-uv and ext-eio #76

Merged
merged 2 commits into from
Jul 23, 2023
Merged

Fix write() truncation with ext-uv and ext-eio #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b21b1c
Fix write() truncation with ext-uv
danog Jul 22, 2023
6af87e0
Fix eio
danog Jul 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Driver/EioFilesystemDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ public function read(string $path): string

public function write(string $path, string $contents): void
{
$flags = \EIO_O_RDWR | \EIO_O_CREAT;
$flags = \EIO_O_RDWR | \EIO_O_CREAT | \EIO_O_TRUNC;
$mode = \EIO_S_IRUSR | \EIO_S_IWUSR | \EIO_S_IXUSR;
$priority = \EIO_PRI_DEFAULT;

Expand Down
8 changes: 5 additions & 3 deletions src/Driver/UvFilesystemDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ public function read(string $path): string

public function write(string $path, string $contents): void
{
$flags = \UV::O_WRONLY | \UV::O_CREAT;
$flags = \UV::O_WRONLY | \UV::O_CREAT | \UV::O_TRUNC;
$mode = \UV::S_IRWXU | \UV::S_IRUSR;

$this->poll->listen();
Expand Down Expand Up @@ -454,8 +454,10 @@ private function parseMode(string $mode): int
return match ($mode) {
"r" => \UV::O_RDONLY,
"r+" => \UV::O_RDWR,
"c", "w" => \UV::O_WRONLY | \UV::O_CREAT,
"c+", "w+" => \UV::O_RDWR | \UV::O_CREAT,
"c" => \UV::O_WRONLY | \UV::O_CREAT,
"w" => \UV::O_WRONLY | \UV::O_CREAT | \UV::O_TRUNC,
"c+" => \UV::O_RDWR | \UV::O_CREAT,
"w+" => \UV::O_RDWR | \UV::O_CREAT | \UV::O_TRUNC,
"a" => \UV::O_WRONLY | \UV::O_CREAT | \UV::O_APPEND,
"a+" => \UV::O_RDWR | \UV::O_CREAT | \UV::O_APPEND,
"x" => \UV::O_WRONLY | \UV::O_CREAT | \UV::O_EXCL,
Expand Down
31 changes: 31 additions & 0 deletions test/FileTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

use Amp\ByteStream\ClosedException;
use Amp\File;
use Amp\File\Whence;

use function Amp\async;

abstract class FileTest extends FilesystemTest
Expand All @@ -25,6 +27,35 @@ public function testWrite(): void
$this->assertSame("foobar", $contents);

$handle->close();

$handle = $this->driver->openFile($path, "c+");
$handle->seek(0, Whence::End);
$this->assertSame(6, $handle->tell());

$handle->close();
}

public function testWriteTruncate(): void
{
$path = Fixture::path() . "/write";
$handle = $this->driver->openFile($path, "c+");
$this->assertSame(0, $handle->tell());

$handle->write("foo");
$handle->write("bar");
$handle->seek(0);
$contents = $handle->read();
$this->assertSame(6, $handle->tell());
$this->assertTrue($handle->eof());
$this->assertSame("foobar", $contents);

$handle->close();

$handle = $this->driver->openFile($path, "w+");
$handle->seek(0, Whence::End);
$this->assertSame(0, $handle->tell());

$handle->close();
}

public function testEmptyWrite(): void
Expand Down
21 changes: 21 additions & 0 deletions test/FilesystemDriverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,27 @@ public function testTouch(): void
$this->assertTrue($newStat["mtime"] > $oldStat["mtime"]);
}

/**
* @group slow
*/
public function testWrite(): void
{
$fixtureDir = Fixture::path();

$contents1 = "write test longer";
$contents2 = "write test";
$path = "{$fixtureDir}/write.txt";

$this->driver->write($path, $contents1);
$this->assertSame($contents1, $this->driver->read($path));

$this->driver->write($path, $contents2);
$this->assertSame($contents2, $this->driver->read($path));

$this->driver->write($path, $contents1);
$this->assertSame($contents1, $this->driver->read($path));
}

public function testTouchFailsOnNonexistentPath(): void
{
$fixtureDir = Fixture::path();
Expand Down