Merge branch 'hotfix--D-everywhere'

hotfix--D-everywhere complete

Author: coderarjob

CHANGES.md

@@ -1,3 +1,9 @@
+## Release version: 1.1.1
+
+* **Change:** -D now works for both encryption and decryption. Deletes source
+files if operation was successful.
+* **Change:** Usage information changed to mention the above point.
+
 ## Release version: 1.1.0
 
 * **Feature:** Output to stdout development complete.

README.md

@@ -36,14 +36,21 @@ will not install it anywhere. So no root is required.
 ## Usage:
 
 ```
-tea [-e [-D] |-d [-N] ] [-v] -k '16 byte key' -I <input files...>
--e    - Encrypt.
--d    - Decrypt.
--D    - Delete source files after encryption.
--N    - Send decryption output to stdout.
--v    - Verbose output.
+tea [-e |-d [-N] ] [-D] [-v] -k '16 byte key' -I <...>
+-e    - Encrypt
+        Encrypts the input files and the output files of each will be placed in the 
+-d    - Decrypt
+        Decrypts the input files and the output files of each will be placed in the 
+-N    - When decrypting, display output to stdout.
+-D    - Deletes source files after encryption or decryption.
+-v    - Verbose
 -k    - 16 byte key.
--I    - Input files for decryption/encryption.
+-I    - Files that need to be processed.
+
+Notes:
+      - Cannot use -D (Delete file), -N (stdout output) together.
+      - Cannot use -e (encryption), -N (stdout output) together.
+      - When using -N (stdout output), -v (Verbose) is ignored.
 ```
 
 ## Example:

main.c

@@ -23,25 +23,29 @@
 #define USAGE(p) fprintf(stderr, \
         "Tiny Encryption Algorithm implementation, with 128 bit key.\n" \
         "Performs Encryption/Decruption of multiple flies.\n" \
-        "usage:\n%s [-e [-D] |-d [-N] ] [-v] -k '16 byte key' -I <...>\n" \
+        "usage:\n%s [-e |-d [-N] ] [-D] [-v] -k '16 byte key' -I <...>\n" \
         "-e    - Encrypt\n" \
         "        Encrypts the input files and the output files of each" \
         " will be placed in the same directory with extension .3\n" \
-        "-D    - Will delete parent files after encryption\n" \
         "-d    - Decrypt\n" \
         "        Decrypts the input files and the output files of each" \
         " will be placed in the same directory excluding extension .3\n" \
         "-N    - When decrypting, display output to stdout.\n" \
+        "-D    - Deletes source files after encryption or decryption.\n" \
         "-v    - Verbose\n" \
         "-k    - 16 byte key.\n" \
         "-I    - Files that need to be processed.\n" \
+        "\nNotes:\n"\
+        "      - Cannot use -D (Delete file), -N (stdout output) together.\n" \
+        "      - Cannot use -e (encryption), -N (stdout output) together.\n" \
+        "      - When using -N (stdout output), -v (Verbose) is ignored.\n" \
         , p)
 
 #define MAX_FILENAME_LENGTH 255          // Length of file path
 #define MAX_INPUT_FILES 50               // number of files
 #define ENCRYPTED_FILE_EXTENSION ".3"
 
-#define FLAG_DELETE_AFTER_ENCRYPTION (1 << 0)
+#define FLAG_DELETE_SOURCE_FILE      (1 << 0)
 #define FLAG_VERBOSE                 (1 << 1)
 #define FLAG_OUTPUT_TO_STDOUT        (1 << 2)
 
@@ -90,10 +94,9 @@ int main(int argc,char *argv[])
 
         // -- 1. Perform Encryption and Decryption --
 
-        output_filename[0] = '\0';
-
         if (prm.mode == ENCRYPT) {
             // Output file name: InputfilePath + ".3"
+            output_filename[0] = '\0';
             strcat(output_filename, prm.files[i]);
             strcat(output_filename, ENCRYPTED_FILE_EXTENSION);
         }
@@ -110,7 +113,7 @@ int main(int argc,char *argv[])
             // Feature: Output to stdout
             if (prm.flags & FLAG_OUTPUT_TO_STDOUT) {
                 strcpy(output_filename,"(stdout)");
-                enc_dec_mode = TEA_FLAG_OUTPUT_STDOUT;
+                enc_dec_mode |= TEA_FLAG_OUTPUT_STDOUT;
                 printf("-------------- %u: %s --------------\n", 
                         i+1, prm.files[i]);
             }
@@ -137,10 +140,8 @@ int main(int argc,char *argv[])
         // -- 3. Delete the file if -D option is set --
 
         // Feature: Delete file is -D was provided.
-        // Delete only if Encryption worked
-        if (prm.mode == ENCRYPT && 
-            ed_status == true && 
-            prm.flags & FLAG_DELETE_AFTER_ENCRYPTION) {
+        if (ed_status == true && 
+            prm.flags & FLAG_DELETE_SOURCE_FILE) {
             // Feature: verbosity
             printf("Deletion: %s : %s\n", prm.files[i],
                     delete (prm.files[i]) ? "Success": "Failed");
@@ -212,7 +213,7 @@ int readargs(char *argv[], struct op *out)
                         out->flags |= FLAG_VERBOSE;
                         break;
                     case 'D':
-                        out->flags |= FLAG_DELETE_AFTER_ENCRYPTION;
+                        out->flags |= FLAG_DELETE_SOURCE_FILE;
                         break;
                     default:
                         fprintf(stderr,"Error: Invaid argument: %s\n",arg);
@@ -229,21 +230,25 @@ int readargs(char *argv[], struct op *out)
 
 bool args_is_valid(struct op *out)
 {
-    if (out->flags & FLAG_DELETE_AFTER_ENCRYPTION && out->mode == DECRYPT){
-        fprintf(stderr,
-                "Error: Delete option is only for Encryption mode.\n");
-        return false;
-    }
 
     if (out->flags & FLAG_OUTPUT_TO_STDOUT && out->mode == ENCRYPT){
         fprintf(stderr,
                 "Error: -N option can only be used in Decrypt mode.\n");
         return false;
     }
 
+    if (out->flags & FLAG_OUTPUT_TO_STDOUT && 
+            out->flags & FLAG_DELETE_SOURCE_FILE) {
+        fprintf(stderr,
+                "Warning: -D is ignored when outputing to stdout.\n");
+       
+        // Remove -D flag
+        out->flags &= ~FLAG_DELETE_SOURCE_FILE;
+    }
+
     if (out->flags & FLAG_OUTPUT_TO_STDOUT && out->flags & FLAG_VERBOSE) {
         fprintf(stderr,
-                "Warning: -v option has no effect with -N option.\n");
+                "Warning: -v is ignored when outputing to stdout.\n");
 
         // Clear verbose flag
         out->flags &= ~FLAG_VERBOSE;