.

diff --git a/src/chkpass.c b/src/chkpass.c
index c4126790975cd3c5527954ef52e5aa6621579f71..4b3788b531b231a26d98f4238b6978db163bdc14 100644 (file)
--- a/src/chkpass.c
+++ b/src/chkpass.c
@@ -1,10 +1,7 @@
 // TODO:未完了
-#include <stdio.h>
 #include <dirent.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <stdlib.h>
 
+#include "common.h"
 #include "chkpass.h"
 #include "showpass.h"
 
@@ -13,13 +10,13 @@ struct PassList {
   char password[256];
 };
 
-void chkpass(char* basePath) {
-  char *lang = getenv("SP_LANG");
+void chkpass(char *basePath) {
+  char *lang = getlang();
 
   // パスワードを保存する
   struct PassList* allpass = malloc(2048 * sizeof(struct PassList));
   if (allpass == NULL) {
-    if (lang != NULL && strncmp(lang, "en", 2) == 0)
+    if (strncmp(lang, "en", 2) == 0)
       perror("Failed to allocating memory");
     else perror("メモリを役割に失敗");
     return;
@@ -28,7 +25,7 @@ void chkpass(char* basePath) {
   struct dirent* entry;
   DIR* dir = opendir(basePath);
   if (!dir) {
-    if (lang != NULL && strncmp(lang, "en", 2) == 0)
+    if (strncmp(lang, "en", 2) == 0)
       perror("Could not opening directory");
     else perror("ディレクトリを開けられません");
     free(allpass);
@@ -45,7 +42,7 @@ void chkpass(char* basePath) {
     char path[1000];
     int needed = snprintf(path, sizeof(path), "%s/%s", basePath, entry->d_name);
     if (needed >= (int)sizeof(path) || needed < 0) {
-      if (lang != NULL && strncmp(lang, "en", 2) == 0)
+      if (strncmp(lang, "en", 2) == 0)
         perror("Error: Path is too long, or failed to getting lenth");
       else perror("エラー：パスが長すぎる、又は長さを受取に失敗");
       continue;
@@ -53,7 +50,7 @@ void chkpass(char* basePath) {
 
     struct stat statbuf;
     if (stat(path, &statbuf) == -1) {
-      if (lang != NULL && strncmp(lang, "en", 2) == 0)
+      if (strncmp(lang, "en", 2) == 0)
         perror("Failed to reading file status");
       else perror("ファイル状況を読込に失敗");
       continue;
@@ -63,14 +60,14 @@ void chkpass(char* basePath) {
       continue;
     }
 
-    char* filename = entry->d_name;
-    char* ext = strstr(filename, ".gpg");
+    char *filename = entry->d_name;
+    char *ext = strstr(filename, ".gpg");
     if (ext) *ext = '\0';
     char spath[2048];
     snprintf(spath, sizeof(spath), "%s/%s", path, filename);
 
     if (i >= 2048) {
-      if (lang != NULL && strncmp(lang, "en", 2) == 0) perror("Too much password");
+      if (strncmp(lang, "en", 2) == 0) perror("Too much password");
       else perror("パスワードが多すぎる");
       break;
     }

diff --git a/src/chkpass.h b/src/chkpass.h
index 26d674b6f321255f71b16e1d5460e057bf56edc5..20ffc6aeb8d27c820520bd68b665f951242f8c3f 100644 (file)
--- a/src/chkpass.h
+++ b/src/chkpass.h
@@ -1,6 +1,6 @@
 #ifndef CHKPASS_H
 #define CHKPASS_H
 
-void chkpass(char* basePath);
+void chkpass(char *basePath);
 
 #endif