From dfade80c2fe2185948e3bb5626e9b1aa92d5bf11 Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Wed, 27 Feb 2019 16:58:38 +0900
Subject: [PATCH] =?utf8?q?MacOSX=E3=81=AE=E5=8B=95=E4=BD=9C=E3=81=AB?=
 =?utf8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=81=9F=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/monitor.c                                |   2 +-
 src/struct.c                                 |   2 +-
 test/system/comet2_smoke/direct/create_a     | Bin 16888 -> 16840 bytes
 test/system/comet2_smoke/direct/create_a.c   |   1 -
 test/system/comet2monitor/break_help/0.txt   |   2 +-
 test/system/comet2monitor/break_help_2/0.txt |   3 ++-
 test/system/comet2monitor/dump_0/0.txt       |   2 +-
 test/system/comet2monitor/dump_1/0.txt       |   2 +-
 test/system/comet2monitor/dump_2/0.txt       |   2 +-
 test/system/comet2monitor/dump_3/0.txt       |   3 ++-
 test/system/comet2monitor/dump_plus/0.txt    |   2 +-
 test/system/comet2monitor/help/0.txt         |   2 +-
 test/system/comet2monitor/load/0.txt         |   2 +-
 test/system/comet2monitor/revert_hello/0.txt |   2 +-
 14 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/monitor.c b/src/monitor.c
index 4fc26e7..d923771 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -396,11 +396,11 @@ void monitor()
         fprintf(stdout, "%s ", monitor_prompt);
         buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
         fgets(buf, MONINSIZE, stdin);
-        fprintf(stdout, "%s", buf);
         if(!buf[0]) {
             cmdtype = MONQUIT;
         }
         strip_end(buf);        /* 文字列末尾の改行と空白を削除 */
