v2.6: added listing options -l, -L, -Z, and -v option; chars use default

terminal color, not white

Author: circulosmeos

README.md

@@ -1,11 +1,13 @@
 **circle**: statistics ASCII circle for analysing byte entropy in files.   
 
 **circle** reads all bytes in a file, and counts and arranges them from 0x00 to 0xff. Then it calculates the Standard deviation (sigma) of the data, and arranges the 256 resulting buckets in a circle, in such a way that the distance from the centre is proportional to the byte value (with 0x00 at the center, and ...0xf0-0xff bytes the farthest from it). The char that represents each byte is proportional to the deviation from the mean, in fractions of the standard deviation.   
+
+From v2.6, the list of different bytes counted can be printed using options `-l`, `-L`, `-Z`. Values over the mean will be printed green, and below it, they will be red.
 
 Installation
 ============
 
-**circle** can be installed (as **bytes-circle**) in latest **Ubuntu** and **Debian** using official repositories. Follow [these instructions](http://serverfault.com/questions/550855/how-to-add-debian-testing-repository-to-apt-get) for adding repositories to previous versions' linux distributions, and then just install as usual: 
+**circle** can be installed (as **bytes-circle**) in **Ubuntu** and **Debian** using official repositories. Follow [these instructions](http://serverfault.com/questions/550855/how-to-add-debian-testing-repository-to-apt-get) for adding repositories to previous versions' linux distributions, and then just install as usual: 
 
     $ sudo apt-get install bytes-circle
 
@@ -51,22 +53,28 @@ Options for non-colored consoles (in this case chars represent increments of 0.5
 
     $ bytes-circle -h   
 
-    Show statistics about bytes contained in a file,   
-    as a circle graph of deviations from sigma.   
-   
-    Use:   
-    $ bytes-circle [-o {0|1|2|3}] [-Bbnruh] [-z {0-255}] [<filename>] [<filename>] ...   
-      
-        -o {0 | 1=no color | 2=numbers | 3=uncoloured numbers}   
-        -B : stop processing files on first error encountered   
-        -b : no color   
-        -n : numbers   
-        -r : restrict statistics to the byte buckets that appear   
-             in the file, not to the 256 default value.   
-        -u : uncoloured numbers (-b -n)   
-        -h : prints this help   
-        -z {0-255} : prints a 2nd circle centered on this byte (0==127 !)   
-   
+      circle v2.6 (goo.gl/TNh5dq)
+
+      Show statistics about bytes contained in a file,
+      as a circle graph of deviations from sigma.
+
+      Use:
+      $ circle [-o {0|1|2|3}] [-BblLZnruvh] [-z {0-255}] [<filename>] [<filename>] ...
+
+            -o {0 | 1=no color | 2=numbers | 3=uncoloured numbers}
+            -B : stop processing files on first error encountered
+            -b : no color
+            -l : list number of bytes counted, from 0 to 255
+            -L : list number of bytes counted, excluding zero valued
+            -Z : list number of bytes counted, but only zero valued
+            -n : numbers
+            -r : restrict statistics to the byte buckets that appear
+                 in the file, not to the 256 default value.
+            -u : uncoloured numbers (-b -n)
+            -v : prints version
+            -h : prints this help
+            -z {0-255} : prints a 2nd circle centered on this byte (0==127 !)
+
 License
 =======
 

statistics.c

@@ -5,7 +5,8 @@
 // v1.2 by circulosmeos, 2016-01.
 // v2.1, v2.2 by circulosmeos, 2016-06.
 // v2.3 by circulosmeos, 2016-07.
-// v2.4 by circulosmeos, 2016-12.
+// v2.4, v2.5 by circulosmeos, 2016-12.
+// v2.6 by circulosmeos, 2018-12.
 // wp.me/p2FmmK-96
 // goo.gl/TNh5dq
 //
@@ -28,6 +29,8 @@ bool two_circles_flag = false;
 
 bool restrict_statistics = false;
 
+int list_bytes = 0;
+
 int two_circles_value=0;
 
 
@@ -42,12 +45,20 @@ int main ( int argc, char *argv[] ) {
     }*/
 
     int opt = 0;
-    while ((opt = getopt(argc, argv, "z:o:bnuBrh")) != -1)
+    while ((opt = getopt(argc, argv, "z:o:blLZnuBrvh")) != -1)
         switch(opt) {
             // help
             case 'h':
                 print_help();
                 return 1;
+            // version
+            case 'v':
+                printf ("\n  %s \n\n  ", PACKAGE_STRING);
+                for (i=0; i<MAX_SIGMA_CHAR; i++) {
+                    printf ("%c ", sigma_char[i] );
+                }
+                printf("  each represents 1/4*sigma\n\n");
+                return 1;
             // two circles: specify which ascii value set at zero position
             case 'z':
                 two_circles_flag=true;
@@ -82,6 +93,18 @@ int main ( int argc, char *argv[] ) {
             case 'b':
                 color_flag=false;
                 break;
+            // list number of bytes
+            case 'l':
+                list_bytes=1;
+                break;
+            // list number of bytes, but not 0 valued
+            case 'L':
+                list_bytes=2;
+                break;
+            // list number of bytes, but only 0 valued
+            case 'Z':
+                list_bytes=3;
+                break;
             // numbers with colours instead of ascii art
             case 'n':
                 numbers_flag=true;
@@ -99,9 +122,10 @@ int main ( int argc, char *argv[] ) {
                 bBreakOnFirstError=true;
                 break;
             case '?':
-                if (isprint (optopt))
+                if (isprint (optopt)) {
                     fprintf(stderr, "Unknown option `-%c'.\n", optopt);
-                else
+                    print_help();
+                } else
                     fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
                 return 2;
             default:
@@ -307,7 +331,7 @@ int analyze_file(char *szFile) {
 
     // reset colour use in terminal screen
     if (color_flag)
-        printf("%s%s", RESET, KWHT);
+        printf("%s", RESET);
 
     if (two_circles_flag) {
         printf("\t    0 centered\t\t\t\t%d centered\n\n", two_circles_value);
@@ -342,10 +366,24 @@ int analyze_file(char *szFile) {
     for (i=0; readable_size>1024.0; i++)
         readable_size/=1024.0;
 
-    printf("size =\t%.2f %s,  (%lld bytes)\n", readable_size, SIZE_UNITS[i], total_size);
+    printf("size =\t%.2f %s,  (%lld bytes)\n\n", readable_size, SIZE_UNITS[i], total_size);
 
-    if (color_flag)
-        printf("%s", RESET);
+    // print counted values of each byte if list_bytes > 0
+    if ( list_bytes > 0 ) {
+        for (i=0; i<=MAX_VALUE; i++) {
+            if ( list_bytes == 1 || ( list_bytes == 2 && bytes[i] > 0LL ) ) {
+                if (color_flag && bytes[i] > 0LL)
+                    printf("%s", ((double)bytes[i] >= mean)?KGRN:KRED );
+                printf("[%d] = %lld\n", i, bytes[i] );
+                if (color_flag && bytes[i] > 0LL)
+                    printf("%s", RESET);
+            } else {
+                if ( list_bytes == 3 && bytes[i] == 0LL )
+                    printf("[%d] = %lld\n", i, bytes[i] );
+            }
+        }
+        printf("\n");
+    }
 
     return 0;
 
@@ -400,14 +438,18 @@ void print_help() {
 
     printf ("\n  %s \n", PACKAGE_STRING);
     printf ("\n  Show statistics about bytes contained in a file,\n  as a circle graph of deviations from sigma.\n\n");
-    printf ("  Use:\n  $ %s [-o {0|1|2|3}] [-Bbnruh] [-z {0-255}] [<filename>] [<filename>] ...\n\n", 
+    printf ("  Use:\n  $ %s [-o {0|1|2|3}] [-BblLZnruvh] [-z {0-255}] [<filename>] [<filename>] ...\n\n", 
         PACKAGE_NAME);
     printf ("\t-o {0 | 1=no color | 2=numbers | 3=uncoloured numbers}\n"
         "\t-B : stop processing files on first error encountered\n"
         "\t-b : no color\n"
+        "\t-l : list number of bytes counted, from 0 to 255\n"
+        "\t-L : list number of bytes counted, excluding zero valued\n"
+        "\t-Z : list number of bytes counted, but only zero valued\n"
         "\t-n : numbers\n"
         "\t-r : restrict statistics to the byte buckets that appear \n\t     in the file, not to the 256 default value.\n"
         "\t-u : uncoloured numbers (-b -n)\n"
+        "\t-v : prints version\n"
         "\t-h : prints this help\n"
         "\t-z {0-255} : prints a 2nd circle centered on this byte (0==127 !)\n\n"
         );

statistics_circle.h

@@ -53,7 +53,7 @@
 #endif
 
 #define PACKAGE_NAME    "circle"
-#define PACKAGE_STRING  "circle v2.5 (goo.gl/TNh5dq)"
+#define PACKAGE_STRING  "circle v2.6 (goo.gl/TNh5dq)"
 
 #define BUFFER_LENGTH 4096