wok diff boxbackup-server/stuff/boxbackup-0.10_gcc43.u @ rev 5195

slitaz-doc: fix version for 3.0
author Christophe Lincoln <pankso@slitaz.org>
date Sun Mar 28 17:16:33 2010 +0200 (2010-03-28)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/boxbackup-server/stuff/boxbackup-0.10_gcc43.u	Sun Mar 28 17:16:33 2010 +0200
     1.3 @@ -0,0 +1,177 @@
     1.4 +diff -ru boxbackup-0.10/bin/bbackupctl/bbackupctl.cpp boxbackup-0.10-slitaz/bin/bbackupctl/bbackupctl.cpp
     1.5 +--- boxbackup-0.10/bin/bbackupctl/bbackupctl.cpp	2006-02-23 21:47:38.000000000 +0100
     1.6 ++++ boxbackup-0.10-slitaz/bin/bbackupctl/bbackupctl.cpp	2009-06-29 23:49:34.000000000 +0200
     1.7 +@@ -48,6 +48,7 @@
     1.8 + #include "Box.h"
     1.9 + 
    1.10 + #include <stdio.h>
    1.11 ++#include <stdlib.h>
    1.12 + 
    1.13 + #ifdef HAVE_UNISTD_H
    1.14 + 	#include <unistd.h>
    1.15 +diff -ru boxbackup-0.10/bin/bbackupquery/bbackupquery.cpp boxbackup-0.10-slitaz/bin/bbackupquery/bbackupquery.cpp
    1.16 +--- boxbackup-0.10/bin/bbackupquery/bbackupquery.cpp	2006-02-23 21:47:38.000000000 +0100
    1.17 ++++ boxbackup-0.10-slitaz/bin/bbackupquery/bbackupquery.cpp	2009-06-29 23:49:34.000000000 +0200
    1.18 +@@ -51,6 +51,7 @@
    1.19 + 	#include <unistd.h>
    1.20 + #endif
    1.21 + #include <stdio.h>
    1.22 ++#include <stdlib.h>
    1.23 + #include <sys/types.h>
    1.24 + #ifdef HAVE_LIBREADLINE
    1.25 + 	#ifdef HAVE_READLINE_READLINE_H
    1.26 +diff -ru boxbackup-0.10/bin/bbstoreaccounts/bbstoreaccounts.cpp boxbackup-0.10-slitaz/bin/bbstoreaccounts/bbstoreaccounts.cpp
    1.27 +--- boxbackup-0.10/bin/bbstoreaccounts/bbstoreaccounts.cpp	2006-02-23 21:47:37.000000000 +0100
    1.28 ++++ boxbackup-0.10-slitaz/bin/bbstoreaccounts/bbstoreaccounts.cpp	2009-06-29 23:49:34.000000000 +0200
    1.29 +@@ -51,6 +51,7 @@
    1.30 + #include <stdio.h>
    1.31 + #include <sys/types.h>
    1.32 + #include <limits.h>
    1.33 ++#include <string.h>
    1.34 + #include <vector>
    1.35 + #include <algorithm>
    1.36 + 
    1.37 +diff -ru boxbackup-0.10/lib/backupclient/BackupClientFileAttributes.cpp boxbackup-0.10-slitaz/lib/backupclient/BackupClientFileAttributes.cpp
    1.38 +--- boxbackup-0.10/lib/backupclient/BackupClientFileAttributes.cpp	2006-02-23 21:47:37.000000000 +0100
    1.39 ++++ boxbackup-0.10-slitaz/lib/backupclient/BackupClientFileAttributes.cpp	2009-06-29 23:49:34.000000000 +0200
    1.40 +@@ -481,7 +481,7 @@
    1.41 + 	char* buffer = static_cast<char*>(outputBlock.GetBuffer());
    1.42 + 
    1.43 + 	// Add the path name for the symbolic link, and add 0 termination
    1.44 +-	std::memcpy(buffer+oldSize, linkedTo, linkedToSize);
    1.45 ++	::memcpy(buffer+oldSize, linkedTo, linkedToSize);
    1.46 + 	buffer[oldSize+linkedToSize] = '\0';
    1.47 + }
    1.48 + #endif
    1.49 +@@ -549,9 +549,9 @@
    1.50 + 
    1.51 + 				// Store length and text for attibute name
    1.52 + 				u_int16_t keyLength = htons(attrKey.size()+1);
    1.53 +-				std::memcpy(buffer+xattrSize, &keyLength, sizeof(u_int16_t));
    1.54 ++				::memcpy(buffer+xattrSize, &keyLength, sizeof(u_int16_t));
    1.55 + 				xattrSize += sizeof(u_int16_t);
    1.56 +-				std::memcpy(buffer+xattrSize, attrKey.c_str(), attrKey.size()+1);
    1.57 ++				::memcpy(buffer+xattrSize, attrKey.c_str(), attrKey.size()+1);
    1.58 + 				xattrSize += attrKey.size()+1;
    1.59 + 
    1.60 + 				// Leave space for value size
    1.61 +@@ -584,12 +584,12 @@
    1.62 + 
    1.63 + 				// Fill in value size
    1.64 + 				u_int32_t valueLength = htonl(valueSize);
    1.65 +-				std::memcpy(buffer+valueSizeOffset, &valueLength, sizeof(u_int32_t));
    1.66 ++				::memcpy(buffer+valueSizeOffset, &valueLength, sizeof(u_int32_t));
    1.67 + 			}
    1.68 + 
    1.69 + 			// Fill in attribute block size
    1.70 + 			u_int32_t xattrBlockLength = htonl(xattrSize-xattrBlockSizeOffset-sizeof(u_int32_t));
    1.71 +-			std::memcpy(buffer+xattrBlockSizeOffset, &xattrBlockLength, sizeof(u_int32_t));
    1.72 ++			::memcpy(buffer+xattrBlockSizeOffset, &xattrBlockLength, sizeof(u_int32_t));
    1.73 + 
    1.74 + 			outputBlock.ResizeBlock(xattrSize);
    1.75 + 		}
    1.76 +@@ -676,7 +676,7 @@
    1.77 + 		}
    1.78 + #endif
    1.79 + 
    1.80 +-		xattrOffset += std::strlen(reinterpret_cast<char*>(pattr+1))+1;
    1.81 ++		xattrOffset += ::strlen(reinterpret_cast<char*>(pattr+1))+1;
    1.82 + 	}
    1.83 + 	
    1.84 + 	// If working as root, set user IDs
    1.85 +@@ -817,7 +817,7 @@
    1.86 + 	const char* buffer = static_cast<char*>(mpClearAttributes->GetBuffer());
    1.87 + 
    1.88 + 	u_int32_t xattrBlockLength = 0;
    1.89 +-	std::memcpy(&xattrBlockLength, buffer+xattrOffset, sizeof(u_int32_t));
    1.90 ++	::memcpy(&xattrBlockLength, buffer+xattrOffset, sizeof(u_int32_t));
    1.91 + 	int xattrBlockSize = ntohl(xattrBlockLength);
    1.92 + 	xattrOffset += sizeof(u_int32_t);
    1.93 + 
    1.94 +@@ -831,7 +831,7 @@
    1.95 + 	while(xattrOffset<xattrEnd)
    1.96 + 	{
    1.97 + 		u_int16_t keyLength = 0;
    1.98 +-		std::memcpy(&keyLength, buffer+xattrOffset, sizeof(u_int16_t));
    1.99 ++		::memcpy(&keyLength, buffer+xattrOffset, sizeof(u_int16_t));
   1.100 + 		int keySize = ntohs(keyLength);
   1.101 + 		xattrOffset += sizeof(u_int16_t);
   1.102 + 
   1.103 +@@ -839,7 +839,7 @@
   1.104 + 		xattrOffset += keySize;
   1.105 + 
   1.106 + 		u_int32_t valueLength = 0;
   1.107 +-		std::memcpy(&valueLength, buffer+xattrOffset, sizeof(u_int32_t));
   1.108 ++		::memcpy(&valueLength, buffer+xattrOffset, sizeof(u_int32_t));
   1.109 + 		int valueSize = ntohl(valueLength);
   1.110 + 		xattrOffset += sizeof(u_int32_t);
   1.111 + 
   1.112 +diff -ru boxbackup-0.10/lib/backupclient/BackupStoreFileDiff.cpp boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileDiff.cpp
   1.113 +--- boxbackup-0.10/lib/backupclient/BackupStoreFileDiff.cpp	2006-02-23 21:47:37.000000000 +0100
   1.114 ++++ boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileDiff.cpp	2009-06-29 23:49:34.000000000 +0200
   1.115 +@@ -70,6 +70,8 @@
   1.116 + 
   1.117 + #include "MemLeakFindOn.h"
   1.118 + 
   1.119 ++#include <string.h>
   1.120 ++
   1.121 + using namespace BackupStoreFileCryptVar;
   1.122 + using namespace BackupStoreFileCreation;
   1.123 + 
   1.124 +diff -ru boxbackup-0.10/lib/backupclient/BackupStoreFileEncodeStream.cpp boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileEncodeStream.cpp
   1.125 +--- boxbackup-0.10/lib/backupclient/BackupStoreFileEncodeStream.cpp	2006-02-23 21:47:37.000000000 +0100
   1.126 ++++ boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileEncodeStream.cpp	2009-06-29 23:49:34.000000000 +0200
   1.127 +@@ -62,6 +62,8 @@
   1.128 + 
   1.129 + #include "MemLeakFindOn.h"
   1.130 + 
   1.131 ++#include <string.h>
   1.132 ++
   1.133 + using namespace BackupStoreFileCryptVar;
   1.134 + 
   1.135 + 
   1.136 +diff -ru boxbackup-0.10/lib/backupclient/BackupStoreFile.h boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFile.h
   1.137 +--- boxbackup-0.10/lib/backupclient/BackupStoreFile.h	2006-02-23 21:47:37.000000000 +0100
   1.138 ++++ boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFile.h	2009-06-29 23:49:34.000000000 +0200
   1.139 +@@ -53,6 +53,7 @@
   1.140 + #include "BackupStoreFilename.h"
   1.141 + 
   1.142 + #include <memory>
   1.143 ++#include <malloc.h>
   1.144 + 
   1.145 + typedef struct 
   1.146 + {
   1.147 +diff -ru boxbackup-0.10/lib/common/Configuration.cpp boxbackup-0.10-slitaz/lib/common/Configuration.cpp
   1.148 +--- boxbackup-0.10/lib/common/Configuration.cpp	2006-02-23 21:47:35.000000000 +0100
   1.149 ++++ boxbackup-0.10-slitaz/lib/common/Configuration.cpp	2009-06-29 23:49:34.000000000 +0200
   1.150 +@@ -57,6 +57,8 @@
   1.151 + 
   1.152 + #include "MemLeakFindOn.h"
   1.153 + 
   1.154 ++#include <string.h>
   1.155 ++
   1.156 + // utility whitespace function
   1.157 + inline bool iw(int c)
   1.158 + {
   1.159 +diff -ru boxbackup-0.10/lib/common/WaitForEvent.cpp boxbackup-0.10-slitaz/lib/common/WaitForEvent.cpp
   1.160 +--- boxbackup-0.10/lib/common/WaitForEvent.cpp	2006-02-23 21:47:35.000000000 +0100
   1.161 ++++ boxbackup-0.10-slitaz/lib/common/WaitForEvent.cpp	2009-06-29 23:49:34.000000000 +0200
   1.162 +@@ -53,6 +53,7 @@
   1.163 + 
   1.164 + #include <errno.h>
   1.165 + #include <string.h>
   1.166 ++#include <malloc.h>
   1.167 + 
   1.168 + #include "WaitForEvent.h"
   1.169 + 
   1.170 +diff -ru boxbackup-0.10/lib/raidfile/RaidFileRead.cpp boxbackup-0.10-slitaz/lib/raidfile/RaidFileRead.cpp
   1.171 +--- boxbackup-0.10/lib/raidfile/RaidFileRead.cpp	2006-02-23 21:47:37.000000000 +0100
   1.172 ++++ boxbackup-0.10-slitaz/lib/raidfile/RaidFileRead.cpp	2009-06-29 23:49:34.000000000 +0200
   1.173 +@@ -59,6 +59,7 @@
   1.174 + 
   1.175 + #include <stdio.h>
   1.176 + #include <string.h>
   1.177 ++#include <malloc.h>
   1.178 + #include <memory>
   1.179 + #include <map>
   1.180 +