1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
|
diff -ur --exclude '*.o' --exclude '*.a' --exclude '*~' boxbackup-0.10,bak/bin/bbackupctl/bbackupctl.cpp boxbackup-0.10/bin/bbackupctl/bbackupctl.cpp
--- boxbackup-0.10,bak/bin/bbackupctl/bbackupctl.cpp 2006-02-23 22:47:38.000000000 +0200
+++ boxbackup-0.10/bin/bbackupctl/bbackupctl.cpp 2008-07-20 18:59:40.000000000 +0300
@@ -48,6 +48,7 @@
#include "Box.h"
#include <stdio.h>
+#include <stdlib.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff -ur --exclude '*.o' --exclude '*.a' --exclude '*~' boxbackup-0.10,bak/bin/bbackupquery/bbackupquery.cpp boxbackup-0.10/bin/bbackupquery/bbackupquery.cpp
--- boxbackup-0.10,bak/bin/bbackupquery/bbackupquery.cpp 2006-02-23 22:47:38.000000000 +0200
+++ boxbackup-0.10/bin/bbackupquery/bbackupquery.cpp 2008-07-20 18:59:12.000000000 +0300
@@ -51,6 +51,7 @@
#include <unistd.h>
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <sys/types.h>
#ifdef HAVE_LIBREADLINE
#ifdef HAVE_READLINE_READLINE_H
diff -ur --exclude '*.o' --exclude '*.a' --exclude '*~' boxbackup-0.10,bak/bin/bbstoreaccounts/bbstoreaccounts.cpp boxbackup-0.10/bin/bbstoreaccounts/bbstoreaccounts.cpp
--- boxbackup-0.10,bak/bin/bbstoreaccounts/bbstoreaccounts.cpp 2006-02-23 22:47:37.000000000 +0200
+++ boxbackup-0.10/bin/bbstoreaccounts/bbstoreaccounts.cpp 2008-07-20 19:01:21.000000000 +0300
@@ -51,6 +51,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <limits.h>
+#include <string.h>
#include <vector>
#include <algorithm>
diff -ur --exclude '*.o' --exclude '*.a' --exclude '*~' boxbackup-0.10,bak/lib/backupclient/BackupClientFileAttributes.cpp boxbackup-0.10/lib/backupclient/BackupClientFileAttributes.cpp
--- boxbackup-0.10,bak/lib/backupclient/BackupClientFileAttributes.cpp 2006-02-23 22:47:37.000000000 +0200
+++ boxbackup-0.10/lib/backupclient/BackupClientFileAttributes.cpp 2008-07-20 18:58:27.000000000 +0300
@@ -481,7 +481,7 @@
char* buffer = static_cast<char*>(outputBlock.GetBuffer());
// Add the path name for the symbolic link, and add 0 termination
- std::memcpy(buffer+oldSize, linkedTo, linkedToSize);
+ ::memcpy(buffer+oldSize, linkedTo, linkedToSize);
buffer[oldSize+linkedToSize] = '\0';
}
#endif
@@ -549,9 +549,9 @@
// Store length and text for attibute name
u_int16_t keyLength = htons(attrKey.size()+1);
- std::memcpy(buffer+xattrSize, &keyLength, sizeof(u_int16_t));
+ ::memcpy(buffer+xattrSize, &keyLength, sizeof(u_int16_t));
xattrSize += sizeof(u_int16_t);
- std::memcpy(buffer+xattrSize, attrKey.c_str(), attrKey.size()+1);
+ ::memcpy(buffer+xattrSize, attrKey.c_str(), attrKey.size()+1);
xattrSize += attrKey.size()+1;
// Leave space for value size
@@ -584,12 +584,12 @@
// Fill in value size
u_int32_t valueLength = htonl(valueSize);
- std::memcpy(buffer+valueSizeOffset, &valueLength, sizeof(u_int32_t));
+ ::memcpy(buffer+valueSizeOffset, &valueLength, sizeof(u_int32_t));
}
// Fill in attribute block size
u_int32_t xattrBlockLength = htonl(xattrSize-xattrBlockSizeOffset-sizeof(u_int32_t));
- std::memcpy(buffer+xattrBlockSizeOffset, &xattrBlockLength, sizeof(u_int32_t));
+ ::memcpy(buffer+xattrBlockSizeOffset, &xattrBlockLength, sizeof(u_int32_t));
outputBlock.ResizeBlock(xattrSize);
}
@@ -676,7 +676,7 @@
}
#endif
- xattrOffset += std::strlen(reinterpret_cast<char*>(pattr+1))+1;
+ xattrOffset += ::strlen(reinterpret_cast<char*>(pattr+1))+1;
}
// If working as root, set user IDs
@@ -817,7 +817,7 @@
const char* buffer = static_cast<char*>(mpClearAttributes->GetBuffer());
u_int32_t xattrBlockLength = 0;
- std::memcpy(&xattrBlockLength, buffer+xattrOffset, sizeof(u_int32_t));
+ ::memcpy(&xattrBlockLength, buffer+xattrOffset, sizeof(u_int32_t));
int xattrBlockSize = ntohl(xattrBlockLength);
xattrOffset += sizeof(u_int32_t);
@@ -831,7 +831,7 @@
while(xattrOffset<xattrEnd)
{
u_int16_t keyLength = 0;
- std::memcpy(&keyLength, buffer+xattrOffset, sizeof(u_int16_t));
+ ::memcpy(&keyLength, buffer+xattrOffset, sizeof(u_int16_t));
int keySize = ntohs(keyLength);
xattrOffset += sizeof(u_int16_t);
@@ -839,7 +839,7 @@
xattrOffset += keySize;
u_int32_t valueLength = 0;
- std::memcpy(&valueLength, buffer+xattrOffset, sizeof(u_int32_t));
+ ::memcpy(&valueLength, buffer+xattrOffset, sizeof(u_int32_t));
int valueSize = ntohl(valueLength);
xattrOffset += sizeof(u_int32_t);
diff -ur --exclude '*.o' --exclude '*.a' --exclude '*~' boxbackup-0.10,bak/lib/backupclient/BackupStoreFileDiff.cpp boxbackup-0.10/lib/backupclient/BackupStoreFileDiff.cpp
--- boxbackup-0.10,bak/lib/backupclient/BackupStoreFileDiff.cpp 2006-02-23 22:47:37.000000000 +0200
+++ boxbackup-0.10/lib/backupclient/BackupStoreFileDiff.cpp 2008-07-20 18:55:18.000000000 +0300
@@ -70,6 +70,8 @@
#include "MemLeakFindOn.h"
+#include <string.h>
+
using namespace BackupStoreFileCryptVar;
using namespace BackupStoreFileCreation;
diff -ur --exclude '*.o' --exclude '*.a' --exclude '*~' boxbackup-0.10,bak/lib/backupclient/BackupStoreFileEncodeStream.cpp boxbackup-0.10/lib/backupclient/BackupStoreFileEncodeStream.cpp
--- boxbackup-0.10,bak/lib/backupclient/BackupStoreFileEncodeStream.cpp 2006-02-23 22:47:37.000000000 +0200
+++ boxbackup-0.10/lib/backupclient/BackupStoreFileEncodeStream.cpp 2008-07-20 18:54:21.000000000 +0300
@@ -62,6 +62,8 @@
#include "MemLeakFindOn.h"
+#include <string.h>
+
using namespace BackupStoreFileCryptVar;
diff -ur --exclude '*.o' --exclude '*.a' --exclude '*~' boxbackup-0.10,bak/lib/backupclient/BackupStoreFile.h boxbackup-0.10/lib/backupclient/BackupStoreFile.h
--- boxbackup-0.10,bak/lib/backupclient/BackupStoreFile.h 2006-02-23 22:47:37.000000000 +0200
+++ boxbackup-0.10/lib/backupclient/BackupStoreFile.h 2008-07-20 18:51:08.000000000 +0300
@@ -53,6 +53,7 @@
#include "BackupStoreFilename.h"
#include <memory>
+#include <malloc.h>
typedef struct
{
diff -ur --exclude '*.o' --exclude '*.a' --exclude '*~' boxbackup-0.10,bak/lib/common/Configuration.cpp boxbackup-0.10/lib/common/Configuration.cpp
--- boxbackup-0.10,bak/lib/common/Configuration.cpp 2006-02-23 22:47:35.000000000 +0200
+++ boxbackup-0.10/lib/common/Configuration.cpp 2008-07-20 18:52:37.000000000 +0300
@@ -57,6 +57,8 @@
#include "MemLeakFindOn.h"
+#include <string.h>
+
// utility whitespace function
inline bool iw(int c)
{
diff -ur --exclude '*.o' --exclude '*.a' --exclude '*~' boxbackup-0.10,bak/lib/common/WaitForEvent.cpp boxbackup-0.10/lib/common/WaitForEvent.cpp
--- boxbackup-0.10,bak/lib/common/WaitForEvent.cpp 2006-02-23 22:47:35.000000000 +0200
+++ boxbackup-0.10/lib/common/WaitForEvent.cpp 2008-07-20 18:53:33.000000000 +0300
@@ -53,6 +53,7 @@
#include <errno.h>
#include <string.h>
+#include <malloc.h>
#include "WaitForEvent.h"
diff -ur --exclude '*.o' --exclude '*.a' --exclude '*~' boxbackup-0.10,bak/lib/raidfile/RaidFileRead.cpp boxbackup-0.10/lib/raidfile/RaidFileRead.cpp
--- boxbackup-0.10,bak/lib/raidfile/RaidFileRead.cpp 2006-02-23 22:47:37.000000000 +0200
+++ boxbackup-0.10/lib/raidfile/RaidFileRead.cpp 2008-07-20 19:00:48.000000000 +0300
@@ -59,6 +59,7 @@
#include <stdio.h>
#include <string.h>
+#include <malloc.h>
#include <memory>
#include <map>
|
GitWeb