Compare commits

..

2 Commits

3 changed files with 37 additions and 6 deletions

View File

@@ -289,6 +289,10 @@ build_project() {
fi fi
fi fi
# Clean up object files after successful build
print_status "Cleaning up object files..."
rm -f src/*.o
# Create Gitea release with binaries # Create Gitea release with binaries
if [ -f "$HOME/.gitea_token" ]; then if [ -f "$HOME/.gitea_token" ]; then
create_gitea_release "$NEW_VERSION" create_gitea_release "$NEW_VERSION"

1
otp Symbolic link
View File

@@ -0,0 +1 @@
./build/otp-x86_64

View File

@@ -89,7 +89,10 @@ int generate_pad(uint64_t size_bytes, int display_progress) {
const char* pads_dir = get_current_pads_dir(); const char* pads_dir = get_current_pads_dir();
struct statvfs stat; struct statvfs stat;
if (statvfs(pads_dir, &stat) == 0) { if (statvfs(pads_dir, &stat) == 0) {
uint64_t available_bytes = stat.f_bavail * stat.f_frsize; // Use f_bfree (total free blocks) instead of f_bavail (available to non-root)
// This gives the actual free space on the filesystem, which is more accurate
// for removable media and user-owned directories
uint64_t available_bytes = stat.f_bfree * stat.f_frsize;
double available_gb = (double)available_bytes / (1024.0 * 1024.0 * 1024.0); double available_gb = (double)available_bytes / (1024.0 * 1024.0 * 1024.0);
double required_gb = (double)size_bytes / (1024.0 * 1024.0 * 1024.0); double required_gb = (double)size_bytes / (1024.0 * 1024.0 * 1024.0);
@@ -233,19 +236,41 @@ int read_state_offset(const char* pad_chksum, uint64_t* offset) {
const char* pads_dir = get_current_pads_dir(); const char* pads_dir = get_current_pads_dir();
snprintf(state_filename, sizeof(state_filename), "%s/%s.state", pads_dir, pad_chksum); snprintf(state_filename, sizeof(state_filename), "%s/%s.state", pads_dir, pad_chksum);
FILE* state_file = fopen(state_filename, "rb"); FILE* state_file = fopen(state_filename, "r");
if (!state_file) { if (!state_file) {
*offset = 0; *offset = 0;
return 0; return 0;
} }
if (fread(offset, sizeof(uint64_t), 1, state_file) != 1) { // Try to read as text format first (new format)
char line[128];
if (fgets(line, sizeof(line), state_file)) {
// Check if it's text format (starts with "offset=")
if (strncmp(line, "offset=", 7) == 0) {
*offset = strtoull(line + 7, NULL, 10);
fclose(state_file);
return 0;
}
// Not text format, try binary format (legacy)
fclose(state_file);
state_file = fopen(state_filename, "rb");
if (!state_file) {
*offset = 0;
return 0;
}
if (fread(offset, sizeof(uint64_t), 1, state_file) != 1) {
fclose(state_file);
*offset = 0;
return 0;
}
fclose(state_file); fclose(state_file);
*offset = 0;
return 0; return 0;
} }
fclose(state_file); fclose(state_file);
*offset = 0;
return 0; return 0;
} }
@@ -254,12 +279,13 @@ int write_state_offset(const char* pad_chksum, uint64_t offset) {
const char* pads_dir = get_current_pads_dir(); const char* pads_dir = get_current_pads_dir();
snprintf(state_filename, sizeof(state_filename), "%s/%s.state", pads_dir, pad_chksum); snprintf(state_filename, sizeof(state_filename), "%s/%s.state", pads_dir, pad_chksum);
FILE* state_file = fopen(state_filename, "wb"); FILE* state_file = fopen(state_filename, "w");
if (!state_file) { if (!state_file) {
return 1; return 1;
} }
if (fwrite(&offset, sizeof(uint64_t), 1, state_file) != 1) { // Write in text format for human readability
if (fprintf(state_file, "offset=%lu\n", offset) < 0) {
fclose(state_file); fclose(state_file);
return 1; return 1;
} }