From 0ff090d1900338df42472230c87fa7a59faeb580 Mon Sep 17 00:00:00 2001
From: Pentium44 <cdorm245@gmail.com>
Date: Thu, 15 Apr 2021 22:03:30 -0700
Subject: [PATCH] Switching to UX3 framework for sys calls

---
 src/inc/tar.h |   6 +-
 src/lexer.c   | 266 +++++++++++++++++++++++++-------------------------
 2 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/src/inc/tar.h b/src/inc/tar.h
index 5d125ee..532f2ed 100644
--- a/src/inc/tar.h
+++ b/src/inc/tar.h
@@ -57,13 +57,13 @@ extern void tar_free_pool (void);
 
 // tar entry metadata structure (singly-linked list)
 struct tar_t {
-    char original_name[100];                // original filenme; only availible when writing into a tar
+    char original_name[1024];                // original filenme; only availible when writing into a tar
     unsigned int begin;                     // location of data in file (including metadata)
     union {
         union {
             // Pre-POSIX.1-1988 format
             struct {
-                char name[100];             // file name
+                char name[1024];             // file name
                 char mode[8];               // permissions
                 char uid[8];                // user id (octal)
                 char gid[8];                // group id (octal)
@@ -71,7 +71,7 @@ struct tar_t {
                 char mtime[12];             // modification time (octal)
                 char check[8];              // sum of unsigned characters in block, with spaces in the check field while calculation is done (octal)
                 char link;                  // link indicator
-                char link_name[100];        // name of linked file
+                char link_name[1024];        // name of linked file
             };
 
             // UStar format (POSIX IEEE P1003.1)
diff --git a/src/lexer.c b/src/lexer.c
index f1f8be4..603953e 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -54,7 +54,7 @@ char *process_line(char *line)
 
     // Check for main calls from user in interactive
     else if(strncmp("exit", tok_srch, 4) == 0)
-        syn_error("ss:exit called");
+        x_error("ss:exit called");
 
     else if(strncmp("version", tok_srch, 7) == 0)
     {
@@ -89,7 +89,7 @@ char *process_line(char *line)
 
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:loop statement requires arguments");
+            x_warn("ss:warn:loop statement requires arguments");
             return NULL;
         }
 
@@ -99,7 +99,7 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, ";");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:loop syntax error, missing last argument?");
+            x_warn("ss:warn:loop syntax error, missing last argument?");
             return NULL;
         }
 
@@ -128,21 +128,21 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:if statement requires arguments");
+            x_warn("ss:warn:if statement requires arguments");
             return NULL;
         }
 
         // Check if there's anything after the first quote
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:if syntax error, missing first argument?");
+            x_warn("ss:warn:if syntax error, missing first argument?");
             return NULL;
         }
 
         // Make sure the end quote exists
         if(strtok(NULL, "\"") == NULL)
         {
-           syn_warn("ss:warn:if syntax error, missing quote?");
+           x_warn("ss:warn:if syntax error, missing quote?");
            return NULL;
         }
 
@@ -152,28 +152,28 @@ char *process_line(char *line)
         }
         else
         {
-            syn_warn("ss:warn:if, return exceeds compare buffer");
+            x_warn("ss:warn:if, return exceeds compare buffer");
             return NULL;
         }
 
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:if statement requires two compared arguments");
+            x_warn("ss:warn:if statement requires two compared arguments");
             return NULL;
         }
 
         // Check if there's anything after the first quote
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:if syntax error, missing second argument?");
+            x_warn("ss:warn:if syntax error, missing second argument?");
             return NULL;
         }
 
         // Make sure the end quote exists
         if(strtok(NULL, "\"") == NULL)
         {
-            syn_warn("ss:warn:if syntax error, missing end quote?");
+            x_warn("ss:warn:if syntax error, missing end quote?");
             return NULL;
         }
 
@@ -193,7 +193,7 @@ char *process_line(char *line)
         int chdir_return = chdir("..");
         if(chdir_return < 0)
         {
-            syn_warn("ss:warn:backdir, failed to move directory location");
+            x_warn("ss:warn:backdir, failed to move directory location");
         }
     }
 
