patch-Wnn_uum_key_bind_c 914 B

123456789101112131415161718192021222324252627282930
  1. $OpenBSD: patch-Wnn_uum_key_bind_c,v 1.2 2017/04/29 14:31:40 espie Exp $
  2. --- Wnn/uum/key_bind.c.orig
  3. +++ Wnn/uum/key_bind.c
  4. @@ -62,6 +62,8 @@
  5. */
  6. #include <stdio.h>
  7. +#include <string.h>
  8. +#include <stdlib.h>
  9. #include "commonhd.h"
  10. #include "config.h"
  11. #include "sdefine.h"
  12. @@ -265,11 +267,11 @@ init_key_table()
  13. /* uumrc¥Õ¥¡¥¤¥ë¤«¤é¡£*/
  14. if (uumkey_name_in_uumrc[0] != '\0') {
  15. - strcpy(file_name, uumkey_name_in_uumrc);
  16. - }else if(strcpy(file_name, LIBDIR),
  17. - strcat(file_name, "/"),
  18. - strcat(file_name, lang_dir),
  19. - strcat(file_name, CPFILE),
  20. + strlcpy(file_name, uumkey_name_in_uumrc, sizeof file_name);
  21. + }else if(strlcpy(file_name, LIBDIR, sizeof file_name),
  22. + strlcat(file_name, "/", sizeof file_name),
  23. + strlcat(file_name, lang_dir, sizeof file_name),
  24. + strlcat(file_name, CPFILE, sizeof file_name),
  25. (fp = fopen(file_name , "r")) != NULL){
  26. /* default */
  27. fclose(fp);