4 files changed, 17 insertions, 11 deletions
diff --git a/tools/mirb/mirb.c b/tools/mirb/mirb.c
index d510f413b..502400c72 100644
--- a/tools/mirb/mirb.c
+++ b/tools/mirb/mirb.c
@@ -143,7 +143,9 @@ print_cmdline(int code_block_open)
 int
 main(void)
 {
-  char last_char, ruby_code[1024], last_code_line[1024];
+  char last_char;
+  char ruby_code[1024] = { 0 };
+  char last_code_line[1024] = { 0 };
   int char_index;
   mrbc_context *cxt;
   struct mrb_parser_state *parser;
@@ -163,8 +165,6 @@ main(void)
 
   cxt = mrbc_context_new(mrb);
   cxt->capture_errors = 1;
-  memset(ruby_code, 0, sizeof(*ruby_code));
-  memset(last_code_line, 0, sizeof(*last_code_line));
 
   while (TRUE) {
     print_cmdline(code_block_open);
@@ -197,8 +197,7 @@ main(void)
         strcat(ruby_code, last_code_line);
       }
       else {
-        memset(ruby_code, 0, sizeof(*ruby_code));
-        strcat(ruby_code, last_code_line);
+        strcpy(ruby_code, last_code_line);
       }
     }
 
@@ -238,8 +237,8 @@ main(void)
 	  p(mrb, result);
 	}
       }
-      memset(ruby_code, 0, sizeof(*ruby_code));
-      memset(ruby_code, 0, sizeof(*last_code_line));
+      ruby_code[0] = '\0';
+      last_code_line[0] = '\0';
       mrb_parser_free(parser);
     }
   }
diff --git a/tools/mrbc/mrbc.c b/tools/mrbc/mrbc.c
index 94675c391..5382b90a8 100644
--- a/tools/mrbc/mrbc.c
+++ b/tools/mrbc/mrbc.c
@@ -70,8 +70,9 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
   char *infile = NULL;
   char *outfile = NULL;
   char **origargv = argv;
+  static const struct _args args_zero = { 0 };
 
-  memset(args, 0, sizeof(*args));
+  *args = args_zero;
   args->ext = RITEBIN_EXT;
 
   for (argc--,argv++; argc > 0; argc--,argv++) {
diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c
index 2719bad01..444170270 100644
--- a/tools/mruby/mruby.c
+++ b/tools/mruby/mruby.c
@@ -57,8 +57,9 @@ static int
 parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
 {
   char **origargv = argv;
+  static const struct _args args_zero = { 0 };
 
-  memset(args, 0, sizeof(*args));
+  *args = args_zero;
 
   for (argc--,argv++; argc > 0; argc--,argv++) {
     char *item;
diff --git a/tools/xpcat/xpcat.c b/tools/xpcat/xpcat.c
index ce3d5854e..e39babcb5 100644
--- a/tools/xpcat/xpcat.c
+++ b/tools/xpcat/xpcat.c
@@ -26,8 +26,10 @@ main(int argc, char *argv[])
       i++;
       if (i < argc)
         output = argv[i];
-      else
+      else {
+        usage(argv[0]);
         return EXIT_FAILURE;
+      }
     }
   }
 
@@ -40,7 +42,10 @@ main(int argc, char *argv[])
     setbuf(outfile, NULL);
 
     for (i = 1; i < argc; i++) {
-      if (strcmp(argv[i], "-o") == 0) { i++; continue; }
+      if (strcmp(argv[i], "-o") == 0) {
+        i++;
+        continue;
+      }
 
       infile = fopen(argv[i], "rb");
       if (!infile) {