Version v0.2.64 - Fixed OTP thumb drive detection logic for /media/[username]/[drive_name] pattern

otp.c

@@ -132,41 +132,41 @@ int main(int argc, char* argv[]) {
 }
 
 int interactive_mode(void) {
-    // printf("\n\n\n\n=== OTP Cipher %s ===\n\n", get_version());
+    char input[10];
     
     while (1) {
         show_main_menu();
-        char input[10];
-        if (fgets(input, sizeof(input), stdin)) {
-            char choice = toupper(input[0]);
-            
-            switch (choice) {
-                case 'T':
-                    handle_text_encrypt();
-                    break;
-                case 'F':
-                    handle_file_encrypt();
-                    break;
-                case 'D':
-                    handle_decrypt_menu();
-                    break;
-                case 'P':
-                    handle_pads_menu();
-                    break;
-                case 'X':
-                case 'Q':
-                    printf("Goodbye!\n");
-                    return 0;
-                default:
-                    printf("Invalid option. Please select T, F, D, P, or X.\n");
-                    continue;
-            }
-        } else {
-            printf("Error reading input. Please try again.\n");
-            continue;
+        
+        if (!fgets(input, sizeof(input), stdin)) {
+            printf("Goodbye!\n");
+            break;
+        }
+        
+        char choice = toupper(input[0]);
+        
+        switch (choice) {
+            case 'T':
+                handle_text_encrypt();
+                break;
+            case 'F':
+                handle_file_encrypt();
+                break;
+            case 'D':
+                handle_decrypt_menu();
+                break;
+            case 'P':
+                handle_pads_menu();
+                break;
+            case 'X':
+                printf("Goodbye!\n");
+                return 0;
+            default:
+                printf("Invalid choice. Please try again.\n");
+                break;
         }
-        printf("\n");
     }
+    
+    return 0;
 }
 
 int command_line_mode(int argc, char* argv[]) {
@@ -767,7 +767,7 @@ int list_available_pads(void) {
             chksum[64] = '\0';
             
             // Get pad file size
-            char full_path[300]; // Increased buffer size to accommodate longer paths
+            char full_path[1024]; // Increased buffer size to accommodate longer paths
             snprintf(full_path, sizeof(full_path), "%s/%s", current_pads_dir, entry->d_name);
             struct stat st;
             if (stat(full_path, &st) == 0) {
@@ -2095,7 +2095,7 @@ int decrypt_ascii_file(const char* input_file, const char* output_file) {
 }
 
 int read_state_offset(const char* pad_chksum, uint64_t* offset) {
-    char state_filename[MAX_HASH_LENGTH + 20];
+    char state_filename[1024];
     snprintf(state_filename, sizeof(state_filename), "%s/%s.state", current_pads_dir, pad_chksum);
     
     FILE* state_file = fopen(state_filename, "rb");
@@ -2115,7 +2115,7 @@ int read_state_offset(const char* pad_chksum, uint64_t* offset) {
 }
 
 int write_state_offset(const char* pad_chksum, uint64_t offset) {
-    char state_filename[MAX_HASH_LENGTH + 20];
+    char state_filename[1024];
     snprintf(state_filename, sizeof(state_filename), "%s/%s.state", current_pads_dir, pad_chksum);
     
     FILE* state_file = fopen(state_filename, "wb");
@@ -2289,8 +2289,8 @@ void get_default_file_path(const char* filename, char* result_path, size_t resul
 }
 
 void get_pad_path(const char* chksum, char* pad_path, char* state_path) {
-    snprintf(pad_path, MAX_HASH_LENGTH + 20, "%s/%s.pad", current_pads_dir, chksum);
-    snprintf(state_path, MAX_HASH_LENGTH + 20, "%s/%s.state", current_pads_dir, chksum);
+    snprintf(pad_path, 1024, "%s/%s.pad", current_pads_dir, chksum);
+    snprintf(state_path, 1024, "%s/%s.state", current_pads_dir, chksum);
 }
 
 // OTP thumb drive detection function implementation
@@ -2305,14 +2305,39 @@ int detect_otp_thumb_drive(char* otp_drive_path, size_t path_size) {
         while ((mount_entry = readdir(mount_dir)) != NULL) {
             if (mount_entry->d_name[0] == '.') continue;
             
-            // Check if drive name starts with "OTP"
-            if (strncmp(mount_entry->d_name, "OTP", 3) != 0) continue;
-            
             char mount_path[512];
             snprintf(mount_path, sizeof(mount_path), "%s/%s", mount_dirs[mount_idx], mount_entry->d_name);
             
-            // For /run/media, we need to go one level deeper (skip username)
-            if (strcmp(mount_dirs[mount_idx], "/run/media") == 0) {
+            // For /media, we need to go one level deeper (user directories)
+            if (strcmp(mount_dirs[mount_idx], "/media") == 0) {
+                // This is /media/[username] - look inside for drives
+                DIR* user_dir = opendir(mount_path);
+                if (!user_dir) continue;
+                
+                struct dirent* user_entry;
+                while ((user_entry = readdir(user_dir)) != NULL) {
+                    if (user_entry->d_name[0] == '.') continue;
+                    
+                    // Check if drive name starts with "OTP"
+                    if (strncmp(user_entry->d_name, "OTP", 3) != 0) continue;
+                    
+                    char user_mount_path[512];
+                    snprintf(user_mount_path, sizeof(user_mount_path), "%s/%s", mount_path, user_entry->d_name);
+                    
+                    // Check if this is a readable directory
+                    DIR* drive_dir = opendir(user_mount_path);
+                    if (drive_dir) {
+                        closedir(drive_dir);
+                        strncpy(otp_drive_path, user_mount_path, path_size - 1);
+                        otp_drive_path[path_size - 1] = '\0';
+                        closedir(user_dir);
+                        closedir(mount_dir);
+                        return 1; // Found OTP drive
+                    }
+                }
+                closedir(user_dir);
+            } else if (strcmp(mount_dirs[mount_idx], "/run/media") == 0) {
+                // For /run/media, we need to go one level deeper (skip username)
                 DIR* user_dir = opendir(mount_path);
                 if (!user_dir) continue;
                 
@@ -2339,14 +2364,17 @@ int detect_otp_thumb_drive(char* otp_drive_path, size_t path_size) {
                 }
                 closedir(user_dir);
             } else {
-                // Direct mount point (like /media/OTP_DRIVE or /mnt/OTP_DRIVE)
-                DIR* drive_dir = opendir(mount_path);
-                if (drive_dir) {
-                    closedir(drive_dir);
-                    strncpy(otp_drive_path, mount_path, path_size - 1);
-                    otp_drive_path[path_size - 1] = '\0';
-                    closedir(mount_dir);
-                    return 1; // Found OTP drive
+                // Direct mount point (like /mnt/OTP_DRIVE)
+                // Check if drive name starts with "OTP"
+                if (strncmp(mount_entry->d_name, "OTP", 3) == 0) {
+                    DIR* drive_dir = opendir(mount_path);
+                    if (drive_dir) {
+                        closedir(drive_dir);
+                        strncpy(otp_drive_path, mount_path, path_size - 1);
+                        otp_drive_path[path_size - 1] = '\0';
+                        closedir(mount_dir);
+                        return 1; // Found OTP drive
+                    }
                 }
             }
         }