wok-4.x view boxbackup-server/stuff/boxbackup-0.10_gcc43.u @ rev 4533

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