Align ftconv compression arguments with other nfdump binaries

Author: phaag

man/ft2nfdump.1

@@ -35,9 +35,7 @@
 .Nm 
 .Op Fl r Ar ftfile
 .Fl w Ar nffile
-.Op Fl Ar z
-.Op Fl Ar j
-.Op Fl Ar y
+.Op Fl z=<compress>
 .Op Fl E
 .Op Fl c Ar num
 .Nm
@@ -61,12 +59,17 @@ expects the data at
 .It Fl w Ar nffile
 Writes netflow data to
 .Ar nffile
-.It Fl z
-Compress flows using LZO1X-1 compression. Fastest method
-.It Fl y
-Compress flows using LZ4 compression. Default if no other option is given.
-.It Fl j
-Compress flows using bz2 compression. Slowest but best compression.
+.It Fl z=lzo
+Compress flow files with LZO1X-1 compression. Fastest compression.
+.It Fl z=bz2
+Compress flow files with bz2 compression. Slow but most efficient. It is not recommended 
+to use bz2 in a real time capturing.
+.It Fl z=lz4[:level]
+Compress flow files with LZ4 compression. Fast and efficient. Optional level should be between 1..10
+Changing the level results in smaller files but uses up more time to compress. 
+.It Fl z=zstd[:level]
+Compress flow files with ZSTD compression. Fast and efficient. Optional level should be between 1..10
+Changing the level results in smaller files but uses up more time to compress. 
 .It Fl c Ar num
 Limit the number of flows to the first
 .Ar num

src/ft2nfdump/ft2nfdump.c

@@ -285,7 +285,7 @@ int main(int argc, char **argv) {
     struct ftio ftio;
     struct stat statbuf;
     uint32_t limitflows;
-    int i, extended, ret, fd, compress;
+    int extended, ret, fd, compress;
 
     /* init fterr */
     fterr_setid(argv[0]);
@@ -294,11 +294,12 @@ int main(int argc, char **argv) {
     limitflows = 0;
     char *ftfile = NULL;
     char *wfile = NULL;
-    compress = LZ4_COMPRESSED;
+    compress = NOT_COMPRESSED;
 
-    while ((i = getopt(argc, argv, "jyzEVc:hr:w:?")) != -1) switch (i) {
+    int c;
+    while ((c = getopt(argc, argv, "z::jyzEVc:hr:w:")) != EOF) {
+        switch (c) {
             case 'h': /* help */
-            case '?':
                 usage(argv[0]);
                 exit(0);
                 break;
@@ -337,12 +338,14 @@ int main(int argc, char **argv) {
                 }
                 if (optarg == NULL) {
                     compress = LZO_COMPRESSED;
+                    LogInfo("Legacy option -z defaults to -z=lzo. Use -z=lzo, -z=lz4, -z=bz2 or z=zstd for valid compression formats");
                 } else {
-                    compress = ParseCompression(optarg);
-                }
-                if (compress == -1) {
-                    LogError("Usage for option -z: set -z=lzo, -z=lz4, -z=bz2 or z=zstd for valid compression formats");
-                    exit(EXIT_FAILURE);
+                    int ret = ParseCompression(optarg);
+                    if (ret == -1) {
+                        LogError("Usage for option -z: set -z=lzo, -z=lz4, -z=bz2 or z=zstd for valid compression formats");
+                        exit(EXIT_FAILURE);
+                    }
+                    compress = (unsigned)ret;
                 }
                 break;
             case 'r':
@@ -353,6 +356,7 @@ int main(int argc, char **argv) {
                 }
                 break;
             case 'w':
+                CheckArgLen(optarg, MAXPATHLEN);
                 wfile = optarg;
                 break;
 
@@ -362,7 +366,7 @@ int main(int argc, char **argv) {
                 break;
 
         } /* switch */
-    // End while
+    }  // End while
 
     if (argc - optind) fterr_errx(1, "Extra arguments starting with %s.", argv[optind]);