fix repl

git-svn-id: file:///raid/svn-main/nishi-serenade/trunk@114 0f02c867-ac3d-714e-8a88-971ba1f6efcf

diff --git a/Serenade/main.c b/Serenade/main.c
index 303ee8e99cb15c2e9b1c63f93238547e041eaef3..439ded5e41a150439ae17909700b7bd5378f473f 100644 (file)
--- a/Serenade/main.c
+++ b/Serenade/main.c
@@ -160,7 +160,7 @@ int main(int argc, char** argv) {
                                continue;
                        }
                        char* tmp = str;
-                       str = sn_strcat(tmp, line);
+                       str = sn_strcat3(tmp, line, "\n");
                        free(tmp);
                        if(br == 0) {
                                sn_eval(sn, str, strlen(str));
@@ -203,7 +203,7 @@ int main(int argc, char** argv) {
                        }
                        if(cbuf[0] != '\r' && cbuf[0] != '\n') {
                                char* tmp = str;
-                               str = sn_strcat(tmp, cbuf);
+                               str = sn_strcat3(tmp, cbuf, "\n");
                                free(tmp);
                        }
 #endif

diff --git a/Serenade/util.c b/Serenade/util.c
index 55693dee3e1277d9ff74f45e11816dc3a9190753..01a2811e841bc29bbd53f21921c5ceecf6605384 100644 (file)
--- a/Serenade/util.c
+++ b/Serenade/util.c
@@ -42,6 +42,13 @@ char* sn_strcat(const char* str1, const char* str2) {
        return str;
 }
 
+char* sn_strcat3(const char* str1, const char* str2, const char* str3) {
+       char* tmp = sn_strcat(str1, str2);
+       char* r = sn_strcat(tmp, str3);
+       free(tmp);
+       return r;
+}
+
 char* sn_strdup(const char* str1) {
        char* str = malloc(strlen(str1) + 1);
        memcpy(str, str1, strlen(str1));

diff --git a/Serenade/util.h b/Serenade/util.h
index 0247ed87287d80759074eb3eb64d62b23a0fbd0c..e9e6aee23b73d49119c67b648b638cfc8850dcca 100644 (file)
--- a/Serenade/util.h
+++ b/Serenade/util.h
@@ -36,6 +36,7 @@
 #include <stdio.h>
 
 char* sn_strcat(const char* str1, const char* str2);
+char* sn_strcat3(const char* str1, const char* str2, const char* str3);
 char* sn_strdup(const char* str1);
 void sn_print_to(FILE* f, struct sn_generic* gen);
 void sn_print_generic(struct sn_generic* gen);