Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1c4200a73a | |||
| 1c9e2ee527 |
52
otp.c
52
otp.c
@@ -158,6 +158,7 @@ int interactive_mode(void) {
|
||||
handle_pads_menu();
|
||||
break;
|
||||
case 'X':
|
||||
case 'Q':
|
||||
printf("Goodbye!\n");
|
||||
return 0;
|
||||
default:
|
||||
@@ -1127,10 +1128,39 @@ int generate_pad_with_entropy(uint64_t size_bytes, int display_progress, int use
|
||||
// Get final paths in pads directory
|
||||
get_pad_path(chksum_hex, pad_path, state_path);
|
||||
|
||||
// Try rename first (works for same filesystem)
|
||||
if (rename(temp_filename, pad_path) != 0) {
|
||||
printf("Error: Cannot move pad file to pads directory\n");
|
||||
// If rename fails, try copy and delete (works across filesystems)
|
||||
FILE* temp_file = fopen(temp_filename, "rb");
|
||||
FILE* dest_file = fopen(pad_path, "wb");
|
||||
|
||||
if (!temp_file || !dest_file) {
|
||||
printf("Error: Cannot copy pad file to pads directory\n");
|
||||
if (temp_file) fclose(temp_file);
|
||||
if (dest_file) fclose(dest_file);
|
||||
unlink(temp_filename);
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Copy file in chunks
|
||||
unsigned char copy_buffer[64 * 1024];
|
||||
size_t bytes_read;
|
||||
while ((bytes_read = fread(copy_buffer, 1, sizeof(copy_buffer), temp_file)) > 0) {
|
||||
if (fwrite(copy_buffer, 1, bytes_read, dest_file) != bytes_read) {
|
||||
printf("Error: Failed to copy pad file to pads directory\n");
|
||||
fclose(temp_file);
|
||||
fclose(dest_file);
|
||||
unlink(temp_filename);
|
||||
unlink(pad_path);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
fclose(temp_file);
|
||||
fclose(dest_file);
|
||||
|
||||
// Remove temporary file after successful copy
|
||||
unlink(temp_filename);
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Set pad file to read-only
|
||||
@@ -3016,10 +3046,15 @@ int handle_pads_menu(void) {
|
||||
|
||||
char input[10];
|
||||
if (fgets(input, sizeof(input), stdin)) {
|
||||
char choice = toupper(input[0]);
|
||||
if (choice == 'G') {
|
||||
return handle_generate_menu();
|
||||
char choice = toupper(input[0]);
|
||||
if (choice == 'G') {
|
||||
int result = handle_generate_menu();
|
||||
if (result == 0) {
|
||||
// After successful pad generation, return to pads menu
|
||||
return handle_pads_menu();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -3088,7 +3123,12 @@ int handle_pads_menu(void) {
|
||||
|
||||
// Handle actions first
|
||||
if (toupper(input[0]) == 'G') {
|
||||
return handle_generate_menu();
|
||||
int result = handle_generate_menu();
|
||||
if (result == 0) {
|
||||
// After successful pad generation, return to pads menu
|
||||
return handle_pads_menu();
|
||||
}
|
||||
return result;
|
||||
} else if (toupper(input[0]) == 'B') {
|
||||
return 0; // Back to main menu
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user