adding bit option to libtest main

Author: intheswim

Makefile

@@ -21,7 +21,7 @@ makelib: lzw10pack.o lzw10unpack.o common.o
 		ar rcs liblzw10.a lzw10pack.o lzw10unpack.o common.o
 
 libtest : libtest.cpp
-		$(CC) $(CFLAGS) -DLIBTEST_MAIN -o lzw_test libtest.cpp $(CLIBS) -L. -llzw10
+		$(CC) $(CFLAGS) -o lzw_test libtest.cpp $(CLIBS) -L. -llzw10
 
 .PHONY: clean
 

common.cpp

@@ -76,9 +76,6 @@ int tmpnam_s(char* temp_name, size_t sizeInChars)
     if (NULL == tmpnam(buffer))
         return -1; 
 
-  /*  if (strlen (mktemp (buffer)) == 0)
-        return errno;  */
-
     if (strlen (buffer) >= sizeInChars)
     {
         return ERANGE;
@@ -94,4 +91,17 @@ int tmpnam_s(char* temp_name, size_t sizeInChars)
     return 0;
 }
 
+int strcpy_s(char *dest, size_t dest_len, const char *src)
+{
+     if (!src || !dest)
+        return EINVAL;
+
+    if (strlen (src) >= dest_len)
+        return ERANGE;
+
+    strcpy (dest, src);
+
+    return 0;
+}
+
 #endif // _MSC_VER

common.h

@@ -29,4 +29,5 @@ char *str_dup (const char *s);
 
 #ifndef _MSC_VER
 int tmpnam_s(char* temp_name, size_t sizeInChars);
+int strcpy_s(char *dest, size_t dest_len, const char *src);
 #endif 

libtest.cpp

@@ -13,26 +13,52 @@
 #include <cstring>
 #include <cstdlib>
 #include <cstdio>
+#include <cassert>
 #include "export.h"
 
 #include <chrono>
 #include <iostream>
 
 #include "common.h"
 
+#if defined(__linux__)
+#define LIBTEST_MAIN
+#endif 
+
 #ifdef LIBTEST_MAIN  // add LIBTEST #define to compile the test with static library
 
 int main (int argc, char *argv[])
 {
-    const char presetInput[] = "sample.txt";
+    int bits = DEFAULT_MAX_BITS;
+    bool bits_set = false;
+
+    char inputFile [PATH_MAX] = { 0 };
 
-    const char *inputFile = presetInput;
+    char compressedFile [PATH_MAX] = { 0 };
 
-    char compressedFile [PATH_MAX], outputFile [PATH_MAX];
+    char outputFile [PATH_MAX] = { 0 };
 
-    if (argc == 2)
+    if (2 == argc)
+    {
+        strcpy_s (inputFile, PATH_MAX, argv[1]);
+    } 
+    else if (3 == argc)
     {
-        inputFile = argv[1];
+        if (0 == strncmp (argv[1], "-b", 2))
+        {
+            char *ptr = argv[1];
+            bits = atoi (ptr + 2);
+
+            bits_set = true;
+
+            strcpy_s(inputFile, PATH_MAX, argv[2]);
+        }
+    }
+
+    if (strlen (inputFile) == 0 || (bits < 9 || bits > SUPPORTED_MAX_BITS))
+    {
+        printf ("Usage: %s [-b{12-16}] fileToCompress\n", argv[0]);
+        return EXIT_FAILURE;
     }
 
     printf ("Testing compression on: %s\n", inputFile);
@@ -41,13 +67,20 @@ int main (int argc, char *argv[])
 
     tmpnam_s (outputFile, sizeof(outputFile));
 
+    assert (strlen(compressedFile) > 0 && strlen (outputFile) > 0);
+
     std::chrono::high_resolution_clock::time_point start;
 
     start = std::chrono::high_resolution_clock::now();
 
-    int ret = Compress (inputFile, compressedFile, VERBOSE_OUTPUT);
+    int ret = 0;
+
+    if (!bits_set)
+        ret = Compress (inputFile, compressedFile, VERBOSE_OUTPUT);
+    else 
+        ret = Compress2 (inputFile, compressedFile, VERBOSE_OUTPUT, bits);
 
-    printf ("Compression : %s.\n", ret ? "Successful" : "Failed");
+    printf ("Compression %s.\n", ret ? "successful" : "failed");
 
     if (!ret)
         return EXIT_FAILURE;
@@ -61,7 +94,7 @@ int main (int argc, char *argv[])
 
     ret = Decompress (compressedFile, outputFile, VERBOSE_OUTPUT);
 
-    printf ("Decompression : %s.\n", ret ? "Successful" : "Failed");
+    printf ("Decompression %s.\n", ret ? "successful" : "failed");
 
     if (!ret)
         return EXIT_FAILURE;