@@ -204,13 +204,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:move syntax error, missing quote?");
+            x_warn("ss:warn:move syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:move syntax error, missing filename?");
+            x_warn("ss:warn:move syntax error, missing filename?");
             return NULL;
         }
 
@@ -220,7 +220,7 @@ char *process_line(char *line)
         }
         else
         {
-            syn_warn("ss:warn:move syntax error, missing first filename?");
+            x_warn("ss:warn:move syntax error, missing first filename?");
             return NULL;
         }
 
@@ -228,7 +228,7 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:move syntax error, missing quote?");
+            x_warn("ss:warn:move syntax error, missing quote?");
             return NULL;
         }
 
@@ -236,20 +236,20 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0) 
         {
-            syn_warn("ss:warn:move syntax error, missing second filename?");
+            x_warn("ss:warn:move syntax error, missing second filename?");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
-            syn_warn("ss:warn:move syntax error, missing quote?");
+            x_warn("ss:warn:move syntax error, missing quote?");
             return NULL;
         }
 
         int rename_return = rename(orig_fn, parse_vars(tok_srch));
         if(rename_return < 0)
         {
-            syn_warn("ss:warn:move, failed to move file");
+            x_warn("ss:warn:move, failed to move file");
         }
 
         return NULL;
@@ -276,13 +276,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:chdir syntax error, missing quote?");
+            x_warn("ss:warn:chdir syntax error, missing quote?");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
-            syn_warn("ss:warn:chdir syntax error, missing end quote?");
+            x_warn("ss:warn:chdir syntax error, missing end quote?");
             return NULL;
         }
 
@@ -292,7 +292,7 @@ char *process_line(char *line)
 
         if(chdir_return < 0)
         {
-            syn_warn("ss:warn:chdir, error changing directory");
+            x_warn("ss:warn:chdir, error changing directory");
         }
         return NULL;
     }
@@ -310,7 +310,7 @@ char *process_line(char *line)
 
         if(strtok(NULL, "\"")==NULL && dirname == NULL)
         {
-            syn_warn("ss:warn:showdir syntax error, missing end quote?");
+            x_warn("ss:warn:showdir syntax error, missing end quote?");
             return NULL;
         }
 
@@ -326,7 +326,7 @@ char *process_line(char *line)
 
         if (nn < 0)
         {
-            syn_warn("ss:warn:showdir, failed to open directory");
+            x_warn("ss:warn:showdir, failed to open directory");
             return NULL;
         }
 
@@ -357,13 +357,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:decompress syntax error, missing quote?"); 
+            x_warn("ss:warn:decompress syntax error, missing quote?"); 
             return NULL;
         }
 
         if(strtok(NULL, "\"")==NULL)
         {
-            syn_warn("ss:warn:decompress syntax error, missing end quote?");
+            x_warn("ss:warn:decompress syntax error, missing end quote?");
             return NULL;
         }
 
@@ -377,7 +377,7 @@ char *process_line(char *line)
         in = fopen(filename, "rb");
         if(in == NULL)
         {
-            syn_warn("ss:warn:compress, failed to open tar for compression");
+            x_warn("ss:warn:compress, failed to open tar for compression");
             return NULL;
         }
 
@@ -393,20 +393,20 @@ char *process_line(char *line)
 
         // open existing file
         if ((fd = open(filedecout, O_RDWR)) < 0) {
-            syn_warn("ss:warn:decompress, failed to tar open archive");
+            x_warn("ss:warn:decompress, failed to tar open archive");
             return NULL;
         }
 
         // read in data
         if (tar_read(fd, &archive, '1') < 0) {
             close(fd);
-            syn_warn("ss:warn:decompress, failed to read archive");
+            x_warn("ss:warn:decompress, failed to read archive");
             return NULL;
         }
 
         // perform operation
         if(tar_extract(fd, archive, 0, NULL, '1') < 0) {            // extract entries
-            syn_warn("ss:warn:decompress, error occured");
+            x_warn("ss:warn:decompress, error occured");
             return NULL;
         }
 
@@ -434,13 +434,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:compress syntax error, missing quote?"); 
+            x_warn("ss:warn:compress syntax error, missing quote?"); 
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0  || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:compress syntax error, missing archive name...");
+            x_warn("ss:warn:compress syntax error, missing archive name...");
             return NULL;
         }
 
