Merge branch 'tizen_2.2' into tizentizen_3.0_ivi_releasetizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasetizen_3.0.m14.3_ivi_releasetizen_3.0.m14.2_ivi_releasetizen_3.0.2014.q3_common_releasesubmit/tizen_mobile/20141120.000000submit/tizen_ivi/20160217.000002submit/tizen_ivi/20160217.000000submit/tizen_ivi/20140626.144348submit/tizen_ivi/20140626.130032submit/tizen_ivi/20140626.125712submit/tizen_ivi/20140624.064036submit/tizen_ivi/20140623.000000submit/tizen_ivi/20140622.000000submit/tizen_ivi/20140619.000000submit/tizen_ivi/20140618.000001submit/tizen_ivi/20140618.000000submit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen_common/20140522.135644submit/tizen_common/20140522.130648submit/tizen_common/20140521.163740accepted/tizen/ivi/20160218.023303tizen_3.0_ivitizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.m14.3_ivitizen_3.0.m14.2_ivitizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0.2014.q3_commonaccepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_commonaccepted/tizen_3.0_iviaccepted/tizen_3.0.m14.3_iviaccepted/tizen_3.0.2014.q3_common

Conflicts:
	packaging/heynoti.spec

2 files changed, 7 insertions, 2 deletions

diff --git a/heynoti.c b/heynoti.c
index 2d4b8cc..aed59d3 100755
--- a/heynoti.c
+++ b/heynoti.c
@@ -266,10 +266,12 @@ static int __handle_event(int fd)
 			return -1;
 
 		if (ie.len > 0u) {
-			read(fd, name, (ie.len > FILENAME_MAX) ? (size_t)FILENAME_MAX : (size_t) ie.len);
+			r = read(fd, name, (ie.len > FILENAME_MAX) ? (size_t)FILENAME_MAX : (size_t) ie.len);
 		}
 
-		r = read(fd, &ie, sizeof(ie));
+		if(r > 0) {
+			r = read(fd, &ie, sizeof(ie));
+		}
 	}
 
 	return 0;
diff --git a/packaging/heynoti.spec b/packaging/heynoti.spec
index a3a2ceb..d9135ee 100644
--- a/packaging/heynoti.spec
+++ b/packaging/heynoti.spec
@@ -43,6 +43,8 @@ make %{?_smp_mflags}
 %make_install
 
 mkdir -p %{buildroot}%{TZ_SYS_SHARE}/noti
+mkdir -p %{buildroot}/usr/share/license
+install LICENSE %{buildroot}/usr/share/license/%{name}
 
 %post -p /sbin/ldconfig
 
@@ -56,6 +58,7 @@ mkdir -p %{buildroot}%{TZ_SYS_SHARE}/noti
 %{_libdir}/libheynoti.so.0.0.2
 %{_bindir}/heynotitool
 %attr(1755,root,root) %{TZ_SYS_SHARE}/noti
+/usr/share/license/%{name}
 
 
 %files devel