Ticket #268: kilobyte-git.5.patch

doc/man/mc.1.in

@@ -3139 +3139 @@
 before attempting to reconnect to an FTP server that has denied the
 login.  If the value is zero, the login will no be retried.
 .TP
+.I kilobyte_si
+If this option is set (kilobyte_si=1), Midnight Commander will use SI units
+(powers of 1000) when displaying any byte sizes. The suffixes (k, m ...)
+are shown in lowercase.
+If unset (default), Midnight Commander will use binary units (powers of 1024)
+and the suffixes are shown in upper case (K, M ...)
+.TP
 .I max_dirt_limit
 Specifies how many screen updates can be skipped at most in the internal
 file viewer.  Normally this value is not significant, because the code

src/dir.c

@@ -45 +45 @@
 /* If false then directories are shown separately from files */
 int mix_all_files = 0;
 
+/*
+ * If true, SI units (1000 based) will be used for
+ * larger units (kilobyte, megabyte, ...).
+ * If false binary units (1024 based) will be used.
+ */
+int kilobyte_si = 0;
+
 /* Reverse flag */
 static int reverse = 1;
 

src/dir.h

@@ -83 +83 @@
 extern int show_backups;
 extern int show_dot_files;
 extern int mix_all_files;
+extern int kilobyte_si;
 
 #endif

src/main.c

@@ -883 +883 @@
     update_panels (UP_RELOAD, UP_KEEPSEL);
 }
 
+void
+toggle_kilobyte_si (void)
+{
+    kilobyte_si = !kilobyte_si;
+    update_panels (UP_RELOAD, UP_KEEPSEL);
+}
+
 /*
  * Just a hack for allowing url-like pathnames to be accepted from the
  * command line.

src/main.h

@@ -11 +11 @@
 void toggle_mix_all_files (void);
 void toggle_show_backup (void);
 void toggle_show_hidden (void);
+void toggle_kilobyte_si (void);
 
 extern int quote;
 extern volatile int quit;

src/option.c

@@ -78 +78 @@
    {N_("ma&Rk moves down"),   &mark_moves_down,   TOGGLE_VARIABLE,       0 },
    {N_("show &Hidden files"), &show_dot_files,    toggle_show_hidden,    0 },
    {N_("show &Backup files"), &show_backups,      toggle_show_backup,    0 },
+   {N_("SI si&ze prefixes"),  &kilobyte_si,       toggle_kilobyte_si,    0 },
    { 0, 0, 0, 0 }
 };
 
 /* Make sure this corresponds to the check_options structure */
 #define OTHER_OPTIONS 13
-#define PANEL_OPTIONS 6
+#define PANEL_OPTIONS 7
 
 static WRadio *pause_radio;
 

src/setup.c

@@ -148 +148 @@
     int  *opt_addr;
 } int_options [] = {
     { "show_backups", &show_backups },
+    { "kilobyte_si", &kilobyte_si },
     { "show_dot_files", &show_dot_files },
     { "verbose", &verbose },
     { "mark_moves_down", &mark_moves_down },

src/util.c

@@ -53 +53 @@
 #include "strutil.h"
 #include "fileopctx.h"
 #include "file.h"               /* copy_file_file() */
+#include "dir.h"
 
 #ifdef HAVE_CHARSET
 #include "charsets.h"
@@ -271 +272 @@
     const char *xtra = "";
     
     if (size > 999999999L){
-        divisor = 1024;
-        xtra = "K";
+        divisor = kilobyte_si?1000:1024;
+        xtra = kilobyte_si?"k":"K";
         if (size/divisor > 999999999L){
-            divisor = 1024*1024;
-            xtra = "M";
+            divisor = kilobyte_si?(1000*1000):(1024*1024);
+            xtra = kilobyte_si?"m":"M";
         }
     }
     g_snprintf (x, sizeof (x), "%.0f%s", (size/divisor), xtra);
@@ -327 +328 @@
          1000000000};
     static const char * const suffix [] =
         {"", "K", "M", "G", "T", "P", "E", "Z", "Y", NULL};
+    static const char * const suffix_lc [] =
+        {"", "k", "m", "g", "t", "p", "e", "z", "y", NULL};
     int j = 0;
+    int size_remain;
 
     /* Don't print more than 9 digits - use suffix.  */
     if (len == 0 || len > 9)
         len = 9;
 
+    /*
+     * recalculate from 1024 base to 1000 base if units>0
+     * We can't just multiply by 1024 - that might cause overflow
+     * if off_t type is too small
+     */
+    if (units && kilobyte_si) {
+     for (j = 0; j < units; j++) {
+      size_remain=((size % 125)*1024)/1000; /* size mod 125, recalculated */
+      size = size / 125; /* 128/125 = 1024/1000 */
+      size = size * 128; /* This will convert size from multiple of 1024 to multiple of 1000 */
+      size += size_remain; /* Re-add remainder lost by division/multiplication */
+     }
+    }
+
     for (j = units; suffix [j] != NULL; j++) {
         if (size == 0) {
             if (j == units) {
@@ -343 +361 @@
 
             /* Use "~K" or just "K" if len is 1.  Use "B" for bytes.  */
             g_snprintf (buffer, len + 1, (len > 1) ? "~%s" : "%s",
-                        (j > 1) ? suffix[j - 1] : "B");
+                        (j > 1) ? (kilobyte_si ? suffix_lc[j - 1] : suffix[j - 1]) : "B");
             break;
         }
 
         if (size < power10 [len - (j > 0)]) {
-            g_snprintf (buffer, len + 1, "%lu%s", (unsigned long) size, suffix[j]);
+            g_snprintf (buffer, len + 1, "%lu%s", (unsigned long) size, kilobyte_si ? suffix_lc[j] : suffix[j]);
             break;
         }
 
-        /* Powers of 1024, with rounding.  */
-        size = (size + 512) >> 10;
+        /* Powers of 1000 or 1024, with rounding.  */
+        if (kilobyte_si) {
+            size = (size + 500) / 1000;
+        } else {
+            size = (size + 512) >> 10;
+        }
     }
 }