Author: igalic
Date: Fri Sep 16 08:58:35 2011
New Revision: 1171456
URL: http://svn.apache.org/viewvc?rev=1171456&view=rev
Log:
TS-953: consolidate string copy/concat for examples.
Modified:
trafficserver/traffic/trunk/example/app-template/app-template.cc
trafficserver/traffic/trunk/example/gzip-transform/gunzip.c
trafficserver/traffic/trunk/example/gzip-transform/gzip.c
trafficserver/traffic/trunk/example/protocol/TxnSM.c
trafficserver/traffic/trunk/example/query_remap/query_remap.c
trafficserver/traffic/trunk/example/redirect-1/redirect-1.c
Modified: trafficserver/traffic/trunk/example/app-template/app-template.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/app-template/app-template.cc?rev=1171456&r1=1171455&r2=1171456&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/app-template/app-template.cc (original)
+++ trafficserver/traffic/trunk/example/app-template/app-template.cc Fri Sep 16
08:58:35 2011
@@ -159,10 +159,10 @@ int main(int argc, char * argv[])
}
// Get TS directories
- ink_strncpy(system_root_dir, Layout::get()->prefix, sizeof(system_root_dir));
- ink_strncpy(system_config_directory, Layout::get()->sysconfdir,
sizeof(system_config_directory));
- ink_strncpy(system_runtime_dir, Layout::get()->runtimedir,
sizeof(system_runtime_dir));
- ink_strncpy(system_log_dir, Layout::get()->logdir, sizeof(system_log_dir));
+ ink_strlcpy(system_root_dir, Layout::get()->prefix, sizeof(system_root_dir));
+ ink_strlcpy(system_config_directory, Layout::get()->sysconfdir,
sizeof(system_config_directory));
+ ink_strlcpy(system_runtime_dir, Layout::get()->runtimedir,
sizeof(system_runtime_dir));
+ ink_strlcpy(system_log_dir, Layout::get()->logdir, sizeof(system_log_dir));
if (system_root_dir[0] && (chdir(system_root_dir) < 0)) {
fprintf(stderr,"unable to change to root directory \"%s\" [%d '%s']\n",
system_root_dir, errno, strerror(errno));
Modified: trafficserver/traffic/trunk/example/gzip-transform/gunzip.c
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/gzip-transform/gunzip.c?rev=1171456&r1=1171455&r2=1171456&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/gzip-transform/gunzip.c (original)
+++ trafficserver/traffic/trunk/example/gzip-transform/gunzip.c Fri Sep 16
08:58:35 2011
@@ -71,7 +71,7 @@ load_dictionary(char *dict, uLong * adle
while (!feof(fp)) {
if (fscanf(fp, "%s\n", dict + i) == 1) {
i = strlen(dict);
- strcat(dict + i, " ");
+ TSstrlcat(dict + i, " ", sizeof(dict) - i);
i++;
}
}
@@ -534,7 +534,7 @@ void
TSPluginInit(int argc, const char *argv[])
{
if (argc == 2) {
- strcpy(preload_file, argv[1]);
+ TSstrlcpy(preload_file, argv[1], sizeof(preload_file));
preload = 1;
load_dictionary(dictionary, &dictId);
}
Modified: trafficserver/traffic/trunk/example/gzip-transform/gzip.c
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/gzip-transform/gzip.c?rev=1171456&r1=1171455&r2=1171456&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/gzip-transform/gzip.c (original)
+++ trafficserver/traffic/trunk/example/gzip-transform/gzip.c Fri Sep 16
08:58:35 2011
@@ -72,7 +72,7 @@ load_dictionary(char *dict, uLong * adle
while (!feof(fp)) {
if (fscanf(fp, "%s\n", dict + i) == 1) {
i = strlen(dict);
- strcat(dict + i, " ");
+ TSstrlcat(dict + i, " ", sizeof(dict) - i);
i++;
}
}
@@ -621,7 +621,7 @@ TSPluginInit(int argc, const char *argv[
{
dictId = adler32(0L, Z_NULL, 0);
if (argc == 2) {
- strcpy(preload_file, argv[1]);
+ TSstrlcpy(preload_file, argv[1], sizeof(preload_file));
preload = 1;
load_dictionary(dictionary, &dictId);
}
Modified: trafficserver/traffic/trunk/example/protocol/TxnSM.c
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/protocol/TxnSM.c?rev=1171456&r1=1171455&r2=1171456&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/protocol/TxnSM.c (original)
+++ trafficserver/traffic/trunk/example/protocol/TxnSM.c Fri Sep 16 08:58:35
2011
@@ -216,7 +216,7 @@ state_read_request_from_client(TSCont co
if (bytes_read > 0) {
temp_buf = (char *)
get_info_from_buffer(txn_sm->q_client_request_buffer_reader);
- strcat(txn_sm->q_client_request, temp_buf);
+ TSstrlcat(txn_sm->q_client_request, temp_buf, MAX_REQUEST_LENGTH + 1);
TSfree(temp_buf);
/* Check if the request is fully read, if so, do cache lookup. */
@@ -947,13 +947,13 @@ parse_request(char *request, char *serve
{
char *temp = strtok(request, " ");
if (temp != NULL)
- strcpy(server_name, temp);
+ TSstrlcpy(server_name, temp, MAX_SERVER_NAME_LENGTH + 1);
else
return 0;
temp = strtok(NULL, " ");
if (temp != NULL)
- strcpy(file_name, temp);
+ TSstrlcpy(file_name, temp, MAX_FILE_NAME_LENGTH + 1);
else
return 0;
Modified: trafficserver/traffic/trunk/example/query_remap/query_remap.c
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/query_remap/query_remap.c?rev=1171456&r1=1171455&r2=1171456&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/query_remap/query_remap.c (original)
+++ trafficserver/traffic/trunk/example/query_remap/query_remap.c Fri Sep 16
08:58:35 2011
@@ -129,9 +129,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh, T
char *s = NULL;
/* make a copy of the query, as it is read only */
- q = (char*) TSmalloc(req_query_len+1);
- strncpy(q, req_query, req_query_len);
- q[req_query_len] = '\0';
+ q = (char*) TSstrndup(req_query, req_query_len+1);
/* parse query parameters */
for (key = strtok_r(q, "&", &s); key != NULL;) {
Modified: trafficserver/traffic/trunk/example/redirect-1/redirect-1.c
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/redirect-1/redirect-1.c?rev=1171456&r1=1171455&r2=1171456&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/redirect-1/redirect-1.c (original)
+++ trafficserver/traffic/trunk/example/redirect-1/redirect-1.c Fri Sep 16
08:58:35 2011
@@ -411,8 +411,8 @@ TSPluginInit(int argc, const char *argv[
url_redirect = TSstrdup(argv[2]);
uri_len = strlen(prefix) + strlen(url_redirect) + 1;
uri_redirect = TSmalloc(uri_len);
- strcpy(uri_redirect, prefix);
- strcat(uri_redirect, url_redirect);
+ TSstrlcpy(uri_redirect, prefix, uri_len);
+ TSstrlcat(uri_redirect, url_redirect, uri_len);
} else {
TSError("Incorrect syntax in plugin.conf: correct usage is"
"redirect-1.so ip_deny url_redirect");
