Author: igalic
Date: Sun Sep 18 21:25:52 2011
New Revision: 1172364
URL: http://svn.apache.org/viewvc?rev=1172364&view=rev
Log:
TS-953: consolidate string copy/concat for proxy/ Tests.
Modified:
trafficserver/traffic/trunk/proxy/InkAPITest.cc
trafficserver/traffic/trunk/proxy/TestDNS.cc
trafficserver/traffic/trunk/proxy/TestPreProc.cc
trafficserver/traffic/trunk/proxy/TestProxy.cc
trafficserver/traffic/trunk/proxy/hdrs/test_header.cc
Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=1172364&r1=1172363&r2=1172364&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Sun Sep 18 21:25:52 2011
@@ -4419,9 +4419,9 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)
char *expected_value;
size_t len = strlen(field5Value1) + strlen(field5Value1Append) + 1;
expected_value = (char *) TSmalloc(len);
- memset(expected_value, 0, strlen(field5Value1) +
strlen(field5Value1Append) + 1);
- ink_strncpy(expected_value, field5Value1, len);
- strncat(expected_value, field5Value1Append, len -
strlen(expected_value) - 1);
+ memset(expected_value, 0, len);
+ ink_strlcpy(expected_value, field5Value1, len);
+ ink_strlcat(expected_value, field5Value1Append, len);
if ((strncmp(fieldValueAppendGet, expected_value,
lengthFieldValueAppended) == 0) &&
(lengthFieldValueAppended = strlen(expected_value))) {
SDK_RPRINT(test, "TSMimeHdrFieldValueAppend", "TestCase1", TC_PASS,
"ok");
@@ -6730,7 +6730,7 @@ load(const char *append_string)
blk = TSIOBufferStart(append_buffer);
p = TSIOBufferBlockWriteStart(blk, &avail);
- ink_strncpy(p, append_string, avail);
+ ink_strlcpy(p, append_string, avail);
if (append_string != NULL) {
TSIOBufferProduce(append_buffer, strlen(append_string));
}
Modified: trafficserver/traffic/trunk/proxy/TestDNS.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/TestDNS.cc?rev=1172364&r1=1172363&r2=1172364&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/TestDNS.cc (original)
+++ trafficserver/traffic/trunk/proxy/TestDNS.cc Sun Sep 18 21:25:52 2011
@@ -70,7 +70,7 @@ FILE *fin;
class TestDnsStateMachine:public Continuation
{
public:
- TestDnsStateMachine(char *ahost);
+ TestDnsStateMachine(char *ahost, size_t size);
~TestDnsStateMachine()
{
// cout << "StateMachine::~StateMachine(). Terminating ... " << endl;
@@ -88,11 +88,11 @@ public:
char host[100];
};
-TestDnsStateMachine::TestDnsStateMachine(char *ahost)
+TestDnsStateMachine::TestDnsStateMachine(char *ahost, size_t size)
:
Continuation(new_ProxyMutex())
{
- strcpy(host, ahost);
+ ink_strlcpy(host, ahost, size);
m_state = START;
SET_HANDLER(processEvent);
return;
@@ -247,7 +247,7 @@ test()
start_time = ink_get_hrtime();
last_measurement_time = ink_get_hrtime();
while ((fscanf(fin, "%s", host) != EOF) && (i < state_machines_created)) {
- test_dns_state_machine = new TestDnsStateMachine(host);
+ test_dns_state_machine = new TestDnsStateMachine(host, sizeof(host));
test_dns_state_machine->handleEvent();
i++;
}
Modified: trafficserver/traffic/trunk/proxy/TestPreProc.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/TestPreProc.cc?rev=1172364&r1=1172363&r2=1172364&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/TestPreProc.cc (original)
+++ trafficserver/traffic/trunk/proxy/TestPreProc.cc Sun Sep 18 21:25:52 2011
@@ -77,7 +77,7 @@ RequestInput::run()
unsigned writeBytes = (m_len < maxBytes) ? m_len : maxBytes;
- strncpy(buff, m_sp, writeBytes);
+ writeBytes = ink_strlcpy(buff, m_sp, maxBytes);
m_cb->wrote(writeBytes);
m_len -= writeBytes;
Modified: trafficserver/traffic/trunk/proxy/TestProxy.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/TestProxy.cc?rev=1172364&r1=1172363&r2=1172364&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/TestProxy.cc (original)
+++ trafficserver/traffic/trunk/proxy/TestProxy.cc Sun Sep 18 21:25:52 2011
@@ -1,6 +1,6 @@
/** @file
- A brief file description
+ This file implements the functionality to test the Proxy
@section license License
@@ -22,10 +22,6 @@
*/
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-/****************************************************************************
-
- TestProxy.cc
- ****************************************************************************/
#include <limits.h>
#include "Net.h"
@@ -145,19 +141,18 @@ struct TestProxy:Continuation
url = strchr(thost, '/'); // done before portStr stompage */
temp = strchr(thost, ' ');
ink_assert(temp - thost < 1024);
- strncpy(url_str, thost, temp - thost);
- url_str[temp - thost] = '\0';
+ ink_strlcpy(url_str, thost, sizeof(url_str));
if (!url)
return done();
char *portStr = strchr(thost, ':');
*url = 0;
if (portStr == NULL) {
port = 80;
- strcpy(host, thost);
+ ink_strlcpy(host, thost, sizeof(host));
} else {
*portStr = '\0'; /* close off the hostname */
port = atoi(portStr + 1);
- strcpy(host, thost);
+ ink_strlcpy(host, thost, sizeof(host));
*portStr = ':';
}
url_end = strchr(url + 1, ' ');
Modified: trafficserver/traffic/trunk/proxy/hdrs/test_header.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/test_header.cc?rev=1172364&r1=1172363&r2=1172364&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/test_header.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/test_header.cc Sun Sep 18 21:25:52
2011
@@ -1,6 +1,6 @@
/** @file
- A brief file description
+ test code for sanity checking the header system is functioning properly
@section license License
@@ -21,16 +21,6 @@
limitations under the License.
*/
-/****************************************************************************
-
- test_header.cc
-
- Description:
- test code for sanity checking the header system is functioning
- properly
-
-
- ****************************************************************************/
#include <stdlib.h>
#include <string.h>
@@ -1004,7 +994,7 @@ test_str_replace_slice()
int failures = 0;
// (1) prepend
- strcpy(buff, "de, fr, en");
+ ink_strlcpy(buff, "de, fr, en", sizeof(buff));
targ = buff + 0;
repl = "oo, ";
good = "oo, de, fr, en";
@@ -1014,7 +1004,7 @@ test_str_replace_slice()
++failures;
}
// (2) append
- strcpy(buff, "de, fr, en");
+ ink_strlcpy(buff, "de, fr, en", sizeof(buff));
targ = buff + 10;
repl = ", bloop";
good = "de, fr, en, bloop";
@@ -1024,7 +1014,7 @@ test_str_replace_slice()
++failures;
}
// (3) delete middle
- strcpy(buff, "de, fr, en");
+ ink_strlcpy(buff, "de, fr, en", sizeof(buff));
targ = buff + 4;
repl = "";
good = "de, en";
