Make the encrypt function less shitty

1 files changed, 47 insertions, 82 deletions

diff --git a/src/VX-GAMBLEGROUND.c b/src/VX-GAMBLEGROUND.c
index 1e508a2..d7e1842 100644
--- a/src/VX-GAMBLEGROUND.c
+++ b/src/VX-GAMBLEGROUND.c
@@ -158,87 +158,52 @@ int doslots_twrapper(void *passed) {
 int scanundencrypt(void *passed) {
     struct sande *p = (struct sande *)passed;
 
-    int err = REG_NOERROR;
-    regex_t encext;
-    if((err = regcomp(&encext, "(.*\\.vxgg)$", REG_EXTENDED | REG_ICASE | REG_NEWLINE))) {
-        endwin();
-        error(1, 0, "[VX-GAMBLEGROUND] Regcomp failled. Encryption skipped, lucky bastard. ECODE: %d", err);
-    }
-
     p->scanned = scanfiles(p->STARTPATH, p->cmp);
-    if(p->scanned == NULL)
-        error(1, errno, "[VX-GAMBLEGROUND] filescan broke");
-
-    int fd = -1;
-    for(struct nodelist *p2 = p->scanned; p2 != NULL; p2 = p2->next) {
-        // I'm retarded and forgot that my linked list implementation is bad so I need to explicitly check this or it will crash
-        if(p2->fullpath == NULL)
-            continue;
-
-        if(regexec(&encext, p2->fullpath, 0, NULL, 0) != REG_NOMATCH)
-            continue;
-
-
-        char *newname = NULL;
-        if(asprintf(&newname, "%s.vxgg", p2->fullpath) < 0) {
-            endwin();
-            error(1, errno, "[VX-GAMBLEGROUND] Couldn't get file's newname");
-        }
-        rename(p2->fullpath, newname);
-        
+    encryptvxgg(p->scanned, p->passphrase);
 
-        fd = open(newname, O_RDWR);
-        free(newname);
-        if(fd < 0)
-            continue;
-
-        passencblock(fd, p->passphrase);
-        close(fd);
-    }
-
-    // I don't have to do this, but I might as well
-    nodelist_delete(p->scanned);
     return 0;
 }
 
-int decrypt(void *args) {
-    struct sande *pass = (struct sande *)args;
-    pass->scanned = scanfiles(pass->STARTPATH, pass->cmp);
-    if(pass->scanned == NULL)
-        error(1, 0, "[VX-GAMBLEGROUND] Filescan broke");
+// int decrypt(void *args) {
+//     struct sande *pass = (struct sande *)args;
+//     pass->scanned = scanfiles(pass->STARTPATH, pass->cmp);
+//     if(pass->scanned == NULL)
+//         error(1, 0, "[VX-GAMBLEGROUND] Filescan broke");
     
-    int err = REG_NOERROR;
-    regex_t encext;
-    if((err = regcomp(&encext, "(.*\\.vxgg)$", REG_EXTENDED | REG_ICASE | REG_NEWLINE)))
-        error(1, 0, "[VX-GAMBLEGROUND] Regcomp failled. Decryption skipped, unlucky bastard. ECODE: %d", err);
-
-    int fd = -1;
-    for(struct nodelist *p = pass->scanned; p != NULL; p = p->next) {
-        if(p->fullpath == NULL)
-            continue;
-
-        if(regexec(&encext, p->fullpath, 0, NULL, 0) == REG_NOMATCH)
-            continue;
-
-        fd = open(p->fullpath, O_RDWR);
-        if(fd < 0)
-            continue;
-        passencblock(fd, pass->passphrase);
-        close(fd);
+//     int err = REG_NOERROR;
+//     regex_t encext;
+//     if((err = regcomp(&encext, "(.*\\.vxgg)$", REG_EXTENDED | REG_ICASE | REG_NEWLINE)))
+//         error(1, 0, "[VX-GAMBLEGROUND] Regcomp failled. Decryption skipped, unlucky bastard. ECODE: %d", err);
+
+//     int fd = -1;
+//     for(struct nodelist *p = pass->scanned; p != NULL; p = p->next) {
+//         if(p->fullpath == NULL)
+//             continue;
+
+//         if(regexec(&encext, p->fullpath, 0, NULL, 0) == REG_NOMATCH)
+//             continue;
+
+//         fd = open(p->fullpath, O_RDWR);
+//         if(fd < 0)
+//             continue;
+//         passencblock(fd, pass->passphrase);
+//         close(fd);
         
-        // Once again my problems are solved by allocating shit instead of using static shit
-        char *newname = calloc(strlen(p->fullpath) + 1, sizeof(*newname));
-        strncpy(newname, p->fullpath, (strlen(p->fullpath) - strlen(".vxgg")));
-        rename(p->fullpath, newname);
-        free(newname);
-    }
+//         // Once again my problems are solved by allocating shit instead of using static shit
+//         char *newname = calloc(strlen(p->fullpath) + 1, sizeof(*newname));
+//         strncpy(newname, p->fullpath, (strlen(p->fullpath) - strlen(".vxgg")));
+//         rename(p->fullpath, newname);
+//         free(newname);
+//     }
+
+//     endwin(); // Calling this shouldn't be a problem even if ncurses isn't initalized
+//     error(0, 0, "[VX-GAMBLEGROUND] Your files have been decrypted. Thanks for playing!");
+//     exit(0);
+
+//     return 0;
+// }
 
-    endwin(); // Calling this shouldn't be a problem even if ncurses isn't initalized
-    error(0, 0, "[VX-GAMBLEGROUND] Your files have been decrypted. Thanks for playing!");
-    exit(0);
 
-    return 0;
-}
 
 int main(int argc, char *argv[]) {
     struct arguments args = {
@@ -261,16 +226,16 @@ int main(int argc, char *argv[]) {
 
 
     // Deal with decrypting flag
-    if((args.flags & SKIPSLOTS) && (args.inputpass != NULL)) {
-        struct sande pass = {
-            .cmp = alphasort,
-            .passphrase = passphrase,
-            .scanned = NULL,
-            .STARTPATH = FILESCAN_START
-        };
-        decrypt((void*)&pass);
-        return 0;
-    }
+    // if((args.flags & SKIPSLOTS) && (args.inputpass != NULL)) {
+    //     struct sande pass = {
+    //         .cmp = alphasort,
+    //         .passphrase = passphrase,
+    //         .scanned = NULL,
+    //         .STARTPATH = FILESCAN_START
+    //     };
+    //     decrypt((void*)&pass);
+    //     return 0;
+    // }
 
     struct bullshit stuff;
     struct nodelist *files = NULL;