@@ -451,38 +451,38 @@ char *process_line(char *line)
         }
         else
         {
-            syn_warn("ss:warn:compress, filename too long!");
+            x_warn("ss:warn:compress, filename too long!");
             return NULL;
         }
 
         if ((fd = open(filename, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR)) == -1){
-            syn_warn("ss:warn:compress, failed to open new archive");
+            x_warn("ss:warn:compress, failed to open new archive");
             return NULL;
         }
 
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:compress syntax error, missing quote?"); 
+            x_warn("ss:warn:compress syntax error, missing quote?"); 
             return NULL;
         }
 
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:compress syntax error, missing quote?"); 
+            x_warn("ss:warn:compress syntax error, missing quote?"); 
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0  || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:compress, missing file path (what are we gonna compress?)");
+            x_warn("ss:warn:compress, missing file path (what are we gonna compress?)");
             return NULL;
         }
 
         if(strtok(NULL, "\"")==NULL)
         {
-            syn_warn("ss:warn:compress syntax error, missing end quote?");
+            x_warn("ss:warn:compress syntax error, missing end quote?");
             return NULL;
         }
 
@@ -501,7 +501,7 @@ char *process_line(char *line)
         const char **tarin = (const char **) &argv[0];
 
         if (tar_write(fd, &archive, argc, tarin, '1') < 0) {
-            syn_warn("ss:warn:compress, failed to create tar archive");
+            x_warn("ss:warn:compress, failed to create tar archive");
             return NULL;
         }
 
@@ -518,7 +518,7 @@ char *process_line(char *line)
         in = fopen(filename, "rb");
         if(in == NULL)
         {
-            syn_warn("ss:warn:compress, failed to open tar for compression");
+            x_warn("ss:warn:compress, failed to open tar for compression");
             return NULL;
         }
 
@@ -557,20 +557,20 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:mkdir syntax error, missing quote?"); 
+            x_warn("ss:warn:mkdir syntax error, missing quote?"); 
             return NULL;
         }
 
         if(strtok(NULL, "\"")==NULL)
         {
-            syn_warn("ss:warn:mkdir syntax error, missing end quote?");
+            x_warn("ss:warn:mkdir syntax error, missing end quote?");
             return NULL;
         }
 
         parsed = file_exists(parse_vars(tok_srch));
         if(parsed == 1)
         {
-            syn_warn("ss:warn:mkdir, file exists");
+            x_warn("ss:warn:mkdir, file exists");
             return NULL;
         }
 
@@ -578,7 +578,7 @@ char *process_line(char *line)
         int mkpret = mkpath(parse_vars(tok_srch), 0755);
 
         if(mkpret == -1)
-            syn_warn("ss:warn:mkdir, failed to make directory");
+            x_warn("ss:warn:mkdir, failed to make directory");
     
         return NULL;
     }
@@ -589,20 +589,20 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:mkfile syntax error, missing quote?"); 
+            x_warn("ss:warn:mkfile syntax error, missing quote?"); 
             return NULL;
         }
 
         if(strtok(NULL, "\"")==NULL)
         {
-            syn_warn("ss:warn:mkfile syntax error, missing end quote?");
+            x_warn("ss:warn:mkfile syntax error, missing end quote?");
             return NULL;
         }
 
         parsed = file_exists(parse_vars(tok_srch));
         if(parsed == 1)
         {
-            syn_warn("ss:warn:mkfile, file exists");
+            x_warn("ss:warn:mkfile, file exists");
             return NULL;
         }
 
@@ -610,12 +610,12 @@ char *process_line(char *line)
         int mkpret = mkpath(parse_vars(tok_srch), 0755);
 
         if(mkpret == -1)
-            syn_warn("ss:warn:mkfile, failed to form parent path, attempting to write file.");
+            x_warn("ss:warn:mkfile, failed to form parent path, attempting to write file.");
 
         FILE *cfile = fopen(parse_vars(tok_srch), "w");
         if(cfile == NULL)
         {
-            syn_warn("ss:warn:mkfile, failed to open file");
+            x_warn("ss:warn:mkfile, failed to open file");
             return NULL;
         }
 
