emclcd etc: fix overwriting errors into truncating ones

Author: jepler

src/emc/usr_intf/emclcd.cc

@@ -1705,9 +1705,9 @@ int main(int argc, char *argv[])
     while((opt = getopt_long(argc, argv, "p:d:a", longopts, NULL)) != -1) {
       switch(opt) {
         case 'a': autoStart = 1; break;
-        case 'd': strncpy(driver, optarg, strlen(optarg) + 1); break;
+        case 'd': snprintf(driver, sizeof(driver), "%s", optarg); break;
         case 'p': sscanf(optarg, "%d", &port); break;
-        case 's': strncpy(server, optarg, strlen(optarg) + 1); break;
+        case 's': snprintf(server, sizeof(server), "%s", optarg); break;
         case 'w': sscanf(optarg, "%f", &delay); break;
         }
       }

src/emc/usr_intf/emcrsh.cc

@@ -2939,12 +2939,12 @@ int main(int argc, char *argv[])
     while((opt = getopt_long(argc, argv, "he:n:p:s:w:d:", longopts, NULL)) != - 1) {
       switch(opt) {
         case 'h': usage(argv[0]); exit(1);
-        case 'e': strncpy(enablePWD, optarg, strlen(optarg) + 1); break;
-        case 'n': strncpy(serverName, optarg, strlen(optarg) + 1); break;
+        case 'e': snprintf(enablePWD, sizeof(defaultPath), "%s", optarg); break;
+        case 'n': snprintf(serverName, sizeof(defaultPath), "%s", optarg); break;
         case 'p': sscanf(optarg, "%d", &port); break;
         case 's': sscanf(optarg, "%d", &maxSessions); break;
-        case 'w': strncpy(pwd, optarg, strlen(optarg) + 1); break;
-        case 'd': strncpy(defaultPath, optarg, strlen(optarg) + 1);
+        case 'w': snprintf(pwd, sizeof(pwd), "%s", optarg); break;
+        case 'd': snprintf(defaultPath, sizeof(defaultPath), "%s", optarg); break;
         }
       }
 

src/emc/usr_intf/schedrmt.cc

@@ -1254,12 +1254,12 @@ int main(int argc, char *argv[])
     // process local command line args
     while((opt = getopt_long(argc, argv, "e:n:p:s:w:", longopts, NULL)) != -1) {
       switch(opt) {
-        case 'e': strncpy(enablePWD, optarg, strlen(optarg) + 1); break;
-        case 'n': strncpy(serverName, optarg, strlen(optarg) + 1); break;
+        case 'e': snprintf(enablePWD, sizeof(defaultPath), "%s", optarg); break;
+        case 'n': snprintf(serverName, sizeof(defaultPath), "%s", optarg); break;
         case 'p': sscanf(optarg, "%d", &port); break;
         case 's': sscanf(optarg, "%d", &maxSessions); break;
-        case 'w': strncpy(pwd, optarg, strlen(optarg) + 1); break;
-        case 'd': strncpy(defaultPath, optarg, strlen(optarg) + 1);
+        case 'w': snprintf(pwd, sizeof(pwd), "%s", optarg); break;
+        case 'd': snprintf(defaultPath, sizeof(defaultPath), "%s", optarg); break;
         }
       }