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
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
|
--- tripwire-2.3.1-2/src/core/stringutil.h.sopwith Sun Feb 4 00:38:27 2001
+++ tripwire-2.3.1-2/src/core/stringutil.h Fri Feb 1 01:11:59 2002
@@ -64,7 +64,7 @@
Convert( std::string& lhs, const std::string& rhs )
{
lhs = rhs;
- return lhs.c_str();
+ return std::string::const_iterator(lhs.c_str());
}
/// Specialize Everything Else
--- tripwire-2.3.1-2/src/core/charutil.cpp.sopwith Sat Oct 28 15:22:55 2000
+++ tripwire-2.3.1-2/src/core/charutil.cpp Fri Feb 1 01:11:59 2002
@@ -105,7 +105,7 @@
}
first = cur;
- last = tss::strinc( cur );
+ last = TSTRING::const_iterator(tss::strinc( cur.base() ));
return true;
}
--- tripwire-2.3.1-2/src/core/displayencoder.cpp.sopwith Fri Oct 27 21:15:20 2000
+++ tripwire-2.3.1-2/src/core/displayencoder.cpp Fri Feb 1 01:11:59 2002
@@ -828,7 +828,8 @@
ach[0] = ch;
for( sack_type::const_iterator atE = m_encodings.begin(); atE != m_encodings.end(); atE++ )
{
- if( (*atE)->NeedsEncoding( &ach[0], &ach[1] ) )
+ if( (*atE)->NeedsEncoding( std::string::const_iterator(&ach[0]),
+ std::string::const_iterator(&ach[1]) ) )
{
if( fFailedATest )
return false; // each char can only fail one test
--- tripwire-2.3.1-2/src/core/displayutil.cpp.sopwith Sat Oct 28 15:22:55 2000
+++ tripwire-2.3.1-2/src/core/displayutil.cpp Fri Feb 1 01:11:59 2002
@@ -45,7 +45,7 @@
TOSTRINGSTREAM sstr;
TSTRING strT;
bool fFirstLine = true;
- for( TSTRING::const_iterator i = str.begin(); i != str.end(); i = tss::strinc( i ) )
+ for( TSTRING::const_iterator i = str.begin(); i != str.end(); i = TSTRING::const_iterator(tss::strinc( i.base() )) )
{
// return found -- add line to output string
if( _T('\n') == *i )
@@ -74,7 +74,7 @@
else
{
// add char to string
- strT.append( i, (TSTRING::const_iterator)tss::strinc( i ) );
+ strT.append( i, TSTRING::const_iterator(tss::strinc( i.base() )) );
}
}
--- tripwire-2.3.1-2/src/cryptlib/misc.h.sopwith Fri Oct 27 20:26:21 2000
+++ tripwire-2.3.1-2/src/cryptlib/misc.h Fri Feb 1 01:11:59 2002
@@ -150,7 +150,7 @@
operator T *()
{return ptr;}
-#if !defined(_MSC_VER) && !defined(_KCC)
+#if !defined(_MSC_VER) && !defined(_KCC) && 0
T *operator +(unsigned int offset)
{return ptr+offset;}
const T *operator +(unsigned int offset) const
--- tripwire-2.3.1-2/src/cryptlib/i686-pc-linux.mak.sopwith Fri Feb 1 01:12:57 2002
+++ tripwire-2.3.1-2/src/cryptlib/i686-pc-linux.mak Fri Feb 1 01:13:12 2002
@@ -71,12 +71,12 @@
# Recusively call make defining the appropriate $(D_FLAGS) var
debug:
- gmake -f $(MAKEFILE) cryptlib_d.a "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
-# gmake -f $(MAKEFILE) cryptest_d "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
+ $(MAKE) -f $(MAKEFILE) cryptlib_d.a "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
+# $(MAKE) -f $(MAKEFILE) cryptest_d "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
release:
- gmake -f $(MAKEFILE) cryptlib.a "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
-# gmake -f $(MAKEFILE) cryptest "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
+ $(MAKE) -f $(MAKEFILE) cryptlib.a "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
+# $(MAKE) -f $(MAKEFILE) cryptest "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
###############################################################################
--- tripwire-2.3.1-2/src/db/hierdatabase.cpp.sopwith Sun Feb 25 00:41:13 2001
+++ tripwire-2.3.1-2/src/db/hierdatabase.cpp Fri Feb 1 01:11:59 2002
@@ -255,7 +255,8 @@
}
else
{
- int offset = rhs.mIter - rhs.mEntries.begin();
+ int offset;
+ offset = -(rhs.mEntries.begin() - rhs.mIter);
mIter = mEntries.begin() + offset;
}
--- tripwire-2.3.1-2/src/fco/fconame.cpp.sopwith Fri Oct 27 20:25:41 2000
+++ tripwire-2.3.1-2/src/fco/fconame.cpp Fri Feb 1 01:11:59 2002
@@ -269,7 +269,7 @@
mpPathName->ClearList();
- TSTRING::const_iterator at = ( pszin + 0 );
+ TSTRING::const_iterator at = TSTRING::const_iterator( pszin + 0 );
TSTRING::const_iterator end = at;
while ( *end ) ++end; // NOTE: Find end
@@ -277,9 +277,9 @@
while ( at < end )
{
while ( !(*at == mDelimiter) && at < end )
- at = tss::strinc( at );
+ at = TSTRING::const_iterator(tss::strinc( at.base() ));
- if ( at == beg && tss::strinc(at) >= end && at != pszin )
+ if ( at == beg && TSTRING::const_iterator(tss::strinc(at.base())) >= end && at.base() != pszin )
break;
cFCONameTblNode* pNode =
@@ -287,7 +287,7 @@
mpPathName->mNames.push_back( pNode );
- beg = ( at = tss::strinc( at ) );
+ beg = ( at = TSTRING::const_iterator(tss::strinc( at.base() )) );
}
}
Binary files tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc.sopwith and tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc differ
--- tripwire-2.3.1-2/src/siggen/siggenmain.cpp.sopwith Fri Oct 27 20:26:25 2000
+++ tripwire-2.3.1-2/src/siggen/siggenmain.cpp Fri Feb 1 01:11:59 2002
@@ -118,11 +118,7 @@
// set unexpected and terminate handlers
// Note: we do this before Init() in case it attempts to call these handlers
// TODO: move this into the Init() routine
-#if IS_GCC
- #define EXCEPTION_NAMESPACE
- #else
- #define EXCEPTION_NAMESPACE std::
- #endif
+#define EXCEPTION_NAMESPACE std::
EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
--- tripwire-2.3.1-2/src/tripwire/mailmessage.cpp.sopwith Fri Feb 1 01:11:59 2002
+++ tripwire-2.3.1-2/src/tripwire/mailmessage.cpp Fri Feb 1 01:11:59 2002
@@ -509,9 +509,9 @@
std::string::size_type stringSize = 0;
std::string::const_iterator at;
std::string::difference_type charSize;
- for( at = sIn.begin(), charSize = ( tss::strinc( at ) - at );
+ for( at = sIn.begin(), charSize = ( std::string::const_iterator(tss::strinc( at.base() )) - at );
at != sIn.end();
- at += charSize, charSize = ( tss::strinc( at ) - at ) )
+ at += charSize, charSize = ( std::string::const_iterator(tss::strinc( at.base() )) - at ) )
{
ASSERT( charSize > 0 );
--- tripwire-2.3.1-2/src/tripwire/tripwiremain.cpp.sopwith Sat Feb 24 14:02:12 2001
+++ tripwire-2.3.1-2/src/tripwire/tripwiremain.cpp Fri Feb 1 01:11:59 2002
@@ -122,11 +122,7 @@
// set unexpected and terminate handlers
// Note: we do this before Init() in case it attempts to call these handlers
// TODO: move this into the Init() routine
-#if IS_GCC
- #define EXCEPTION_NAMESPACE
- #else
- #define EXCEPTION_NAMESPACE std::
- #endif
+#define EXCEPTION_NAMESPACE std::
EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
--- tripwire-2.3.1-2/src/twadmin/twadminmain.cpp.sopwith Fri Oct 27 20:26:22 2000
+++ tripwire-2.3.1-2/src/twadmin/twadminmain.cpp Fri Feb 1 01:11:59 2002
@@ -86,11 +86,7 @@
// set unexpected and terminate handlers
// Note: we do this before Init() in case it attempts to call these handlers
// TODO: move this into the Init() routine
-#if IS_GCC
- #define EXCEPTION_NAMESPACE
- #else
- #define EXCEPTION_NAMESPACE std::
- #endif
+#define EXCEPTION_NAMESPACE std::
EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
--- tripwire-2.3.1-2/src/twparser/policyparser.cpp.sopwith Sat Feb 24 14:02:12 2001
+++ tripwire-2.3.1-2/src/twparser/policyparser.cpp Fri Feb 1 01:11:59 2002
@@ -228,7 +228,7 @@
// at gets incremented when used....
)
{
- int nBytes = ::mblen( (char*)at, MB_CUR_MAX );
+ int nBytes = ::mblen( at.base(), MB_CUR_MAX );
if ( nBytes == -1 )
{
d.TraceDebug( "Unrecognized Character: %c\n", *at );
--- tripwire-2.3.1-2/src/twprint/twprintmain.cpp.sopwith Fri Oct 27 20:26:19 2000
+++ tripwire-2.3.1-2/src/twprint/twprintmain.cpp Fri Feb 1 01:11:59 2002
@@ -98,8 +98,8 @@
#if IS_GCC
#define EXCEPTION_NAMESPACE
#else
- #define EXCEPTION_NAMESPACE std::
#endif
+#define EXCEPTION_NAMESPACE std::
EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
--- tripwire-2.3.1-2/src/Makefile.sopwith Sat Mar 3 23:03:52 2001
+++ tripwire-2.3.1-2/src/Makefile Fri Feb 1 01:11:59 2002
@@ -93,7 +93,7 @@
# file to Makefile.linux_intel or something similar.
MAKEFILE = Makefile
-GMAKE = gmake
+GMAKE = $(MAKE)
#-----------------------------------------------------------------------------
# STLPORT
@@ -145,7 +145,7 @@
# It's handy for clean, .PHONY, etc. to have one big list
#
-targets = $(debugbinaries) $(debuglibraries) $(releasebinaries) $(releaselibraries) STLport_d STLport_r
+targets = $(debugbinaries) $(debuglibraries) $(releasebinaries) $(releaselibraries)
# Let make know these aren't real file names...
--- tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc.sopwith Fri Oct 27 20:26:25 2000
+++ tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc Fri Feb 1 01:11:59 2002
@@ -19,11 +19,11 @@
# General variable definitions
#
-GMAKE = /usr/bin/gmake
+GMAKE = $(MAKE)
CC = g++
CXX = $(CC)
AR = ar
-SYSDEF=-D_REDHAT -D_IX86 -D_GCC
+SYSDEF=-D_REDHAT -D_IX86 -D_GCC $(RPM_OPT_FLAGS)
STLPORT=../STLport-4.0
#
@@ -33,7 +33,7 @@
CXXFLAGS_R = -I.. -I$(STLPORT)/stlport -ftemplate-depth-32
DEFINES_R = -DNDEBUG $(SYSDEF)
LINKFLAGS_R = -static
-LIBRARYFLAGS_R = -L../../lib/$(SYSPRE)_r -lm -lstlport_gcc
+LIBRARYFLAGS_R = -L../../lib/$(SYSPRE)_r -lm
ARFLAGS_R = crv
#
|
GitWeb