@@ -640,13 +640,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:isfile syntax error, missing quote?"); 
+            x_warn("ss:warn:isfile syntax error, missing quote?"); 
             return NULL;
         }
 
         if(strtok(NULL, "\"")==NULL)
         {
-            syn_warn("ss:warn:isfile syntax error, missing end quote?");
+            x_warn("ss:warn:isfile syntax error, missing end quote?");
             return NULL;
         }
 
@@ -668,13 +668,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:isdir syntax error, missing quote?"); 
+            x_warn("ss:warn:isdir syntax error, missing quote?"); 
             return NULL;
         }
 
         if(strtok(NULL, "\"")==NULL)
         {
-            syn_warn("ss:warn:isdir syntax error, missing end quote?");
+            x_warn("ss:warn:isdir syntax error, missing end quote?");
             return NULL;
         }
 
@@ -696,7 +696,7 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:print syntax error, missing quote?"); 
+            x_warn("ss:warn:print syntax error, missing quote?"); 
             return NULL;
         }
 
@@ -705,7 +705,7 @@ char *process_line(char *line)
         {
             if(strtok(NULL, "\"") == NULL)
             {
-                syn_warn("ss:warn:print syntax error, missing end quote?");
+                x_warn("ss:warn:print syntax error, missing end quote?");
                 return NULL;
             }
 
@@ -713,7 +713,7 @@ char *process_line(char *line)
         }
         else
         {
-            syn_warn("ss:warn:print compulation error, no argument?");
+            x_warn("ss:warn:print compulation error, no argument?");
             return NULL;
         }
     }
@@ -724,13 +724,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, " ");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:sleep syntax error, need trailing integer for operation");
+            x_warn("ss:warn:sleep syntax error, need trailing integer for operation");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0  || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:sleep syntax error, need trailing integer for operation");
+            x_warn("ss:warn:sleep syntax error, need trailing integer for operation");
             return NULL;
         }
 
@@ -750,19 +750,19 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:calc syntax error, missing quotes around equation");
+            x_warn("ss:warn:calc syntax error, missing quotes around equation");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0  || (strcmp(tok_srch, " \n") == 0))
         {
-            syn_warn("ss:warn:calc syntax error, missing equation?");
+            x_warn("ss:warn:calc syntax error, missing equation?");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
-            syn_warn("ss:warn:calc syntax error, missing ending quote?");
+            x_warn("ss:warn:calc syntax error, missing ending quote?");
             return NULL;
         }
 
@@ -779,13 +779,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:netlisten syntax error, missing beginning quote");
+            x_warn("ss:warn:netlisten syntax error, missing beginning quote");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:netlisten syntax error, missing address?");
+            x_warn("ss:warn:netlisten syntax error, missing address?");
             return NULL;
         }
 
@@ -795,7 +795,7 @@ char *process_line(char *line)
         }
         else
         {
-            syn_warn("ss:warn:netlisten syntax error, port too long?");
+            x_warn("ss:warn:netlisten syntax error, port too long?");
             return NULL;
         }
 
@@ -803,20 +803,20 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:netlisten syntax error, missing quote?");
+            x_warn("ss:warn:netlisten syntax error, missing quote?");
             return NULL;
         }
 
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:netlisten syntax error, missing quote?");
+            x_warn("ss:warn:netlisten syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0) 
         {
-            syn_warn("ss:warn:netlisten syntax error, missing search string?");
+            x_warn("ss:warn:netlisten syntax error, missing search string?");
             return NULL;
         }
 
@@ -826,26 +826,26 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:netlisten syntax error, missing quote?");
+            x_warn("ss:warn:netlisten syntax error, missing quote?");
             return NULL;
         }
 
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:netlisten syntax error, missing quote?");
+            x_warn("ss:warn:netlisten syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:netlisten syntax error, missing return string?");
+            x_warn("ss:warn:netlisten syntax error, missing return string?");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
-            syn_warn("ss:warn:netlisten syntax error, missing end quote?");
+            x_warn("ss:warn:netlisten syntax error, missing end quote?");
             return NULL;
         }
 
@@ -860,13 +860,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:nethttp syntax error, missing quote?");
+            x_warn("ss:warn:nethttp syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:nethttp syntax error, missing port value?");
+            x_warn("ss:warn:nethttp syntax error, missing port value?");
             return NULL;
         }
 
