Version v0.2.73 - Fixed newline formatting - clean output for pipe mode, spaced for interactive

encrypted.txt

@@ -0,0 +1,11 @@
+
+
+-----BEGIN OTP MESSAGE-----
+Version: v0.2.72
+Pad-ChkSum: 97d9d82b5414a9439102f3811fb90ab1d6368a00d33229a18b306476f9d04f82
+Pad-Offset: 2873419
+
+iR6J7HHK1Oc6
+-----END OTP MESSAGE-----
+
+

otp.c

@@ -46,10 +46,26 @@ static const int base64_decode_table[256] = {
 // Global variable for current pads directory (can be local or OTP thumb drive)
 static char current_pads_dir[512] = DEFAULT_PADS_DIR;
 
+// Global variable for default pad path from preferences
+static char default_pad_path[1024] = "";
+
 // Function prototypes
 int main(int argc, char* argv[]);
 int interactive_mode(void);
 int command_line_mode(int argc, char* argv[]);
+int pipe_mode(int argc, char* argv[], const char* piped_text);
+
+// Stdin detection functions
+int has_stdin_data(void);
+char* read_stdin_text(void);
+
+// Preferences management functions
+int load_preferences(void);
+int save_preferences(void);
+char* get_preference(const char* key);
+int set_preference(const char* key, const char* value);
+char* get_default_pad_path(void);
+int set_default_pad_path(const char* pad_path);
 
 // OTP thumb drive detection function
 int detect_otp_thumb_drive(char* otp_drive_path, size_t path_size);
@@ -115,16 +131,35 @@ void get_directory_display(const char* file_path, char* result, size_t result_si
 void print_usage(const char* program_name);
 
 int main(int argc, char* argv[]) {
+    // Load preferences first
+    load_preferences();
+    
+    // Check for piped input first (before any output)
+    int is_pipe_mode = (argc == 1 && has_stdin_data());
+    
     // Check for OTP thumb drive on startup
     char otp_drive_path[512];
     if (detect_otp_thumb_drive(otp_drive_path, sizeof(otp_drive_path))) {
-        printf("Detected OTP thumb drive: %s\n", otp_drive_path);
-        printf("Using as default pads directory for this session.\n\n");
+        // Only show messages in interactive/command mode, not pipe mode
+        if (!is_pipe_mode) {
+            printf("Detected OTP thumb drive: %s\n", otp_drive_path);
+            printf("Using as default pads directory for this session.\n\n");
+        }
         strncpy(current_pads_dir, otp_drive_path, sizeof(current_pads_dir) - 1);
         current_pads_dir[sizeof(current_pads_dir) - 1] = '\0';
     }
     
-    if (argc == 1) {
+    if (is_pipe_mode) {
+        // No arguments but has piped data - enter pipe mode
+        char* piped_text = read_stdin_text();
+        if (piped_text) {
+            int result = pipe_mode(argc, argv, piped_text);
+            free(piped_text);
+            return result;
+        }
+        // If reading stdin failed, fall back to interactive mode
+        return interactive_mode();
+    } else if (argc == 1) {
         return interactive_mode();
     } else {
         return command_line_mode(argc, argv);
@@ -1355,8 +1390,15 @@ int encrypt_text(const char* pad_identifier, const char* input_text) {
         printf("Warning: Failed to update state file\n");
     }
     
-    // Output in ASCII armor format
-    printf("\n\n-----BEGIN OTP MESSAGE-----\n");
+    // Output in ASCII armor format - clean format for piping, spaced format for interactive
+    int is_interactive = (input_text == NULL); // Interactive if no input_text provided
+    
+    if (is_interactive) {
+        printf("\n\n-----BEGIN OTP MESSAGE-----\n");
+    } else {
+        printf("-----BEGIN OTP MESSAGE-----\n");
+    }
+    
     printf("Version: %s\n", get_version());
     printf("Pad-ChkSum: %s\n", chksum_hex);
     printf("Pad-Offset: %lu\n", current_offset);
@@ -1368,7 +1410,11 @@ int encrypt_text(const char* pad_identifier, const char* input_text) {
         printf("%.64s\n", base64_cipher + i);
     }
     
-    printf("-----END OTP MESSAGE-----\n\n\n");
+    if (is_interactive) {
+        printf("-----END OTP MESSAGE-----\n\n\n");
+    } else {
+        printf("-----END OTP MESSAGE-----\n");
+    }
     
     // Cleanup
     free(pad_data);
@@ -2323,6 +2369,212 @@ void get_pad_path(const char* chksum, char* pad_path, char* state_path) {
     snprintf(state_path, 1024, "%s/%s.state", current_pads_dir, chksum);
 }
 
+// Stdin detection functions implementation
+int has_stdin_data(void) {
+    // Check if stdin is a pipe/redirect (not a terminal)
+    if (!isatty(STDIN_FILENO)) {
+        return 1;
+    }
+    return 0;
+}
+
+char* read_stdin_text(void) {
+    size_t capacity = 4096;
+    size_t length = 0;
+    char* buffer = malloc(capacity);
+    
+    if (!buffer) {
+        return NULL;
+    }
+    
+    char chunk[1024];
+    while (fgets(chunk, sizeof(chunk), stdin)) {
+        size_t chunk_len = strlen(chunk);
+        
+        // Ensure we have enough capacity
+        while (length + chunk_len >= capacity) {
+            capacity *= 2;
+            char* new_buffer = realloc(buffer, capacity);
+            if (!new_buffer) {
+                free(buffer);
+                return NULL;
+            }
+            buffer = new_buffer;
+        }
+        
+        strcpy(buffer + length, chunk);
+        length += chunk_len;
+    }
+    
+    // Remove trailing newline if present
+    if (length > 0 && buffer[length - 1] == '\n') {
+        buffer[length - 1] = '\0';
+        length--;
+    }
+    
+    // If empty, free and return NULL
+    if (length == 0) {
+        free(buffer);
+        return NULL;
+    }
+    
+    return buffer;
+}
+
+int pipe_mode(int argc, char* argv[], const char* piped_text) {
+    (void)argc; // Suppress unused parameter warning
+    (void)argv; // Suppress unused parameter warning
+    
+    // Check if we have a default pad configured
+    char* default_pad = get_default_pad_path();
+    if (default_pad) {
+        // Verify the default pad exists and extract checksum
+        if (access(default_pad, R_OK) == 0) {
+            // Extract checksum from pad filename
+            char* filename = strrchr(default_pad, '/');
+            if (!filename) filename = default_pad;
+            else filename++; // Skip the '/'
+            
+            // Extract checksum (remove .pad extension)
+            if (strlen(filename) >= 68 && strstr(filename, ".pad")) {
+                char pad_checksum[65];
+                strncpy(pad_checksum, filename, 64);
+                pad_checksum[64] = '\0';
+                
+                free(default_pad);
+                
+                // Encrypt using the default pad (silent mode)
+                return encrypt_text(pad_checksum, piped_text);
+            }
+        }
+        
+        fprintf(stderr, "Error: Default pad not found or invalid: %s\n", default_pad);
+        free(default_pad);
+        return 1;
+    }
+    
+    fprintf(stderr, "Error: No default pad configured for pipe mode\n");
+    fprintf(stderr, "Configure a default pad in ~/.otp/otp.conf\n");
+    return 1;
+}
+
+// Preferences management functions implementation
+int load_preferences(void) {
+    char* home_dir = getenv("HOME");
+    if (!home_dir) {
+        return 1; // No home directory
+    }
+    
+    char preferences_dir[1024];
+    char preferences_file[1024];
+    snprintf(preferences_dir, sizeof(preferences_dir), "%s/.otp", home_dir);
+    snprintf(preferences_file, sizeof(preferences_file), "%s/otp.conf", preferences_dir);
+    
+    FILE* file = fopen(preferences_file, "r");
+    if (!file) {
+        return 0; // No preferences file, use defaults
+    }
+    
+    char line[1024];
+    while (fgets(line, sizeof(line), file)) {
+        // Remove newline
+        line[strcspn(line, "\n")] = 0;
+        
+        // Skip empty lines and comments
+        if (strlen(line) == 0 || line[0] == '#') {
+            continue;
+        }
+        
+        // Parse key=value pairs
+        char* equals = strchr(line, '=');
+        if (equals) {
+            *equals = '\0';
+            char* key = line;
+            char* value = equals + 1;
+            
+            // Trim whitespace
+            while (*key == ' ' || *key == '\t') key++;
+            while (*value == ' ' || *value == '\t') value++;
+            
+            if (strcmp(key, "default_pad") == 0) {
+                strncpy(default_pad_path, value, sizeof(default_pad_path) - 1);
+                default_pad_path[sizeof(default_pad_path) - 1] = '\0';
+            }
+        }
+    }
+    
+    fclose(file);
+    return 0;
+}
+
+int save_preferences(void) {
+    char* home_dir = getenv("HOME");
+    if (!home_dir) {
+        return 1;
+    }
+    
+    char preferences_dir[1024];
+    char preferences_file[1024];
+    snprintf(preferences_dir, sizeof(preferences_dir), "%s/.otp", home_dir);
+    snprintf(preferences_file, sizeof(preferences_file), "%s/otp.conf", preferences_dir);
+    
+    // Create .otp directory if it doesn't exist
+    struct stat st = {0};
+    if (stat(preferences_dir, &st) == -1) {
+        if (mkdir(preferences_dir, 0755) != 0) {
+            return 1;
+        }
+    }
+    
+    FILE* file = fopen(preferences_file, "w");
+    if (!file) {
+        return 1;
+    }
+    
+    fprintf(file, "# OTP Preferences File\n");
+    fprintf(file, "# This file is automatically generated and updated by the OTP program\n\n");
+    
+    if (strlen(default_pad_path) > 0) {
+        fprintf(file, "default_pad=%s\n", default_pad_path);
+    }
+    
+    fclose(file);
+    return 0;
+}
+
+char* get_preference(const char* key) {
+    if (strcmp(key, "default_pad") == 0) {
+        if (strlen(default_pad_path) > 0) {
+            return strdup(default_pad_path);
+        }
+    }
+    return NULL;
+}
+
+int set_preference(const char* key, const char* value) {
+    if (strcmp(key, "default_pad") == 0) {
+        if (value) {
+            strncpy(default_pad_path, value, sizeof(default_pad_path) - 1);
+            default_pad_path[sizeof(default_pad_path) - 1] = '\0';
+        } else {
+            default_pad_path[0] = '\0';
+        }
+        return save_preferences();
+    }
+    return 1;
+}
+
+char* get_default_pad_path(void) {
+    if (strlen(default_pad_path) > 0) {
+        return strdup(default_pad_path);
+    }
+    return NULL;
+}
+
+int set_default_pad_path(const char* pad_path) {
+    return set_preference("default_pad", pad_path);
+}
+
 // OTP thumb drive detection function implementation
 int detect_otp_thumb_drive(char* otp_drive_path, size_t path_size) {
     const char* mount_dirs[] = {"/media", "/run/media", "/mnt", NULL};