svn commit: r1171797 - in /trafficserver/traffic/trunk/lib/records: RecCompatibility.cc RecCore.cc

[igalic]

Author: igalic
Date: Fri Sep 16 21:28:48 2011
New Revision: 1171797

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

Modified:
    trafficserver/traffic/trunk/lib/records/RecCompatibility.cc
    trafficserver/traffic/trunk/lib/records/RecCore.cc

Modified: trafficserver/traffic/trunk/lib/records/RecCompatibility.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/records/RecCompatibility.cc?rev=1171797&r1=1171796&r2=1171797&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/records/RecCompatibility.cc (original)
+++ trafficserver/traffic/trunk/lib/records/RecCompatibility.cc Fri Sep 16 
21:28:48 2011
@@ -198,7 +198,7 @@ RecPipeCreate(const char *base_path, con
 
   memset(&servaddr, 0, sizeof(servaddr));
   servaddr.sun_family = AF_UNIX;
-  ink_strncpy(servaddr.sun_path, path, sizeof(servaddr.sun_path));
+  ink_strlcpy(servaddr.sun_path, path, sizeof(servaddr.sun_path));
 
   int optval = 1;
   if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, (char *) &optval, 
sizeof(int)) < 0) {
@@ -252,7 +252,7 @@ RecPipeConnect(const char *base_path, co
   // Setup Connection to LocalManager */
   memset((char *) &servaddr, 0, sizeof(servaddr));
   servaddr.sun_family = AF_UNIX;
-  ink_strncpy(servaddr.sun_path, path, sizeof(servaddr.sun_path));
+  ink_strlcpy(servaddr.sun_path, path, sizeof(servaddr.sun_path));
   servaddr_len = sizeof(servaddr.sun_family) + strlen(servaddr.sun_path);
 
   if ((sockfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {

Modified: trafficserver/traffic/trunk/lib/records/RecCore.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/records/RecCore.cc?rev=1171797&r1=1171796&r2=1171797&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/records/RecCore.cc (original)
+++ trafficserver/traffic/trunk/lib/records/RecCore.cc Fri Sep 16 21:28:48 2011
@@ -410,8 +410,7 @@ RecGetRecordString(const char *name, cha
       if (r->data.rec_string == NULL) {
         buf[0] = '\0';
       } else {
-        strncpy(buf, r->data.rec_string, buf_len - 1);
-        buf[buf_len - 1] = '\0';
+        ink_strlcpy(buf, r->data.rec_string, buf_len);
       }
     }
     rec_mutex_release(&(r->lock));
@@ -652,8 +651,7 @@ RecGetRecordDefaultDataString_Xmalloc(ch
       break;
     case RECD_STRING:
       if (r->data_default.rec_string) {
-        strncpy(*buf, r->data_default.rec_string, 1023);
-        buf[1023] = '\0';
+        ink_strlcpy(*buf, r->data_default.rec_string, 1024);
       } else {
         ats_free(*buf);
         *buf = NULL;