@@ -876,7 +876,7 @@ char *process_line(char *line)
         }
         else
         {
-            syn_warn("ss:warn:nethttp syntax error, missing quote?");
+            x_warn("ss:warn:nethttp syntax error, missing quote?");
             return NULL;
         }
 
@@ -884,7 +884,7 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:nethttp syntax error, missing quote?");
+            x_warn("ss:warn:nethttp syntax error, missing quote?");
             return NULL;
         }
 
@@ -892,13 +892,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0) 
         {
-            syn_warn("ss:warn:nethttp syntax error, missing quote?");
+            x_warn("ss:warn:nethttp syntax error, missing quote?");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
-            syn_warn("ss:warn:nethttp syntax error, missing quote?");
+            x_warn("ss:warn:nethttp syntax error, missing quote?");
             return NULL;
         }
 
@@ -908,7 +908,7 @@ char *process_line(char *line)
         }
         else
         {
-            syn_warn("ss:warn:nethttp syntax error, fork = 1, not 0");
+            x_warn("ss:warn:nethttp syntax error, fork = 1, not 0");
             return NULL;
         }
 
@@ -926,7 +926,7 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:nettoss syntax error, missing quote?");
+            x_warn("ss:warn:nettoss syntax error, missing quote?");
             return NULL;
         }
 
@@ -934,7 +934,7 @@ char *process_line(char *line)
         /* Check to see if syntax is correct */
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:nettoss syntax error, missig address?");
+            x_warn("ss:warn:nettoss syntax error, missig address?");
             return NULL;
         }
 
@@ -945,20 +945,20 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:nettoss syntax error, missing quote?");
+            x_warn("ss:warn:nettoss syntax error, missing quote?");
             return NULL;
         }
 
         tok_srch = strtok(NULL, "\"");
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:nettoss syntax error, missing quote?");
+            x_warn("ss:warn:nettoss syntax error, missing quote?");
             return NULL;
         }
 
         if(strlen(parse_vars(tok_srch)) > 6)
         {
-            syn_warn("ss:warn:nettoss syntax error, port too long");
+            x_warn("ss:warn:nettoss syntax error, port too long");
             return NULL;
         }
 
@@ -967,26 +967,26 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:nettoss syntax error, missing quote?");
+            x_warn("ss:warn:nettoss syntax error, missing quote?");
             return NULL;
         }
 
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:nettoss syntax error, missing quote?");
+            x_warn("ss:warn:nettoss syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:nettoss syntax error, send string");
+            x_warn("ss:warn:nettoss syntax error, send string");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
-            syn_warn("ss:warn:nettoss syntax error, missing end quote?");
+            x_warn("ss:warn:nettoss syntax error, missing end quote?");
             return NULL;
         }
 
@@ -1003,13 +1003,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:encode syntax error, missing quote?");
+            x_warn("ss:warn:encode syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:encode syntax error, encode string?");
+            x_warn("ss:warn:encode syntax error, encode string?");
             return NULL;
         }
 
@@ -1023,7 +1023,7 @@ char *process_line(char *line)
         }
         else
         {
-            syn_warn("ss:warn:encode returned NULL!");
+            x_warn("ss:warn:encode returned NULL!");
             return NULL;
         }
 
@@ -1036,14 +1036,14 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:decode syntax error, missing quote?");
+            x_warn("ss:warn:decode syntax error, missing quote?");
             return NULL;
         }
 
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:decode syntax error, missing decode data?");
+            x_warn("ss:warn:decode syntax error, missing decode data?");
             return NULL;
         }
 
@@ -1056,7 +1056,7 @@ char *process_line(char *line)
         }
         else
         {
-            syn_warn("ss:warn:decode returned NULL!");
+            x_warn("ss:warn:decode returned NULL!");
             return NULL;
         }
     }
@@ -1069,13 +1069,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:md5 syntax error, missing quote?");
+            x_warn("ss:warn:md5 syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:md5 syntax error, need filename");
+            x_warn("ss:warn:md5 syntax error, need filename");
             return NULL;
         }
 
