Version v0.2.38 - updated command-line file encryption to use files directory by default

files/test_decrypt.txt

@@ -0,0 +1 @@
+Test file content for decryption

files/test_file.txt

@@ -0,0 +1 @@
+Hello, this is a test file for encryption!

files/test_file.txt.otp.asc

@@ -0,0 +1,7 @@
+-----BEGIN OTP MESSAGE-----
+Version: v0.2.29
+Pad-ChkSum: d0d4a489354348b08d8c7b324814d8c50010042e9da47f2c973f32a16a09101b
+Pad-Offset: 57
+
+05S8GfS0tFfczNMUz0xrieFGoPSREM4uo5QhFGoBCcOzjfTXTDMt3hRtAQ==
+-----END OTP MESSAGE-----

files/test_input.txt

@@ -0,0 +1 @@
+This is a test file for encryption.

otp.c

@@ -40,6 +40,7 @@ static const int base64_decode_table[256] = {
 #define MAX_HASH_LENGTH 65
 #define PROGRESS_UPDATE_INTERVAL (64 * 1024 * 1024)  // 64MB intervals
 #define PADS_DIR "pads"
+#define FILES_DIR "files"
 #define MAX_ENTROPY_BUFFER 32768  // 32KB entropy buffer
 
 // Function prototypes
@@ -72,7 +73,10 @@ void simple_entropy_mix(unsigned char* urandom_buffer, size_t buffer_size,
 
 // Directory management
 int ensure_pads_directory(void);
+int ensure_files_directory(void);
 void get_pad_path(const char* chksum, char* pad_path, char* state_path);
+const char* get_files_directory(void);
+void get_default_file_path(const char* filename, char* result_path, size_t result_size);
 
 // Utility functions
 uint64_t parse_size_string(const char* size_str);
@@ -99,6 +103,9 @@ int handle_text_encrypt(void);
 int handle_file_encrypt(void);
 int handle_smart_decrypt(void);
 
+// Enhanced input functions
+int get_filename_with_default(const char* prompt, const char* default_path, char* result, size_t result_size);
+
 void print_usage(const char* program_name);
 
 int main(int argc, char* argv[]) {
@@ -110,7 +117,7 @@ int main(int argc, char* argv[]) {
 }
 
 int interactive_mode(void) {
-    printf("=== OTP Cipher %s ===\n\n", get_version());
+    printf("\n\n\n\n=== OTP Cipher %s ===\n\n", get_version());
     
     while (1) {
         show_main_menu();
@@ -268,7 +275,7 @@ int command_line_mode(int argc, char* argv[]) {
 }
 
 void show_main_menu(void) {
-    printf("=== Main Menu ===\n\n");
+    printf("======================== Main Menu ========================\n");
     printf("\033[4mT\033[0mext encrypt\n");
     printf("\033[4mF\033[0mile encrypt\n");
     printf("\033[4mD\033[0mecrypt\n");
@@ -458,16 +465,27 @@ int handle_encrypt_menu(void) {
         
         int ascii_armor = (atoi(format_input) == 2) ? 1 : 0;
         
-        // Ask for custom output filename (optional)
-        printf("\nEnter output filename (or press Enter for default): ");
+        // Generate default output filename with files directory and use enhanced input function
+        char default_output[1024]; // Increased size to prevent truncation warnings
+        char temp_default[1024];
+        
+        // Generate base filename with appropriate extension
+        if (ascii_armor) {
+            snprintf(temp_default, sizeof(temp_default), "%s.otp.asc", input_file);
+        } else {
+            snprintf(temp_default, sizeof(temp_default), "%s.otp", input_file);
+        }
+        
+        // Apply files directory default path
+        get_default_file_path(temp_default, default_output, sizeof(default_output));
+        
         char output_file[512];
-        if (!fgets(output_file, sizeof(output_file), stdin)) {
+        if (get_filename_with_default("Output filename:", default_output, output_file, sizeof(output_file)) != 0) {
             printf("Error: Failed to read input\n");
             return 1;
         }
-        output_file[strcspn(output_file, "\n")] = 0;
         
-        const char* output_filename = (strlen(output_file) > 0) ? output_file : NULL;
+        const char* output_filename = output_file;
         
         return encrypt_file(pad_input, input_file, output_filename, ascii_armor);
     }
@@ -514,16 +532,36 @@ int handle_decrypt_menu(void) {
             return 1;
         }
         
-        // Ask for custom output filename (optional)
-        printf("\nEnter output filename (or press Enter for default): ");
+        // Generate smart default output filename with files directory and use enhanced input function
+        char temp_default[512];
+        char default_output[512];
+        strncpy(temp_default, input_file, sizeof(temp_default) - 1);
+        temp_default[sizeof(temp_default) - 1] = '\0';
+        
+        // Remove common encrypted extensions to get a better default
+        if (strstr(temp_default, ".otp.asc")) {
+            // Replace .otp.asc with original extension or no extension
+            char* ext_pos = strstr(temp_default, ".otp.asc");
+            *ext_pos = '\0';
+        } else if (strstr(temp_default, ".otp")) {
+            // Replace .otp with original extension or no extension  
+            char* ext_pos = strstr(temp_default, ".otp");
+            *ext_pos = '\0';
+        } else {
+            // No recognized encrypted extension, add .decrypted suffix
+            strncat(temp_default, ".decrypted", sizeof(temp_default) - strlen(temp_default) - 1);
+        }
+        
+        // Apply files directory default path
+        get_default_file_path(temp_default, default_output, sizeof(default_output));
+        
         char output_file[512];
-        if (!fgets(output_file, sizeof(output_file), stdin)) {
+        if (get_filename_with_default("Output filename:", default_output, output_file, sizeof(output_file)) != 0) {
             printf("Error: Failed to read input\n");
             return 1;
         }
-        output_file[strcspn(output_file, "\n")] = 0;
         
-        const char* output_filename = (strlen(output_file) > 0) ? output_file : NULL;
+        const char* output_filename = output_file;
         
         return decrypt_file(input_file, output_filename);
     }
@@ -1541,14 +1579,18 @@ int encrypt_file(const char* pad_identifier, const char* input_file, const char*
         return 1;
     }
     
-    // Generate output filename if not specified
+    // Generate output filename if not specified, using files directory
     char default_output[512];
     if (output_file == NULL) {
+        char temp_output[512];
         if (ascii_armor) {
-            snprintf(default_output, sizeof(default_output), "%s.otp.asc", input_file);
+            snprintf(temp_output, sizeof(temp_output), "%s.otp.asc", input_file);
         } else {
-            snprintf(default_output, sizeof(default_output), "%s.otp", input_file);
+            snprintf(temp_output, sizeof(temp_output), "%s.otp", input_file);
         }
+        
+        // Apply files directory default path
+        get_default_file_path(temp_output, default_output, sizeof(default_output));
         output_file = default_output;
     }
     
@@ -2205,6 +2247,38 @@ int ensure_pads_directory(void) {
     return 0;
 }
 
+int ensure_files_directory(void) {
+    struct stat st = {0};
+    if (stat(FILES_DIR, &st) == -1) {
+        if (mkdir(FILES_DIR, 0755) != 0) {
+            return 1;
+        }
+    }
+    return 0;
+}
+
+const char* get_files_directory(void) {
+    struct stat st = {0};
+    if (stat(FILES_DIR, &st) == 0 && S_ISDIR(st.st_mode)) {
+        return FILES_DIR;
+    }
+    return "."; // Fall back to current directory
+}
+
+void get_default_file_path(const char* filename, char* result_path, size_t result_size) {
+    const char* files_dir = get_files_directory();
+    
+    // If filename already has a path (contains '/'), use it as-is
+    if (strchr(filename, '/') != NULL) {
+        strncpy(result_path, filename, result_size - 1);
+        result_path[result_size - 1] = '\0';
+        return;
+    }
+    
+    // Otherwise, prepend the files directory
+    snprintf(result_path, result_size, "%s/%s", files_dir, filename);
+}
+
 void get_pad_path(const char* chksum, char* pad_path, char* state_path) {
     snprintf(pad_path, MAX_HASH_LENGTH + 20, "%s/%s.pad", PADS_DIR, chksum);
     snprintf(state_path, MAX_HASH_LENGTH + 20, "%s/%s.state", PADS_DIR, chksum);
@@ -2297,6 +2371,194 @@ void simple_entropy_mix(unsigned char* urandom_buffer, size_t buffer_size,
     }
 }
 
+// Enhanced input function with editable pre-filled text
+int get_filename_with_default(const char* prompt, const char* default_path, char* result, size_t result_size) {
+    // Find the last directory separator
+    char* last_slash = strrchr(default_path, '/');
+    char directory[1024] = "";
+    char filename[512] = "";
+    
+    if (last_slash) {
+        // Extract directory path
+        size_t dir_len = last_slash - default_path + 1; // Include the trailing slash
+        if (dir_len < sizeof(directory)) {
+            strncpy(directory, default_path, dir_len);
+            directory[dir_len] = '\0';
+        }
+        
+        // Extract filename
+        strncpy(filename, last_slash + 1, sizeof(filename) - 1);
+        filename[sizeof(filename) - 1] = '\0';
+    } else {
+        // No directory separator, treat as filename only
+        strncpy(filename, default_path, sizeof(filename) - 1);
+        filename[sizeof(filename) - 1] = '\0';
+    }
+    
+    // Setup terminal for raw input
+    struct termios orig_termios;
+    if (tcgetattr(STDIN_FILENO, &orig_termios) != 0) {
+        // Fallback to simple input if terminal control fails
+        printf("\n%s\n%s: ", prompt, directory);
+        fflush(stdout);
+        
+        char input_buffer[512];
+        if (!fgets(input_buffer, sizeof(input_buffer), stdin)) {
+            return 1;
+        }
+        input_buffer[strcspn(input_buffer, "\n")] = 0;
+        
+        if (strlen(input_buffer) == 0) {
+            strncpy(result, default_path, result_size - 1);
+        } else {
+            if (strlen(directory) > 0) {
+                snprintf(result, result_size, "%s%s", directory, input_buffer);
+            } else {
+                strncpy(result, input_buffer, result_size - 1);
+            }
+        }
+        result[result_size - 1] = '\0';
+        return 0;
+    }
+    
+    // Set up raw terminal mode
+    struct termios raw_termios = orig_termios;
+    raw_termios.c_lflag &= ~(ECHO | ICANON);
+    raw_termios.c_cc[VMIN] = 1;
+    raw_termios.c_cc[VTIME] = 0;
+    
+    if (tcsetattr(STDIN_FILENO, TCSANOW, &raw_termios) != 0) {
+        // Fallback if terminal setup fails
+        printf("\n%s\n%s: ", prompt, directory);
+        fflush(stdout);
+        
+        char input_buffer[512];
+        if (!fgets(input_buffer, sizeof(input_buffer), stdin)) {
+            return 1;
+        }
+        input_buffer[strcspn(input_buffer, "\n")] = 0;
+        
+        if (strlen(input_buffer) == 0) {
+            strncpy(result, default_path, result_size - 1);
+        } else {
+            if (strlen(directory) > 0) {
+                snprintf(result, result_size, "%s%s", directory, input_buffer);
+            } else {
+                strncpy(result, input_buffer, result_size - 1);
+            }
+        }
+        result[result_size - 1] = '\0';
+        return 0;
+    }
+    
+    // Display prompt and directory
+    printf("\n%s\n%s", prompt, directory);
+    fflush(stdout);
+    
+    // Initialize editing buffer with default filename
+    char edit_buffer[512];
+    strncpy(edit_buffer, filename, sizeof(edit_buffer) - 1);
+    edit_buffer[sizeof(edit_buffer) - 1] = '\0';
+    int cursor_pos = strlen(edit_buffer);
+    int buffer_len = cursor_pos;
+    
+    // Display initial filename
+    printf("%s", edit_buffer);
+    fflush(stdout);
+    
+    // Main editing loop
+    int c;
+    while ((c = getchar()) != EOF) {
+        if (c == '\n' || c == '\r') {
+            // Enter key - accept input
+            break;
+        } else if (c == 127 || c == 8) {
+            // Backspace/Delete
+            if (cursor_pos > 0) {
+                // Move everything after cursor one position left
+                memmove(&edit_buffer[cursor_pos - 1], &edit_buffer[cursor_pos], buffer_len - cursor_pos + 1);
+                cursor_pos--;
+                buffer_len--;
+                
+                // Redraw line: move cursor to start of filename area, clear to end, redraw buffer
+                printf("\r%s\033[K%s", directory, edit_buffer);
+                
+                // Position cursor correctly
+                if (cursor_pos < buffer_len) {
+                    printf("\033[%dD", buffer_len - cursor_pos);
+                }
+                fflush(stdout);
+            }
+        } else if (c == 27) {
+            // Escape sequence (arrow keys, etc.)
+            int c1 = getchar();
+            int c2 = getchar();
+            if (c1 == '[') {
+                if (c2 == 'C' && cursor_pos < buffer_len) {
+                    // Right arrow
+                    cursor_pos++;
+                    printf("\033[1C");
+                    fflush(stdout);
+                } else if (c2 == 'D' && cursor_pos > 0) {
+                    // Left arrow
+                    cursor_pos--;
+                    printf("\033[1D");
+                    fflush(stdout);
+                } else if (c2 == 'H') {
+                    // Home key
+                    printf("\033[%dD", cursor_pos);
+                    cursor_pos = 0;
+                    fflush(stdout);
+                } else if (c2 == 'F') {
+                    // End key
+                    printf("\033[%dC", buffer_len - cursor_pos);
+                    cursor_pos = buffer_len;
+                    fflush(stdout);
+                }
+            }
+        } else if (c >= 32 && c <= 126) {
+            // Printable character
+            if (buffer_len < (int)sizeof(edit_buffer) - 1) {
+                // Move everything after cursor one position right
+                memmove(&edit_buffer[cursor_pos + 1], &edit_buffer[cursor_pos], buffer_len - cursor_pos + 1);
+                edit_buffer[cursor_pos] = c;
+                cursor_pos++;
+                buffer_len++;
+                
+                // Redraw from cursor position
+                printf("%c", c);
+                if (cursor_pos < buffer_len) {
+                    // Print remaining characters and move cursor back
+                    printf("%s\033[%dD", &edit_buffer[cursor_pos], buffer_len - cursor_pos);
+                }
+                fflush(stdout);
+            }
+        }
+        // Ignore other control characters
+    }
+    
+    // Restore terminal
+    tcsetattr(STDIN_FILENO, TCSANOW, &orig_termios);
+    printf("\n");
+    
+    // Construct final result
+    if (buffer_len == 0) {
+        // Empty input, use default
+        strncpy(result, default_path, result_size - 1);
+    } else {
+        // Combine directory with edited filename
+        edit_buffer[buffer_len] = '\0';
+        if (strlen(directory) > 0) {
+            snprintf(result, result_size, "%s%s", directory, edit_buffer);
+        } else {
+            strncpy(result, edit_buffer, result_size - 1);
+        }
+    }
+    result[result_size - 1] = '\0';
+    
+    return 0;
+}
+
 // Editor and file manager implementations
 
 char* get_preferred_editor(void) {
@@ -2560,24 +2822,21 @@ int handle_file_encrypt(void) {
     int ascii_armor = (atoi(format_input) == 2) ? 1 : 0;
     
     // Generate default output filename
-    char default_output[512];
+    char default_output[1024]; // Increased buffer size to prevent truncation warnings
     if (ascii_armor) {
         snprintf(default_output, sizeof(default_output), "%s.otp.asc", input_file);
     } else {
         snprintf(default_output, sizeof(default_output), "%s.otp", input_file);
     }
     
-    // Ask for output filename with pre-filled default
-    printf("\nOutput filename [%s]: ", default_output);
+    // Use enhanced input function for output filename
     char output_file[512];
-    if (!fgets(output_file, sizeof(output_file), stdin)) {
+    if (get_filename_with_default("Output filename:", default_output, output_file, sizeof(output_file)) != 0) {
         printf("Error: Failed to read input\n");
         return 1;
     }
-    output_file[strcspn(output_file, "\n")] = 0;
     
-    // Use default if user just pressed Enter
-    const char* output_filename = (strlen(output_file) > 0) ? output_file : default_output;
+    const char* output_filename = output_file;
     
     return encrypt_file(pad_input, input_file, output_filename, ascii_armor);
 }

test.txt

@@ -1 +0,0 @@
-This is a test file for OTP encryption.

test_ascii

@@ -1 +0,0 @@
-This is a test file for OTP encryption.

test_ascii.otp.asc

@@ -1,7 +0,0 @@
------BEGIN OTP MESSAGE-----
-Version: v0.2.15
-Pad-ChkSum: 0c8e19fde996e683fdbd348d1052eec168ffe6f67a88bb1278d0d02e9341b87b
-Pad-Offset: 210
-
-mMIm7iVtUO6NbXbskMxtydI/A16UXEQUGTcIya/8Dja6PB3EC0MLdw==
------END OTP MESSAGE-----

test_new.txt

@@ -0,0 +1 @@
+Testing files directory functionality