replace series of strcpy()/strcat() with snprintf()

1 files changed, 12 insertions, 16 deletions

diff --git a/menudriver.c b/menudriver.c
index 989a06a..9b2b07b 100644
--- a/menudriver.c
+++ b/menudriver.c
@@ -51,7 +51,7 @@ void singleton(char *);
 int subdir(void);
 
 char next[40] = "", cmd[80], last[40] = ".";
-int val, ok = 0;
+int val;
 
 #include <string.h>
 #define index(s,c) strchr(s,c)
@@ -133,9 +133,7 @@ void menudrive(char *dir)
 	bad = 0;
       }
 
-      strcpy(cmd, menuviewer);
-      strcat(cmd, " ");
-      strcat(cmd, "contents");
+      snprintf(cmd, sizeof(cmd), "%s contents", menuviewer);
       system(cmd);
       printf("::please type selection number (or return to exit):");
 
@@ -199,7 +197,8 @@ void menudrive(char *dir)
 	  strcpy(last, next), pushlast(), next[0] = '\0';
         }
 
-      } else if (S_ISREG(st.st_mode)) {	/* regular file */
+      } else if (S_ISREG(st.st_mode)) {
+        /* regular file */
 	clrscr();
 
 #ifndef UWIN
@@ -208,23 +207,21 @@ void menudrive(char *dir)
 	if (strcmp(next, "99") == 0)
 #endif
 	{
-	  strcpy(cmd, "./");
-	  strcat(cmd, next);
+          snprintf(cmd, sizeof(cmd), "./%s", next);
 	  system(cmd);
 	  if (fastback) {
 	    wait_for_return();
 	  }
 
 	} else {
-	  strcpy(cmd, viewer);
-	  strcat(cmd, " ");
-	  strcat(cmd, next);
+          snprintf(cmd, sizeof(cmd), "%s %s", viewer, next);
 	  system(cmd);
 	}
 
 	if (fastback) {
 	  strcpy(last, next);
 	  next[0] = '\0';
+
 	} else {
 	  printf("::next selection (or return to go back to menu, or q to quit):");
 	  /* read remainder of line into next, less leading white space */
@@ -311,16 +308,13 @@ void singleton(char *fil)
 
 #ifndef UWIN
     if (st.st_mode & S_IXUSR) {	/* executable (by owner) */
-      strcpy(cmd, "./");
-      strcat(cmd, fil);
+      snprintf(cmd, sizeof(cmd), "./%s", fil);
       system(cmd);
       fastback = 0;
     } else
 #endif
     {
-      strcpy(cmd, viewer);
-      strcat(cmd, " ");
-      strcat(cmd, fil);
+      snprintf(cmd, sizeof(cmd), "%s %s", viewer, fil);
       system(cmd);
     }
 
@@ -414,7 +408,9 @@ void pushlast(void)
   }
 
   /* suppressed 'cos interferes with special case in lastval() */
-  strcpy(lastp, last), lastp += n + 1, strcpy(last, ".");
+  strcpy(lastp, last);
+  lastp += n + 1;
+  strcpy(last, ".");
 }
 
 void poplast(void)