@@ -1091,7 +1091,7 @@ char *process_line(char *line)
         else
         {
             free(catfile);
-            syn_warn("ss:warn:md5 returned NULL!");
+            x_warn("ss:warn:md5 returned NULL!");
             return NULL;
         }
     }
@@ -1104,26 +1104,26 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:exec syntax error, missing quote?");
+            x_warn("ss:warn:exec syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:exec syntax error, missing execution switch?");
+            x_warn("ss:warn:exec syntax error, missing execution switch?");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
-            syn_warn("ss:warn:exec syntax error, missing quote?");
+            x_warn("ss:warn:exec syntax error, missing quote?");
             return NULL;
         }
 
         cmd_line = parse_vars(tok_srch);
         return_val = system(cmd_line);
         if(return_val != 0)
-            syn_warn("ss:warn:exec returned error code");
+            x_warn("ss:warn:exec returned error code");
 
         return NULL;
     }
@@ -1140,21 +1140,21 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:search syntax error, missing quote?");
+            x_warn("ss:warn:search syntax error, missing quote?");
             return NULL;
         }
 
         /* Check to see if syntax is correct */
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:search syntax error, missing filename");
+            x_warn("ss:warn:search syntax error, missing filename");
             return NULL;
         }
 
         /* open file */
         if(MAX_FILENAME_LEN < atoi(parse_vars(tok_srch)))
         {
-            syn_warn("ss:warn:search, filename too long");
+            x_warn("ss:warn:search, filename too long");
             return NULL;
         }
 
@@ -1163,7 +1163,7 @@ char *process_line(char *line)
         /* Check if file exists and can be opened */
         if(search_file == NULL) 
         {
-            syn_warn("ss:warn:search, failed to open file");
+            x_warn("ss:warn:search, failed to open file");
             return NULL;
         }
 
@@ -1172,7 +1172,7 @@ char *process_line(char *line)
         if(tok_srch == NULL) 
         {
             fclose(search_file);
-            syn_warn("ss:warn:search syntax error, missing quote?");
+            x_warn("ss:warn:search syntax error, missing quote?");
             return NULL;
         }
 
@@ -1180,21 +1180,21 @@ char *process_line(char *line)
         if(tok_srch == NULL) 
         {
             fclose(search_file);
-            syn_warn("ss:warn:search syntax error, missing quote?");
+            x_warn("ss:warn:search syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0) 
         {
             fclose(search_file);
-            syn_warn("ss:warn:search syntax error, missing write data?");
+            x_warn("ss:warn:search syntax error, missing write data?");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
             fclose(search_file);
-            syn_warn("ss:warn:search syntax error, missing end quote?");
+            x_warn("ss:warn:search syntax error, missing end quote?");
             return NULL;
         }
 
@@ -1216,14 +1216,14 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:write syntax error, missing quote?");
+            x_warn("ss:warn:write syntax error, missing quote?");
             return NULL;
         }
 
         /* Check to see if syntax is correct */
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:write syntax error, missing filename");
+            x_warn("ss:warn:write syntax error, missing filename");
             return NULL;
         }
 
@@ -1233,7 +1233,7 @@ char *process_line(char *line)
         /* Check if file exists and can be opened */
         if(write_file == NULL) 
         {
-            syn_warn("ss:warn:write, failed to open file");
+            x_warn("ss:warn:write, failed to open file");
             return NULL;
         }
 
@@ -1242,7 +1242,7 @@ char *process_line(char *line)
         if(tok_srch == NULL) 
         {
             fclose(write_file);
-            syn_warn("ss:warn:write syntax error, missing quote?");
+            x_warn("ss:warn:write syntax error, missing quote?");
             return NULL;
         }
 
