Make the !flist_eof assumption explicit before the check_for_io_err

[rsync/rsync.git] / lib / compat.c

diff --git a/lib/compat.c b/lib/compat.c
index 944a23e..494b64f 100644 (file)
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -7,7 +7,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -15,9 +15,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -25,11 +24,11 @@
 #ifndef HAVE_STRDUP
  char *strdup(char *s)
 {
-  int l = strlen(s) + 1;
-  char *ret = (char *)malloc(l);
-  if (ret)
-    strcpy(ret,s);
-  return ret;
+       int len = strlen(s) + 1;
+       char *ret = (char *)malloc(len);
+       if (ret)
+               memcpy(ret, s, len);
+       return ret;
 }
 #endif
 
@@ -152,3 +151,46 @@ int sys_gettimeofday(struct timeval *tv)
        return gettimeofday(tv);
 #endif
 }
+
+/* Return the int64 number as a string.  If the human_flag arg is non-zero,
+ * we may output the number in K, M, or G units.  We can return up to 4
+ * buffers at a time. */
+char *big_num(int64 num, int human_flag)
+{
+       static char bufs[4][128]; /* more than enough room */
+       static unsigned int n;
+       char *s;
+
+       n = (n + 1) % (sizeof bufs / sizeof bufs[0]);
+
+       if (human_flag) {
+               char units = '\0';
+               int mult = human_flag == 1 ? 1000 : 1024;
+               double dnum = 0;
+               if (num > mult*mult*mult) {
+                       dnum = (double)num / (mult*mult*mult);
+                       units = 'G';
+               } else if (num > mult*mult) {
+                       dnum = (double)num / (mult*mult);
+                       units = 'M';
+               } else if (num > mult) {
+                       dnum = (double)num / mult;
+                       units = 'K';
+               }
+               if (units) {
+                       snprintf(bufs[n], sizeof bufs[0], "%.2f%c", dnum, units);
+                       return bufs[n];
+               }
+       }
+
+       s = bufs[n] + sizeof bufs[0] - 1;
+       *s = '\0';
+
+       if (!num)
+               *--s = '0';
+       while (num) {
+               *--s = (char)(num % 10) + '0';
+               num /= 10;
+       }
+       return s;
+}