Mention updated config files.

[rsync.git] / util2.c

diff --git a/util2.c b/util2.c
index b1adf8148eaab27419826825c70eeae40fdd89db..a8609a5d5931d60e7907265f94868ef585df785e 100644 (file)
--- a/util2.c
+++ b/util2.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2015 Wayne Davison
+ * Copyright (C) 2003-2020 Wayne Davison
  *
  * 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
@@ -21,20 +21,31 @@
  */
 
 #include "rsync.h"
-#include "ifuncs.h"
 #include "itypes.h"
 #include "inums.h"
 
+extern size_t max_alloc;
+
+char *do_calloc = "42";
+
 /**
  * Sleep for a specified number of milliseconds.
  *
- * Always returns TRUE.  (In the future it might return FALSE if
- * interrupted.)
+ * Always returns True.
  **/
 int msleep(int t)
 {
-#ifdef HAVE_USLEEP
+#ifdef HAVE_NANOSLEEP
+       struct timespec ts;
+
+       ts.tv_sec = t / 1000;
+       ts.tv_nsec = (t % 1000) * 1000000L;
+
+       while (nanosleep(&ts, &ts) < 0 && errno == EINTR) {}
+
+#elif defined HAVE_USLEEP
        usleep(t*1000);
+
 #else
        int tdiff = 0;
        struct timeval tval, t1, t2;
@@ -59,54 +70,76 @@ int msleep(int t)
        return True;
 }
 
-#define MALLOC_MAX 0x40000000
-
-void *_new_array(unsigned long num, unsigned int size, int use_calloc)
-{
-       if (num >= MALLOC_MAX/size)
-               return NULL;
-       return use_calloc ? calloc(num, size) : malloc(num * size);
-}
-
-void *_realloc_array(void *ptr, unsigned int size, size_t num)
+void *my_alloc(void *ptr, size_t num, size_t size, const char *file, int line)
 {
-       if (num >= MALLOC_MAX/size)
-               return NULL;
+       if (max_alloc && num >= max_alloc/size) {
+               if (!file)
+                       return NULL;
+               rprintf(FERROR, "[%s] exceeded --max-alloc=%s setting (file=%s, line=%d)\n",
+                       who_am_i(), do_big_num(max_alloc, 0, NULL), src_file(file), line);
+               exit_cleanup(RERR_MALLOC);
+       }
        if (!ptr)
-               return malloc(size * num);
-       return realloc(ptr, size * num);
+               ptr = malloc(num * size);
+       else if (ptr == do_calloc)
+               ptr = calloc(num, size);
+       else
+               ptr = realloc(ptr, num * size);
+       if (!ptr && file)
+               _out_of_memory("my_alloc caller", file, line);
+       return ptr;
 }
 
 const char *sum_as_hex(int csum_type, const char *sum, int flist_csum)
 {
        static char buf[MAX_DIGEST_LEN*2+1];
        int i, x1, x2;
+       int canonical = canonical_checksum(csum_type);
        int sum_len = csum_len_for_type(csum_type, flist_csum);
-       char *c = buf + sum_len*2;
+       char *c;
 
-       assert(c - buf < (int)sizeof buf);
+       if (!canonical)
+               return NULL;
 
-       *c = '\0';
+       assert(sum_len*2 < (int)sizeof buf);
 
-       for (i = sum_len; --i >= 0; ) {
-               x1 = CVAL(sum, i);
-               x2 = x1 >> 4;
-               x1 &= 0xF;
-               *--c = x1 <= 9 ? x1 + '0' : x1 + 'a' - 10;
-               *--c = x2 <= 9 ? x2 + '0' : x2 + 'a' - 10;
+       for (i = sum_len, c = buf; --i >= 0; ) {
+               int ndx = canonical < 0 ? sum_len - i - 1 : i;
+               x2 = CVAL(sum, ndx);
+               x1 = x2 >> 4;
+               x2 &= 0xF;
+               *c++ = x1 <= 9 ? x1 + '0' : x1 + 'a' - 10;
+               *c++ = x2 <= 9 ? x2 + '0' : x2 + 'a' - 10;
        }
 
+       *c = '\0';
+
        return buf;
 }
 
-NORETURN void out_of_memory(const char *str)
+NORETURN void _out_of_memory(const char *msg, const char *file, int line)
 {
-       rprintf(FERROR, "ERROR: out of memory in %s [%s]\n", str, who_am_i());
+       rprintf(FERROR, "[%s] out of memory: %s (file=%s, line=%d)\n", who_am_i(), msg, src_file(file), line);
        exit_cleanup(RERR_MALLOC);
 }
 
-NORETURN void overflow_exit(const char *str)
+NORETURN void _overflow_exit(const char *msg, const char *file, int line)
 {
-       rprintf(FERROR, "ERROR: buffer overflow in %s [%s]\n", str, who_am_i());
+       rprintf(FERROR, "[%s] buffer overflow: %s (file=%s, line=%d)\n", who_am_i(), msg, src_file(file), line);
        exit_cleanup(RERR_MALLOC);
 }
+
+const char *src_file(const char *file)
+{
+       static const char *util2 = __FILE__;
+       static int prefix = -1;
+
+       if (prefix < 0) {
+               const char *cp = strrchr(util2, '/');
+               prefix = cp ? cp - util2 + 1 : 0;
+       }
+
+       if (prefix && strncmp(file, util2, prefix) == 0)
+               return file + prefix;
+       return file;
+}