@@ -1250,21 +1250,21 @@ char *process_line(char *line)
         if(tok_srch == NULL) 
         {
             fclose(write_file);
-            syn_warn("ss:warn:write syntax error, missing quote?");
+            x_warn("ss:warn:write syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0) 
         {
             fclose(write_file);
-            syn_warn("ss:warn:write syntax error, missing write data?");
+            x_warn("ss:warn:write syntax error, missing write data?");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
             fclose(write_file);
-            syn_warn("ss:warn:write syntax error, missing end quote?");
+            x_warn("ss:warn:write syntax error, missing end quote?");
             return NULL;
         }
 
@@ -1286,19 +1286,19 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:write syntax error, missing quote?");
+            x_warn("ss:warn:write syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:write syntax error, missing quote?");
+            x_warn("ss:warn:write syntax error, missing quote?");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
-            syn_warn("ss:warn:write syntax error, missing quote?");
+            x_warn("ss:warn:write syntax error, missing quote?");
             return NULL;
         }
 
@@ -1322,7 +1322,7 @@ char *process_line(char *line)
         if(read_file == NULL) 
         {
             free(dynfile);
-            syn_warn("ss:warn:write, failed open");
+            x_warn("ss:warn:write, failed open");
             return NULL;
         }
 
@@ -1341,7 +1341,7 @@ char *process_line(char *line)
         {
             free(dynfile);
             fclose(read_file);
-            syn_warn("ss:warn:write, file too large (2MB max)");
+            x_warn("ss:warn:write, file too large (2MB max)");
             return NULL;
         }
 
@@ -1362,13 +1362,13 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:cat syntax error, missing quote?");
+            x_warn("ss:warn:cat syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:cat syntax error, missing filename?");
+            x_warn("ss:warn:cat syntax error, missing filename?");
             return NULL;
         }
 
@@ -1378,7 +1378,7 @@ char *process_line(char *line)
         }
         else
         {
-            syn_warn("ss:warn:cat, filename too long");
+            x_warn("ss:warn:cat, filename too long");
             return NULL;
         }
 
@@ -1389,7 +1389,7 @@ char *process_line(char *line)
         /* strtok to the content that will be written to file */
         if(read_file == NULL) 
         {
-            syn_warn("ss:warn:cat, failed to open file");
+            x_warn("ss:warn:cat, failed to open file");
             return NULL;
         }
 
@@ -1397,7 +1397,7 @@ char *process_line(char *line)
         if(tok_srch == NULL) 
         {
             fclose(read_file);
-            syn_warn("ss:warn:cat syntax error, missing quote?");
+            x_warn("ss:warn:cat syntax error, missing quote?");
             return NULL;
         }
 
@@ -1405,21 +1405,21 @@ char *process_line(char *line)
         if(tok_srch == NULL) 
         {
             fclose(read_file);
-            syn_warn("ss:warn:cat syntax error, missing quote?");
+            x_warn("ss:warn:cat syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0) 
         {
             fclose(read_file);
-            syn_warn("ss:warn:cat syntax error, missing write data?");
+            x_warn("ss:warn:cat syntax error, missing write data?");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
             fclose(read_file);
-            syn_warn("ss:warn:cat syntax error, missing end quote?");
+            x_warn("ss:warn:cat syntax error, missing end quote?");
             return NULL;
         }
 
@@ -1450,7 +1450,7 @@ char *process_line(char *line)
         {
             free(dynfile);
             fclose(read_file);
-            syn_warn("ss:warn:cat, file too large (2MB max)");
+            x_warn("ss:warn:cat, file too large (2MB max)");
             return NULL;
         }
 
@@ -1462,19 +1462,19 @@ char *process_line(char *line)
         tok_srch = strtok(NULL, "\"");
         if(tok_srch == NULL)
         {
-            syn_warn("ss:warn:delete syntax error, missing quote?");
+            x_warn("ss:warn:delete syntax error, missing quote?");
             return NULL;
         }
 
         if(strcmp(tok_srch, "\n") == 0 || strcmp(tok_srch, " \n") == 0)
         {
-            syn_warn("ss:warn:delete syntax error, missing filename");
+            x_warn("ss:warn:delete syntax error, missing filename");
             return NULL;
         }
 
         if(strtok(NULL, "\"") == NULL)
         {
-            syn_warn("ss:warn:delete syntax error, missing quote?");
+            x_warn("ss:warn:delete syntax error, missing quote?");
             return NULL;
         }
 
@@ -1489,14 +1489,14 @@ char *process_line(char *line)
             }
             else
             {
-                syn_warn("ss:warn:delete, file not accessible");
+                x_warn("ss:warn:delete, file not accessible");
                 return NULL;
             }
 
         }
         else
         {
-            syn_warn("ss:warn:delete, file not found");
+            x_warn("ss:warn:delete, file not found");
             return NULL;
         }
     }