aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskytrias <skytrias@protonmail.com>2021-10-23 00:12:32 +0200
committerskytrias <skytrias@protonmail.com>2021-10-23 00:12:32 +0200
commit6399f2b0146c4d91b948b09c2b180b42996fdb88 (patch)
tree9b365ca0a15dd2d1cf9598056835072fdbb5568e /src
parent7218a68e894d765a6b30ed48f64d91740ce2b23e (diff)
fix strip-semicolon using original file handle size
Diffstat (limited to 'src')
-rw-r--r--src/gb/gb.h5
-rw-r--r--src/main.cpp7
2 files changed, 8 insertions, 4 deletions
diff --git a/src/gb/gb.h b/src/gb/gb.h
index 70e4d0ab0..f716b0840 100644
--- a/src/gb/gb.h
+++ b/src/gb/gb.h
@@ -6030,8 +6030,11 @@ gb_inline b32 gb_file_copy(char const *existing_filename, char const *new_filena
struct stat stat_existing;
fstat(existing_fd, &stat_existing);
-
size = sendfile(new_fd, existing_fd, 0, stat_existing.st_size);
+
+ // set new handle to wanted size for safety
+ int i = ftruncate(new_fd, size);
+ GB_ASSERT(i == 0);
close(new_fd);
close(existing_fd);
diff --git a/src/main.cpp b/src/main.cpp
index cdc6468ab..21496b80f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2141,8 +2141,8 @@ int strip_semicolons(Parser *parser) {
generated_count += 1;
i64 written = 0;
- defer (gb_file_truncate(&f, written));
-
+ defer (err = gb_file_truncate(&f, written));
+
debugf("Write file with stripped tokens: %s\n", filename);
err = write_file_with_stripped_tokens(&f, file->file, &written);
if (err) {
@@ -2178,6 +2178,7 @@ int strip_semicolons(Parser *parser) {
}
debugf("Copy '%s' to '%s'\n", new_fullpath, old_fullpath);
+
if (!gb_file_copy(new_fullpath, old_fullpath, false)) {
gb_printf_err("failed to copy '%s' to '%s'\n", old_fullpath, new_fullpath);
debugf("Copy '%s' to '%s'\n", old_fullpath_backup, old_fullpath);
@@ -2187,7 +2188,7 @@ int strip_semicolons(Parser *parser) {
failed = true;
break;
}
-
+
debugf("Remove '%s'\n", old_fullpath_backup);
if (!gb_file_remove(old_fullpath_backup)) {
gb_printf_err("failed to remove '%s'\n", old_fullpath_backup);