+        fprintf(stdout, "%s\n", buf);
         if((moncmdl = monlinetok(buf)) != NULL) {
             cmdtype = monitorcmd(moncmdl->cmd, moncmdl->args);
             free_moncmdline(moncmdl);
diff --git a/src/struct.c b/src/struct.c
index bb482f8..1058567 100644
--- a/src/struct.c
+++ b/src/struct.c
@@ -70,7 +70,7 @@ enum {
 /**
  * ハッシュ表
  */
-static CMDTAB *cmdtab[HASH_MAX][CMDTABSIZE] = {NULL};
+static CMDTAB *cmdtab[HASH_MAX][CMDTABSIZE] = {{NULL}};
 
 /**
  * 命令の名前とタイプからハッシュ値を生成する
diff --git a/test/system/comet2_smoke/direct/create_a b/test/system/comet2_smoke/direct/create_a
index 5cf95fd78196edd4a6e18dc8e2e780f0f9919294..d3bf02304bf822861f666f369abce167fdccf32a 100755
GIT binary patch
delta 1457
zcmZ8hUuauZ7(eHxH_2_A_TI$oCfb?X4!h0L+@x8Wbu>$&mR(`Pl`Yta+6LE6VMxnb
z=!0V^nPTmNNk5cLQ0kK}gR$kMdr(?8v;!X+K^EUuu+V{n)=lk$di~D*Q@S3w=XZX;
z@6Y-7ox4?}%SBoaNM(^2Eo}n%xN`6t;i}VQS1Z4&jcc4q);RFev%;7~r>fKR0)3`4
zH5I9?EWYM?{j=P1bK<+r$B(}Nx8pFq0MP~+#vB^`)EKQeM(9^Kx&q%fybb&KZs{$|
z%VwW^_C0|Rj+}!$FAo$XbGnVBiEa}}#L`cupVn<&PnkMfI)!g}IoMzdM!&wp%EKeH
zHtw))?XWh%UZ+esh&xs4gi+_IYMbv}VNNW=ytpUZiM!WIo*R@wvW7Wye}_uQlQPl@
z4zv>g34^|^3BNYW{};ybhl>+}{-8BfU{l_)5dHIpfBX$-lG^Ama6o$g#l0wz$yin^
zCU0RV(Pq{rJlbrM<<b4~*ss5%>-rD;6Bv^w#jY0SGVnl~#jg}s;7=*rxxl8;W>0LL
z(PGUn96&O`uRr=%*YDjq8*U9<W@b``f;S+a?;<3tmAV<8I(~3XEB@|2xBh<hhIh~d
zibI)Gl;GtJT|bTy7dLhN3gYQMbp1NwUFcKx(+K31=ja$*RQ9z$M9-hlLNYDlN8HOE
zC--Bs3-9k0ls>?39+s424a=AZ@=;$^@!e|{?CXxeX17Y~&>kM98cc^nbOF8&r)U{g
z!y(CS6{L%0$EJa#rf2{L)et2xuHMH2GTTYWMebvUXjDc^KI(V4NdQqsjj=}JhD!7p
z=3PS8Lh7&?W&SsN{Eh$_g4Ld3x(Jz=9Ne&8hMk!mBu6|X0^>264#7-JrG@J4n2XXC
zSUTi`_8wmknZwFZh)lG!9cSVZ)J4>XcIg?2#zRuw`?Pl!YKLSx&ib~p6}da(m#DKj
zFOlmwk~o>zPr=T0o9U#LEy!s0gIGr0i#r*yW*xNx?jnjLKt|G*V8Q2>zx}UZHOg8Y
zb&+)8v84^Z-Th_-%vf*MC<?SbG`97R(TgzMs|I`VJ+Y<l&hQef_R9R5XzhRu=c7MY
zr9_;%hF?8>V))D`O!w`nP983D)xVB(P^v(%UzId#dp0gW4pqWitFkZv*ZNf<u+3`y
z2|=?MR#h^wU2AsDl_8hBgcZKz@Ifir1b-)`?Z2jdA_EXSstWck)~ka@T^tsb6!XFP
tbemvbod%V3La_Hb1hsSu3rWhPgmT1O<`m>I3BjGP*|ki97NC~d|34NkDS!X~

delta 1576
zcmZ8hUuauZ7(eGGH|d>8mzx@H+m$3$#u~?Ro5m)YOO_jE*>zNDt%dm@&2(K`7(%th
zJt)hJinRuleM9s?Shq6!APk$AAxu~N(+w56r?%6F7FI}Q%y!6#%yIor?zwgLz&*e7
z{l0(aJLkLSdY)GEwAd)0_mJAqOdwZEp)aKchbb+Tmen1i%@jl%c<Bl0lwgXv@)`Oj
zef-1allt`WOYarFIdbvd^zTEZ&|`l>oh?CMfl-@6PeH~uK+nOH?Jar{*9x@T$L%NH
z7#xIY`v4VyimLo7Mr7L<Zyu2d5y(l%h)P#cHWO{6Osq43Xq-Q){hznwrL@Vj8U*-4
zRNxoU<*q!!I^b7i|3S9;2<w7}qCzS794fU#m!r?E^9)Xmw4+>d9FWd>if&`~tV+l*
z3%{O&f~ToJhDV|o+}}|Kshg-Ud|tHqtBB$RF7$%<E`$BmF`qsu-VNjW{cB^Av9dFe
zLv!*yN3?&rX5aZDJn*#8AE8n9KjlM;j7R(ReCh(a5`AKA%&kwR?xSG%ia1wZGYsP=
z@eX9=anG)LX418yPvTeT^uU_jA46eDpO~-QdT1E>eAg1odWB8;<nz_zdepVM4TUkW
zvWx~dto=aN+o*K!C8S?3>|@y19a_`#cj|^JFO)y=_PWmogH7i)45J&J3!8@VF$;3f
zFup>(4f}(8s0PP^yJ!yH2|n5SH(IWshGgnJ9|(us4&gVK6Yup|q~6Bw8q5U`+bb9c
zGLeSah8r%)>H-Zm_o=iBt>FQhg)`v*y$Vy|G@XIfa6oS34a;tdjbV`0G)+LS8lZj{
zRTt$?d7qnlLXJXj`(jhpZpr_ljW~%P^DF3|iTG?1MjJ(`4JIOo>3O(`>nf~A7HJR6
zbtt%-xeg!P?Ktw>!nPbf3@Q*eA-rR)9PFeSZ*{W8AH)SEjRfn9s<c@CI_jkIhSyY!
z+{zDfry{gdFe1JVGL1bKBns)#xSB&Z@*d=~+xR~84#-s=)AAW&F=?L7%@?@m_K25j
z8BddMQ7;P$v3@rz#?Oo=JK1(>!#dep$a}Ha9M3t(9ezOcV6np*CpgS-d+T9hz0bxU
z$a~0MJRPkjZ%y~P!{_{zSGeXut*Ck^#S|#U8tKz))uiLU%C^5f%1ba8Q^eO%`vhc!
z270@^8SA7D_EKpYT(*bGhZ1?AeEpdq#lBcSpvqS7Sa=mSI~pLFY?1x^t}JYZk)$dm
zIGcc}WLz5N(lD$h<6He}_3;dZQm5;3yb|b5DKMXsw;pTjZ2Dn6rApRqR?DpiodR~{
zY83aOwMf<#_P{YME?E_4VM<G5*RE=5>9ck-MG-=oxYQOmrH^1F6Q{E<mD%$zUEo5x

diff --git a/test/system/comet2_smoke/direct/create_a.c b/test/system/comet2_smoke/direct/create_a.c
index 021e430..43c9b99 100644
--- a/test/system/comet2_smoke/direct/create_a.c
+++ b/test/system/comet2_smoke/direct/create_a.c
@@ -18,6 +18,5 @@ int main()
     }
     fwrite(w, sizeof(WORD), ARRAYSIZE(w), fp);
     fclose(fp);
-    FREE(fp);
     return 0;
 }
diff --git a/test/system/comet2monitor/break_help/0.txt b/test/system/comet2monitor/break_help/0.txt
index c600c86..69132ee 100644
--- a/test/system/comet2monitor/break_help/0.txt
+++ b/test/system/comet2monitor/break_help/0.txt
@@ -5,4 +5,4 @@ breakpoint manipulate:
     b[reak] d[el] <address>
     b[reak] l[ist]
     b[reak] r[eset]
-(comet2 monitor) 
\ No newline at end of file
+(comet2 monitor) 
diff --git a/test/system/comet2monitor/break_help_2/0.txt b/test/system/comet2monitor/break_help_2/0.txt
index a4c6974..61ebc52 100644
--- a/test/system/comet2monitor/break_help_2/0.txt
+++ b/test/system/comet2monitor/break_help_2/0.txt
@@ -5,4 +5,5 @@ breakpoint manipulate:
     b[reak] d[el] <address>
     b[reak] l[ist]
     b[reak] r[eset]
-(comet2 monitor) 1: ignored.
+(comet2 monitor) 
+1: ignored.
diff --git a/test/system/comet2monitor/dump_0/0.txt b/test/system/comet2monitor/dump_0/0.txt
index 0e8b09b..8bdd4d6 100644
--- a/test/system/comet2monitor/dump_0/0.txt
+++ b/test/system/comet2monitor/dump_0/0.txt
@@ -7,4 +7,4 @@ COMET II machine code monitor. Type ? for help.
 #0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
 #0000: 0020: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
 #0000: 0030: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-(comet2 monitor) 
\ No newline at end of file
+(comet2 monitor) 
diff --git a/test/system/comet2monitor/dump_1/0.txt b/test/system/comet2monitor/dump_1/0.txt
index dcc5141..f5ac5ab 100644
--- a/test/system/comet2monitor/dump_1/0.txt
+++ b/test/system/comet2monitor/dump_1/0.txt
@@ -7,4 +7,4 @@ COMET II machine code monitor. Type ? for help.
 #0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
 #0000: 0020: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
 #0000: 0030: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-(comet2 monitor) 
\ No newline at end of file
+(comet2 monitor) 
diff --git a/test/system/comet2monitor/dump_2/0.txt b/test/system/comet2monitor/dump_2/0.txt
index f805a00..bc88ef4 100644
--- a/test/system/comet2monitor/dump_2/0.txt
+++ b/test/system/comet2monitor/dump_2/0.txt
@@ -5,4 +5,4 @@ COMET II machine code monitor. Type ? for help.
        -------------------------------------------------------------------------------------
 #0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
 #0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
-(comet2 monitor) 
\ No newline at end of file
+(comet2 monitor) 
diff --git a/test/system/comet2monitor/dump_3/0.txt b/test/system/comet2monitor/dump_3/0.txt
index 4e9d74a..ee76e21 100644
--- a/test/system/comet2monitor/dump_3/0.txt
+++ b/test/system/comet2monitor/dump_3/0.txt
@@ -5,4 +5,5 @@ COMET II machine code monitor. Type ? for help.
        -------------------------------------------------------------------------------------
 #0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
 #0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
-(comet2 monitor) #40: ignored.
+(comet2 monitor) 
+#40: ignored.
diff --git a/test/system/comet2monitor/dump_plus/0.txt b/test/system/comet2monitor/dump_plus/0.txt
index 5a86a4c..79bdbf8 100644
--- a/test/system/comet2monitor/dump_plus/0.txt
+++ b/test/system/comet2monitor/dump_plus/0.txt
@@ -5,4 +5,4 @@ COMET II machine code monitor. Type ? for help.
        -------------------------------------------------------------------------------------
 #0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
 #0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
-(comet2 monitor) 
\ No newline at end of file
+(comet2 monitor) 
diff --git a/test/system/comet2monitor/help/0.txt b/test/system/comet2monitor/help/0.txt
index cae706c..ed17f9f 100644
--- a/test/system/comet2monitor/help/0.txt
+++ b/test/system/comet2monitor/help/0.txt
@@ -12,4 +12,4 @@ s[ave] -- Save object from the memory to a file. `s[ave] <filepath> [<start addr
 t[race] -- Display CPU register. `t[race] a[uto]/n[oauto]' set auto/noauto display. 
 T[race] -- Display CPU register as logical value. `t[race] a[uto]/n[oauto]' set auto/noauto display. 
 ?/h[elp] -- Display this help.
-(comet2 monitor) 
\ No newline at end of file
+(comet2 monitor) 
diff --git a/test/system/comet2monitor/load/0.txt b/test/system/comet2monitor/load/0.txt
index 0e8b09b..8bdd4d6 100644
--- a/test/system/comet2monitor/load/0.txt
+++ b/test/system/comet2monitor/load/0.txt
@@ -7,4 +7,4 @@ COMET II machine code monitor. Type ? for help.
 #0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
 #0000: 0020: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
 #0000: 0030: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-(comet2 monitor) 
\ No newline at end of file
+(comet2 monitor) 
diff --git a/test/system/comet2monitor/revert_hello/0.txt b/test/system/comet2monitor/revert_hello/0.txt
index 1630519..816b096 100644
--- a/test/system/comet2monitor/revert_hello/0.txt
+++ b/test/system/comet2monitor/revert_hello/0.txt
@@ -34,4 +34,4 @@ COMET II machine code monitor. Type ? for help.
         DC      13              ; #0020: #000D ::    13 = #000D = 0000000000001101
         DC      10              ; #0021: #000A ::    10 = #000A = 0000000000001010 = '\n'
         DC      1               ; #0022: #0001 ::     1 = #0001 = 0000000000000001
-(comet2 monitor) 
\ No newline at end of file
+(comet2 monitor) 
-- 
2.18.0