segfaultとmuslでコンパイルエラーの修正

diff --git a/main.c b/main.c
index 374c7ab61df65b2356d2a7360a1186873f40cd20..451fa0ac0406d7194030caad2b0f80fabae58cd8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -79,6 +79,19 @@ int main(int argc, char *argv[]) {
   }
 
   Config *cf = getconfig();
+  if (cf == NULL) {
+#if defined (_WIN32)
+    const char *cnfpath = "type nul > \\AppData\\Local\\076\\sp\\sp.conf";
+#elif defined (__HAIKU__)
+    const char *cnfpath = "touch /boot/home/config/settings/sp/sp.conf";
+#else
+    const char *cnfpath = "touch ~/config/sp.conf";
+#endif
+    printf("コンフィグファイルを見つけられません。"
+           "「%s」を実効して下さい。\n", cnfpath);
+    return -1;
+
+  }
   lang = getlang(cf);
 
   if (strcmp(argv[1], "-g") == 0) {

diff --git a/src/common.c b/src/common.c
index 7fe67c3299692c344dd63f26a42a748a57a0a7ac..89dbb180da45d351d68e8ea04fe4f74ca5e5e413 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -2,6 +2,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#if defined(__MUSL__)
+#include <ctype>
+#endif
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -13,6 +16,17 @@ int copyTimeFromCnf;
 int otpTimeFromCnf;
 Config *cnf;
 
+#if defined(__MUSL__)
+char *strcasestr(const char *haystack, const char *needle) {
+  size_t len = strlen(needle);
+  for (const char *p = haystack; *p; p++) {
+    if (strncasecmp(p, needle, len) == 0) return (char *)p;
+  }
+
+  return NULL;
+}
+#endif
+
 Config *getconfig() {
   const char *configpath = getconfigpath();
   if (!configpath) {
@@ -29,11 +43,11 @@ Config *getconfig() {
   cnf->passtimeout = 45;
   cnf->otptimeout = 30;
   strncpy(cnf->language, "ja", sizeof(cnf->language) - 1);
+  cnf->language[sizeof(cnf->language) - 1] = '\0';
 
   cnf->syncname[sizeof(cnf->syncname) - 1] = '\0';
   cnf->syncpass[sizeof(cnf->syncpass) - 1] = '\0';
   cnf->syncinstance[sizeof(cnf->syncinstance) - 1] = '\0';
-  cnf->language[sizeof(cnf->language) - 1] = '\0';
 
   FILE *fp = fopen(configpath, "r");
   if (!fp) {

diff --git a/src/common.h b/src/common.h
index 557f1c79cbbcdfe83376b099396a8113a97b54a1..46141f267c0c3fa3b8fb69797939686aac42d097 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -32,6 +32,7 @@ typedef struct {
   char language[3];
 } Config;
 
+char *strcasestr(const char *haystack, const char *needle);
 Config *getconfig();
 const char *getconfigpath();
 char *getbasedir(int trailing);