From 8dc794aaf439ad1285c89e95079ba54c2176b87a Mon Sep 17 00:00:00 2001
From: sand621 <sand621@naver.com>
Date: Thu, 25 May 2017 17:58:30 +0900
Subject: [PATCH 1/2] init

---
 calc.c      |  20 +++++++++++++-------
 calc.o      | Bin 6608 -> 6872 bytes
 operators.c |   4 ++--
 operators.h |   2 +-
 operators.o | Bin 3288 -> 3336 bytes
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/calc.c b/calc.c
index 85f1466..754349b 100644
--- a/calc.c
+++ b/calc.c
@@ -5,28 +5,34 @@ int main(){
 	FILE *fp = NULL;
 	int operand1, operand2;
 	char operator = ' ';
-	int result, line = 0;
+	double result = 0;
+	int line=0;
+	int (*sp1) (int,int)=add;
+	int (*sp2) (int,int)=minus;
+	int (*sp3) (int,int)=mul;
+	double (*sp4) (int,int)=div;
 
 	fp = fopen("read.txt","r");
 	if(fp!=NULL){
 		fscanf(fp, "%d", &line);
 	
-		for(int i=0; i<line; i++) {
+		for(int i=0; i<line-1; i++) {
 			fscanf(fp, "%d %c %d",&operand1, &operator, &operand2);
 			switch(operator) {
 				case '+':
-				result = add(operand1, operator);
+				result = sp1(operand1, operand2);
 				break;
 				case '-':
-				result = minus(operand1, operator);
+				result = sp2(operand1, operand2);
 				break;
 				case '*':
-				result = mul(operand1, operator);
+				result = sp3(operand1, operand2);
+				break;
 				case '/':
-				result = div(operand1, operator);
+				result = sp4(operand1, operand2);
 				break;
 			}		
-			printf("%d %c %d = %d\n",
+			printf("%d %c %d = %lf\n",
 				 operand1, operator, operand2, result);
 		}
 	}
diff --git a/calc.o b/calc.o
index e2bf1e76837b7b2d99d8b1515a8dafe76381699c..315f139fd47d0f1fe98249b8aa270e3c10ebdc2a 100644
GIT binary patch
delta 2425
zcmZvde{54#6vyv<UAwkhf358vg_se|*epUF0~?|a5Grpb3!o6t7)x1OsdQbpwx9-l
zkRnhU0_B7R6%^thF6cxok;M_Lf$+l+Dbd6Q6N7=o!AxLa;xypA_w~F5p4{x+bI<p4
z&gr@LwRh##p*g#og?;XV_Yrw@Sjty5HWNamTwtuFB%KYEnM2M5j!%u+ZkBG_9D#FZ
z10}98HiY&H+F`V}xIM|IZ~0V_bAhsy-Bc#Ftxc3=?_5!m@`17vCFRZz@W8@>>dB}1
z;`(hiNjozqq@5kdS?B-{Eu5SrAGe(>Wyhwcr?5#jXUDwhCD*eoHaj*WJuN%tO9w|b
z<U3B}m5ia>54oSm%az8xmF7oQP2ejJ!*eI_@I$aXGI@gELN3|fDY4T!x0?~$*8$dH
zIUisRXU<8vOy6yrJ<yjsqnyJ4+jr$KvVqeyA1Gyq>C=JJwq4`@j*lw`AmulWg{9VK
zlvj|}D+hP}R4?g`gu*k^Z>FK2di3$AnH+%c=~P-Qj!;>Ui@YuybbnAsh&7rdRL@sJ
zVZKe#4QrUu75d}{+|SXi-mB10(KSX`s;)4AuBnpyrEE<lTL?98RtihZn?-01_hg~4
zl)0^h)>hyu=FKM5@_`b%+Rl66!-9QUV}v>@Wsk{(7>xTF)ETRIjDzdEOdVe+6AOql
z!NL3DB_AN$bOdfz{b+Z%X_KejNu7-ANxKtD`YA$@Lcvu}@4%n>!8wIYHk;jQ^z|F}
z3<`}-p~+<&d=me%M5q!T<&!QcOs8x?4KEmUu50kCq0tcT&a8<?K&akPJXXD)&h)MA
z?uz(Qp+xwpSuMVm-M#Bl$xvs+7Z0szneBTi)|HG$7KY-TnRqDO-3yPKwo?K}OpQ+E
zMJ=$}w+Ra^2Hh95w%W)V^n7KOC@n&JO#^knvKo<!d<MI_3YOQnXoI3PD%zErXXQ{h
zOuAx;Op0`6;v^hfPomw)NP+}|u~c{G+_}MMsxy>`l4Nfzk&ZGsl@4{T3wEwu7mS8t
zaem5vKCw~59_2fsc!bPD%k_!Z#@37P(;FS=aI@q-P<Nlc9746C{4y$LX7%h5(0>gr
z_t^_0cgHK^ZPe9x-Uc7rD@Mt8v9%ii8R}}h6@BHmM2Po)2^;Vms3wS*um!eQMA{GU
zTjqJ*!x(j&JeEI27`2GPV*;41&%=D15ms64@?{Ku4hyNlSJ7|R=!-CZsYbtt{z{EL
zioSYcYW>!V4!>I+o^LRwN0VCx4x8xt2R|{Vp^IPvqbrdf&`^LLMlYj!Ohe;vh*3Z0
zUeM4F;S!^(@nv7r&<3D(u|?g_T@C#MYZ}q2`+XPM?LN;YtT{tNolvlgo@rQXv4-w}
z?-;Gc+>nOmVbm_t7s2H4c}`)4y_%Q=EOUq+H>yW8v>&!G+JU*}HS~2j%4h=Bs~Vbt
z-x%G9>OBq3f}>9Kyn>yJXw@^B2@4qAhw2j=YK9(0)!i=A(4XKCqZhH~T^jl-T&nZQ
zDWn%PbR+7&X!I4R-_Yo_sQ<0e`%s_H?sPu*=6Oh-JM0=KYZ0g$ZYaLx+`w<jQI}s>
zY5}jiO}L|6@vzz5tS(FLX44%!$R-$d`%RPagAYMVz29^YZ;4^(VcsCWm)N)lN9+B<
z#|F4j-zMyEfmduZT{KkKU(h4^g#i~FX5yLZiuehPGBIWb@1!>2BQyU;1Dhu`3kS_`
fm?>o!++b#yRr0h6LuPox(`F);N^S@AxEuZhGMv}1

delta 2134
zcmZuxe@q)y9DjF|(yOJ{?pTl8vVdAPWW&-;#z?dT=HX4pvc;LX#f_B~T;)e8v@>e7
zYL}5(2-L5O{xNlA$^Kh}Va(zZWHAAai>by;4bwnG#ehkfQHz<u_wL?p?Btu?_j}*Z
z=kxu(_rATn@2WF9hRWHYqIAWklB%GRGL@Ahgp{P5^G+yJauz3OQl2iIlIPNcu6R~S
zyqrb+Da2sWz*BQdO3scGjgp+YOyWFoQ}QASzkP|FG7y_l2AZa^`UX+&Nv=`Ae<V-y
z;}eP8)@U(y@q$FIBI;WRC32O~l0?oERThpCO`IRkq~sgP>&Yo~p`<*&AZx|{!z<Uu
z*G7j@O*40xRBXOJnN3c9LQZk#SP6OKB9oHmYUM?~fAh-9ib^S|rd&|jVS}F;uPJCn
zZrI3{GJ&y&**F^y;5iXv&fc4ckiD%NG5O?;O&{k~+}wf#o8Eg@wqMH%&ZyiIT4vFd
zPv4atbdWB@e$fK5hY(}eq|cyyWVW0|a5?`Qc+V^`0f@Ln=6A@LuXs*cJQpo*USZ1w
z)?H*dTt$9IEQb+mV(%j^FT%PR{KA+YH|Gf-!$d(DEEe=V;5iZQZ1p@B4tMpohTA=d
z!aeQ1-TpwU=gClKcSq}Pe@7tJ;g5!U#(FHzGf-?j4d<+GK^;WB-Eo@TU1-ib#@Grh
zFuYzG%UTr%@2l2U!U#}r6Pf!}zeV+xs`nBP8QUXJQs{cn9}J?-P*<!Mb;deSFmw`i
z_k_BlZK%1qH|h_xHwR9%H@Epi9b_I`VYE<;SJBZ}am>dLOY>?PNlvDE3;(6W4p3az
z-$V0bG!i|TyRLto;=0~W^Fb{(s0*$xn4|*I$cZ1l(T}U}b*u2dV75^7+UU1Ls)|;z
z6%^N(7ipJ=AYvDpqmZ=MNf)VxtVWDz$#WfM?IL>t!9Vs!W+&A1V*Fn!Z6G>qy3|bZ
zJsNx)f0p9=4R|TV4;k<xitE$V`)|{9@Gb9@exNlGL+ut|93r=gOaNOFyu1jz91iJ4
z+VfqFxV^VN@H<2}$6K5q8kkl{J4ERSt-EGm--4@{JxJG?Gq4S?<Pg33xo#O)o>p0C
zZ~c6)K&{gwMJQWoV0Xf6PEjhMy&f~LDHz49ht~QHY#e5tBGU-VxW9f4oH1xxpnjbw
z?V{)h1~vl`%r?^1KR2*%z%XXh6#dD-z5`!j_I--#Uypw33&04Xw2$swq)}%NfETm<
z6y0WEE5VQ1Q?&D=2KH}AWA-N9^Pqu^!&Si(S1$pq_`<-(Xw~-yd>_SsHQ+Xi|7pO7
zDV~R~bYf(yMAAYMgvR=cBII^kUSGo=x50Lok2#O8;5zI_U3J`fda}(hYZbsIx;cIF
z<xnfua3h6Un+&{wvn7+3eXXjmVfClvGQ(D-)fc<jR|VK!?Bo8R#F9$%V`4;rOPH85
zYZY(9a&Zm!5~pR=s%)=>WgNbgU68e!pkGTbNj~;70d7h@Zbs1LBbt1Jo1N#NXM>M(
M(D5{B`*7L*15rq*qW}N^

diff --git a/operators.c b/operators.c
index d51cb3e..d39d0db 100644
--- a/operators.c
+++ b/operators.c
@@ -10,7 +10,7 @@ int mul(int op1, int op2) {
 	return op1*op2;
 }
 
-int div(int op1, int op2) {
-	return op1%op2;
+double div(int op1, int op2) {
+	return (double)op1/op2;
 }
 
diff --git a/operators.h b/operators.h
index bd08f7d..e16bf60 100644
--- a/operators.h
+++ b/operators.h
@@ -1,4 +1,4 @@
 int add(int op1, int op2);
 int mul(int op1, int op2);
-int div(int op1, int op2);
+double div(int op1, int op2);
 int minus(int op1, int op2);
diff --git a/operators.o b/operators.o
index 71b996c467c636eea2a5466488a72a5e4c372d7d..9ce07fd3a544f18c8449939dcd00d4c9c830ab7b 100644
GIT binary patch
delta 446
zcmca1*&#JSgVAH6W|U+a|N8@<__bXB02wEN4BsE0_~Q=79yXZRufP~Ral;u!rj*Pw
z21Z^TMg}-gg0dLrfJ7(HWRzuN<6r>_PTtCxp`yaT&27ic%m?J_05KC-F$b805z&(s
zIm8)VCucA@GI2ysUd0ruoRVLfl#|M!pOK%Ns$ZO#mttmQs2`qRlwDkqn4GGglbB>V
zS(aIjH8(S_w0N==vl-Cb$@$E!f?&ru@(HvtIrFl`^00FN&6eJ*z*51;s5E&dYdT}=
zWJWe|#_-9KZ1Ic}Cs(rh3+hAt!Uc2>ClCj0KFGG6kuiF*AdB$i9u5`8*^@VN*aOLr
z9QK^Ep^i40Y{_ZPd4m<gRhV1}<ei5aR0!62hEs*nVe&^#`^g))I3`<gS#TCWJkQ_>
zF_}w+NrQdzCN4Y9oluGCU<n>>6~=(chTQf*w-y4)j>#K=B+w`zxnQy(k3FNp<U%01
JWAa8GbpYrlWt;#2

delta 383
zcmeB>x*<71gHd9lW)x4i>z|q5YkzcJh&`-2agG9`-^9IVWZ6<O%NQ7Wvl$RT6v||r
zGkF!G?BsKd>Ee2f_L9sTR@~Oy>XM$qf{a4!4ieLyBq!T4Ni+IQR%8)pbeUYp<j6R2
z@)o90x!laW(qabvjQreG{jB`_yyDdSZ2j>3qU_>=#N^b;I?QsD1DH)GcQCgIg6(qT
z6KG>{=4A`uVdt0}$RWMif~A6yQFQV~)^y1RsAFJ`;sWwHfjDfkAzM6Sz~qT+{+oZW
zZD0gCV<m?<W8dV59QHs`k<*^D52{sjawexa=K)p-mt*ouAa6S(gx4_nC8s%~`D8^d
zd&U!!6S?d;)0rSL9+OvcnNLpO;+Xt`%Yt(~RJ3QZCbv1G_2fiud&Yvv3&G?=ASp0e
Vkq0D_2qZZsF9ebcCO_m+2LQ(rT$lg=


From 5144c4944e8f44b714177d050b4de8dce57d4456 Mon Sep 17 00:00:00 2001
From: sand621 <sand621@naver.com>
Date: Thu, 25 May 2017 21:04:26 +0900
Subject: [PATCH 2/2] lab14

---
 calc.c      |  6 +++---
 my_fscanf.c | 38 ++++++++++++++++++++++++++++++++++++++
 my_fscanf.h |  7 +++++++
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 my_fscanf.c
 create mode 100644 my_fscanf.h

diff --git a/calc.c b/calc.c
index 754349b..2a46f55 100644
--- a/calc.c
+++ b/calc.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include "operators.h"
-
+#include "my_fscanf.h"
 int main(){
 	FILE *fp = NULL;
 	int operand1, operand2;
@@ -14,10 +14,10 @@ int main(){
 
 	fp = fopen("read.txt","r");
 	if(fp!=NULL){
-		fscanf(fp, "%d", &line);
+		my_fscanf(fp, "%d", &line);
 	
 		for(int i=0; i<line-1; i++) {
-			fscanf(fp, "%d %c %d",&operand1, &operator, &operand2);
+			my_fscanf(fp, "%d %c %d",&operand1, &operator, &operand2);
 			switch(operator) {
 				case '+':
 				result = sp1(operand1, operand2);
diff --git a/my_fscanf.c b/my_fscanf.c
new file mode 100644
index 0000000..59e41b3
--- /dev/null
+++ b/my_fscanf.c
@@ -0,0 +1,38 @@
+#include "my_fscanf.h"
+#include <stdarg.h>
+#include <ctype.h>
+void my_fscanf(FILE *fp, const char *format, ...){
+	va_list list;
+	int*d;
+	char *dc;
+	int c;
+	va_start(list,format);
+	while(*format){
+		if(*format == '%'){
+			format++;
+			switch(*format){
+			case 'd':
+				d=va_arg(list,int*);
+				while(isspace(c=getc(fp))){}
+				unsigned int num =0;
+				while(isdigit(c)){
+					num=num*10+c-'0';
+					c=getc(fp);
+				}
+				*d=num;
+				break;
+			case 'c':
+				dc=va_arg(list,char*);
+				c=getc(fp);
+				*dc=c;
+				break;
+			case ' ':
+				break;
+			};
+		}
+		else
+			format++;
+	}
+	va_end(list);
+	printf("\n");
+}
diff --git a/my_fscanf.h b/my_fscanf.h
new file mode 100644
index 0000000..437ce8e
--- /dev/null
+++ b/my_fscanf.h
@@ -0,0 +1,7 @@
+#ifndef MY_FSCANF_H
+#define MY_FSCANF_H
+#include <stdio.h>
+
+void my_fscanf(FILE *fp, const char *format,...);
+
+#endif