Changeset 745 for trunk/server/lib/util/util_file.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/util/util_file.c (modified) (2 diffs)

trunk/server/lib/util/util_file.c

@@ -236 +236 @@
 #endif
         if (!p) {
-                p = file_load(fname, &s2, 0, talloc_autofree_context());
+                p = file_load(fname, &s2, 0, NULL);
                 if (!p) return NULL;
                 if (s2 != size) {
@@ -436 +436 @@
 
 
+/*
+  compare two files, return true if the two files have the same content
+ */
+bool file_compare(const char *path1, const char *path2)
+{
+        size_t size1, size2;
+        char *p1, *p2;
+        TALLOC_CTX *mem_ctx = talloc_new(NULL);
+
+        p1 = file_load(path1, &size1, 0, mem_ctx);
+        p2 = file_load(path2, &size2, 0, mem_ctx);
+        if (!p1 || !p2 || size1 != size2) {
+                talloc_free(mem_ctx);
+                return false;
+        }
+        if (memcmp(p1, p2, size1) != 0) {
+                talloc_free(mem_ctx);
+                return false;
+        }
+        talloc_free(mem_ctx);
+        return true;
+}