Version v0.2.18 - Remove original filename from binary .otp file format - simplify file structure

.clinerules/workspace_rules.md

@@ -0,0 +1,4 @@
+
+When building, use build.sh, not make. 
+
+Use it as follows: build.sh -m "useful comment on changes being made"

debug.c

@@ -0,0 +1 @@
+int main() { printf("Testing direct filename: %d\n", strncmp("97d9d82b5414a9439102f3811fb90ab1d6368a00d33229a18b306476f9d04f82.pad", "97", 2)); return 0; }

otp.c

@@ -365,41 +365,53 @@ uint64_t parse_size_string(const char* size_str) {
 
 char* find_pad_by_prefix(const char* prefix) {
     DIR* dir = opendir(PADS_DIR);
-    if (!dir) return NULL;
+    if (!dir) {
+        printf("Error: Cannot open pads directory\n");
+        return NULL;
+    }
     
     struct dirent* entry;
     char* matches[100];  // Store up to 100 matches
     int match_count = 0;
     
     // Check if it's a number (for interactive menu selection)
+    // Only treat as number if it's a single digit (1-9) to avoid conflicts with hex prefixes
     char* endptr;
     int selection = strtol(prefix, &endptr, 10);
-    if (*endptr == '\0' && selection > 0) {
+    if (*endptr == '\0' && selection > 0 && selection <= 9 && strlen(prefix) == 1) {
         // It's a number, find the nth pad
         int current = 0;
         rewinddir(dir);
         while ((entry = readdir(dir)) != NULL && match_count == 0) {
-            if (strstr(entry->d_name, ".pad") && strlen(entry->d_name) == 68) { // 64 char chksum + ".pad"
-                current++;
-                if (current == selection) {
-                    matches[match_count] = malloc(65);
-                    strncpy(matches[match_count], entry->d_name, 64);
-                    matches[match_count][64] = '\0';
-                    match_count = 1;
-                }
+            // Skip . and .. entries, and only process .pad files
+            if (entry->d_name[0] == '.') continue;
+            if (!strstr(entry->d_name, ".pad")) continue;
+            if (strlen(entry->d_name) != 68) continue; // 64 char chksum + ".pad"
+            
+            current++;
+            if (current == selection) {
+                matches[match_count] = malloc(65);
+                strncpy(matches[match_count], entry->d_name, 64);
+                matches[match_count][64] = '\0';
+                match_count = 1;
+                break;
             }
         }
     } else {
         // Find pads that start with the prefix
         size_t prefix_len = strlen(prefix);
         while ((entry = readdir(dir)) != NULL && match_count < 100) {
-            if (strstr(entry->d_name, ".pad") && strlen(entry->d_name) == 68) {
-                if (strncmp(entry->d_name, prefix, prefix_len) == 0) {
-                    matches[match_count] = malloc(65);
-                    strncpy(matches[match_count], entry->d_name, 64);
-                    matches[match_count][64] = '\0';
-                    match_count++;
-                }
+            // Skip . and .. entries, and only process .pad files
+            if (entry->d_name[0] == '.') continue;
+            if (!strstr(entry->d_name, ".pad")) continue;
+            if (strlen(entry->d_name) != 68) continue; // 64 char chksum + ".pad"
+            
+            // Compare prefix with the filename (checksum part)
+            if (strncmp(entry->d_name, prefix, prefix_len) == 0) {
+                matches[match_count] = malloc(65);
+                strncpy(matches[match_count], entry->d_name, 64);
+                matches[match_count][64] = '\0';
+                match_count++;
             }
         }
     }
@@ -418,14 +430,35 @@ char* find_pad_by_prefix(const char* prefix) {
         printf("Multiple matches found for '%s':\n", prefix);
         for (int i = 0; i < match_count; i++) {
             printf("%d. %.16s...\n", i + 1, matches[i]);
-            if (i > 0) free(matches[i]);
         }
-        printf("Please be more specific.\n");
-        char* result = matches[0];
-        for (int i = 1; i < match_count; i++) {
+        printf("Please be more specific or enter a number (1-%d): ", match_count);
+        fflush(stdout);
+        
+        char choice_input[64];
+        if (fgets(choice_input, sizeof(choice_input), stdin)) {
+            choice_input[strcspn(choice_input, "\n")] = 0;
+            
+            // Check if it's a number
+            char* endptr;
+            int choice = strtol(choice_input, &endptr, 10);
+            if (*endptr == '\0' && choice >= 1 && choice <= match_count) {
+                // Valid choice, return selected pad
+                char* result = matches[choice - 1];
+                // Free the others
+                for (int i = 0; i < match_count; i++) {
+                    if (i != choice - 1) {
+                        free(matches[i]);
+                    }
+                }
+                return result;
+            }
+        }
+        
+        // Invalid choice or no input, free all and return NULL
+        for (int i = 0; i < match_count; i++) {
             free(matches[i]);
         }
-        return result;
+        return NULL;
     }
 }
 
@@ -1412,16 +1445,6 @@ int encrypt_file(const char* pad_identifier, const char* input_file, const char*
         // Pad offset: 8 bytes
         fwrite(&current_offset, sizeof(uint64_t), 1, output_fp);
         
-        // Original filename length and name
-        const char* base_filename = strrchr(input_file, '/');
-        if (base_filename) {
-            base_filename++; // Skip the '/'
-        } else {
-            base_filename = input_file;
-        }
-        uint16_t filename_len = strlen(base_filename);
-        fwrite(&filename_len, sizeof(uint16_t), 1, output_fp);
-        fwrite(base_filename, 1, filename_len, output_fp);
         
         // File mode: 4 bytes
         uint32_t file_mode = input_stat.st_mode;
@@ -1494,7 +1517,6 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
     uint16_t version;
     unsigned char pad_chksum_bin[32];
     uint64_t pad_offset;
-    uint16_t filename_len;
     uint32_t file_mode;
     uint64_t file_size;
     
@@ -1502,7 +1524,8 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
         fread(&version, sizeof(uint16_t), 1, input_fp) != 1 ||
         fread(pad_chksum_bin, 1, 32, input_fp) != 32 ||
         fread(&pad_offset, sizeof(uint64_t), 1, input_fp) != 1 ||
-        fread(&filename_len, sizeof(uint16_t), 1, input_fp) != 1) {
+        fread(&file_mode, sizeof(uint32_t), 1, input_fp) != 1 ||
+        fread(&file_size, sizeof(uint64_t), 1, input_fp) != 1) {
         printf("Error: Cannot read binary header\n");
         fclose(input_fp);
         return 1;
@@ -1514,25 +1537,6 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
         return 1;
     }
     
-    // Read original filename
-    char* original_filename = malloc(filename_len + 1);
-    if (fread(original_filename, 1, filename_len, input_fp) != filename_len) {
-        printf("Error: Cannot read original filename\n");
-        free(original_filename);
-        fclose(input_fp);
-        return 1;
-    }
-    original_filename[filename_len] = '\0';
-    
-    // Read remaining header
-    if (fread(&file_mode, sizeof(uint32_t), 1, input_fp) != 1 ||
-        fread(&file_size, sizeof(uint64_t), 1, input_fp) != 1) {
-        printf("Error: Cannot read file metadata\n");
-        free(original_filename);
-        fclose(input_fp);
-        return 1;
-    }
-    
     // Convert binary checksum to hex
     char pad_chksum_hex[65];
     for (int i = 0; i < 32; i++) {
@@ -1541,7 +1545,6 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
     pad_chksum_hex[64] = '\0';
     
     printf("Decrypting binary file...\n");
-    printf("Original filename: %s\n", original_filename);
     printf("File size: %lu bytes\n", file_size);
     
     // Check if we have the required pad
@@ -1553,7 +1556,6 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
         printf("Error: Required pad not found: %s\n", pad_chksum_hex);
         printf("Available pads:\n");
         list_available_pads();
-        free(original_filename);
         fclose(input_fp);
         return 1;
     }
@@ -1561,8 +1563,7 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
     // Determine output filename
     char default_output[512];
     if (output_file == NULL) {
-        strncpy(default_output, original_filename, sizeof(default_output) - 1);
-        default_output[sizeof(default_output) - 1] = '\0';
+        snprintf(default_output, sizeof(default_output), "decrypted.bin");
         output_file = default_output;
     }
     
@@ -1570,7 +1571,6 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
     unsigned char* encrypted_data = malloc(file_size);
     if (fread(encrypted_data, 1, file_size, input_fp) != file_size) {
         printf("Error: Cannot read encrypted data\n");
-        free(original_filename);
         free(encrypted_data);
         fclose(input_fp);
         return 1;
@@ -1581,14 +1581,12 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
     FILE* pad_file = fopen(pad_path, "rb");
     if (!pad_file) {
         printf("Error: Cannot open pad file\n");
-        free(original_filename);
         free(encrypted_data);
         return 1;
     }
     
     if (fseek(pad_file, pad_offset, SEEK_SET) != 0) {
         printf("Error: Cannot seek to offset in pad file\n");
-        free(original_filename);
         free(encrypted_data);
         fclose(pad_file);
         return 1;
@@ -1597,7 +1595,6 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
     unsigned char* pad_data = malloc(file_size);
     if (fread(pad_data, 1, file_size, pad_file) != file_size) {
         printf("Error: Cannot read pad data\n");
-        free(original_filename);
         free(encrypted_data);
         free(pad_data);
         fclose(pad_file);
@@ -1614,7 +1611,6 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
     FILE* output_fp = fopen(output_file, "wb");
     if (!output_fp) {
         printf("Error: Cannot create output file %s\n", output_file);
-        free(original_filename);
         free(encrypted_data);
         free(pad_data);
         return 1;
@@ -1622,7 +1618,6 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
     
     if (fwrite(encrypted_data, 1, file_size, output_fp) != file_size) {
         printf("Error: Cannot write decrypted data\n");
-        free(original_filename);
         free(encrypted_data);
         free(pad_data);
         fclose(output_fp);
@@ -1639,7 +1634,6 @@ int decrypt_binary_file(FILE* input_fp, const char* output_file) {
     printf("Restored permissions and metadata\n");
     
     // Cleanup
-    free(original_filename);
     free(encrypted_data);
     free(pad_data);