git merge master

diff --git a/debian/changelog b/debian/changelog
index 6a92399..b4bf160 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+eina (1.0.0.001+svn.60288slp2+build04) unstable; urgency=low
+
+  * Upload Package: SIGBUS handler override
+  * Important Changes
+        [eina_file]overrid sigbus handler in eina file mmap
+  * Git: 165.213.180.234:/slp/pkgs/e/eina
+  * Tag: eina_1.0.0.001+svn.60288slp2+build04
+
+ -- Jiyoun Park <jy0703.park@samsung.com>  Tue, 16 Aug 2011 19:25:46 +0900
+
 eina (1.0.0.001+svn.60288slp2+build03) unstable; urgency=low
 
   * [Bug Fix] mutex lock is not released in error cases in eina_share_common functions

diff --git a/packaging/eina.spec b/packaging/eina.spec
index 6243f54..fba97fa 100644 (file)
--- a/packaging/eina.spec
+++ b/packaging/eina.spec
@@ -22,8 +22,6 @@ Enlightenment Foundation Library providing optimized data types Eina is a multi-
     + Accessor: can access items of a container randomly
     + Iterator: can access items of a container sequentially
 
-
-
 %package devel
 Summary:    Data Type Library (devel)
 Group:      Development/Libraries
@@ -34,7 +32,7 @@ Enlightenment Foundation Library providing optimized data types (devel)
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -49,17 +47,10 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
-
-
-
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libeina.so.*

diff --git a/src/lib/eina_mmap.c b/src/lib/eina_mmap.c
index c8806e4..9a5932e 100644 (file)
--- a/src/lib/eina_mmap.c
+++ b/src/lib/eina_mmap.c
@@ -84,7 +84,7 @@ _eina_mmap_safe_sigbus(int sig __UNUSED__,
    if (siginfo->si_code == BUS_ADRALN)
      {
         ERR("Unaligned memory access. SIGBUS!!!");
-        errno = perrno; 
+        errno = perrno;
         abort();
      }
    /* send this to stderr - not eina_log. Specifically want this on stderr */
@@ -96,17 +96,17 @@ _eina_mmap_safe_sigbus(int sig __UNUSED__,
    /* mmap a pzge of zero's from /dev/zero in there */
    if (mmap(addr, _eina_mmap_pagesize,
             PROT_READ | PROT_WRITE | PROT_EXEC,
-            MAP_PRIVATE | MAP_FIXED, 
+            MAP_PRIVATE | MAP_FIXED,
             _eina_mmap_zero_fd, 0) == MAP_FAILED)
      {
         /* mmap of /dev/zero failed :( */
         perror("mmap");
         ERR("Failed to mmap() /dev/zero in place of page. SIGBUS!!!");
-        errno = perrno; 
+        errno = perrno;
         abort();
      }
    /* restore previous errno */
-   errno = perrno; 
+   errno = perrno;
 }
 #endif
 
@@ -130,16 +130,16 @@ eina_mmap_safety_enabled_set(Eina_Bool enabled)
              return EINA_FALSE;
           }
      }
-   
+
    enabled = !!enabled;
-   
+
    if (mmap_safe == enabled) return mmap_safe;
    if (enabled)
      {
         struct sigaction  sa;
 
         /* find out system page size the cleanest way we can */
-#ifdef _SC_PAGESIZE   
+#ifdef _SC_PAGESIZE
         _eina_mmap_pagesize = sysconf(_SC_PAGESIZE);
         if (_eina_mmap_pagesize <= 0) return EINA_FALSE;
 #else
@@ -169,7 +169,7 @@ eina_mmap_safety_enabled_set(Eina_Bool enabled)
      }
    mmap_safe = enabled;
    return mmap_safe;
-#endif   
+#endif
 }
 
 EAPI Eina_Bool