svn commit: r1171764 - /trafficserver/traffic/trunk/cop/TrafficCop.cc

[igalic]

Author: igalic
Date: Fri Sep 16 20:36:59 2011
New Revision: 1171764

URL: http://svn.apache.org/viewvc?rev=1171764&view=rev
Log:
TS-953: consolidate string copy/concat for cop.

Modified:
    trafficserver/traffic/trunk/cop/TrafficCop.cc

Modified: trafficserver/traffic/trunk/cop/TrafficCop.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/cop/TrafficCop.cc?rev=1171764&r1=1171763&r2=1171764&view=diff
==============================================================================
--- trafficserver/traffic/trunk/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/cop/TrafficCop.cc Fri Sep 16 20:36:59 2011
@@ -547,7 +547,7 @@ read_config_string(const char *str, char
     p += 1;
   }
 
-  ink_strncpy(val, p, val_len);
+  ink_strlcpy(val, p, val_len);
   return;
 
 ConfigStrFatalError:
@@ -1038,7 +1038,7 @@ error:
 }
 
 static int
-read_manager_string(const char *variable, char *value)
+read_manager_string(const char *variable, char *value, size_t val_len)
 {
   char buffer[4096];
   char request[1024];
@@ -1086,8 +1086,7 @@ read_manager_string(const char *variable
     return -1;
   }
 
-  strncpy(value, p, e - p);
-  value[e - p] = '\0';
+  ink_strlcpy(value, p, val_len);
 
   return 0;
 }
@@ -1164,7 +1163,7 @@ test_rs_port()
   char buffer[4096];
   int err;
 
-  err = read_manager_string("proxy.config.manager_binary", buffer);
+  err = read_manager_string("proxy.config.manager_binary", buffer, 
sizeof(buffer));
   if (err < 0) {
     return err;
   }
@@ -1229,8 +1228,8 @@ test_http_port(int port, char *request, 
   }
 
   if (strncmp(p, "200", 3) != 0) {
-    char pstatus[4] = { '\0', '\0', '\0', '\0' };
-    strncpy(pstatus, p, 3);
+    char pstatus[4] = { 0 };
+    ink_strlcpy(pstatus, p, sizeof(pstatus));
     cop_log(COP_WARNING, "(http test) received non-200 status(%s)\n", pstatus);
     return -1;
   }