wok-current annotate boxbackup-server/stuff/boxbackup-0.10_gcc43.u @ rev 3883

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