Imported Upstream version 1.7.3

diff --git a/ChangeLog b/ChangeLog
index 4594ade..bd780c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,3 +61,18 @@
 
         1.7.2 release
 
+2012-11-23  Sebastian Dransfeld
+
+       * Correctly define alloca
+       * Minor build fixes for solaris
+
+2012-12-07  Cedric Bail
+
+       * Don't leak fd on exec.
+        * Don't stop on limited access right.
+
+2012-12-07  Luis Felipe Strano Moraes
+
+       * 1.7.3 release
+
+

diff --git a/NEWS b/NEWS
index 610ad71..c2c3021 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Eio 1.7.3
+
+Changes since Eio 1.7.2:
+------------------------
+
+Fixes:
+       - Fix build on Solaris.
+       - Don't leak fd on exec.
+       - Don't stop on limited access right.
+
 Eio 1.7.2
 
 Changes since Eio 1.7.1:

diff --git a/configure b/configure
index ad85f96..9ed2b64 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for eio 1.7.2.
+# Generated by GNU Autoconf 2.68 for eio 1.7.3.
 #
 # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='eio'
 PACKAGE_TARNAME='eio'
-PACKAGE_VERSION='1.7.2'
-PACKAGE_STRING='eio 1.7.2'
+PACKAGE_VERSION='1.7.3'
+PACKAGE_STRING='eio 1.7.3'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1334,7 +1334,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures eio 1.7.2 to adapt to many kinds of systems.
+\`configure' configures eio 1.7.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1404,7 +1404,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of eio 1.7.2:";;
+     short | recursive ) echo "Configuration of eio 1.7.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1527,7 +1527,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-eio configure 1.7.2
+eio configure 1.7.3
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1896,7 +1896,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by eio $as_me 1.7.2, which was
+It was created by eio $as_me 1.7.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2720,7 +2720,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='eio'
- VERSION='1.7.2'
+ VERSION='1.7.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11952,7 +11952,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VMIC 2
+#define VMIC 3
 _ACEOF
 
 
@@ -11960,7 +11960,7 @@ cat >>confdefs.h <<_ACEOF
 #define VREV 0
 _ACEOF
 
-version_info="8:2:7"
+version_info="8:3:7"
 release_info=""
 
 
@@ -14933,7 +14933,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by eio $as_me 1.7.2, which was
+This file was extended by eio $as_me 1.7.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14999,7 +14999,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-eio config.status 1.7.2
+eio config.status 1.7.3
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 80afefc..79d51ce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [7])
-m4_define([v_mic], [2])
+m4_define([v_mic], [3])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line

diff --git a/doc/Doxyfile b/doc/Doxyfile
index caa30aa..35fc9b9 100644 (file)
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = Eio
 # This could be handy for archiving the generated documentation or\r
 # if some version control system is used.\r
 \r
-PROJECT_NUMBER         = 1.7.2\r
+PROJECT_NUMBER         = 1.7.3\r
 \r
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)\r
 # base path where the generated documentation will be put.\r

diff --git a/eio.spec b/eio.spec
index aa2e974..7e249dc 100644 (file)
--- a/eio.spec
+++ b/eio.spec
@@ -3,7 +3,7 @@
 
 Summary: Enlightenment Input/Output Library
 Name: eio
-Version: 1.7.2
+Version: 1.7.3
 Release: %{_rel}
 License: LGPLv2.1
 Group: System Environment/Libraries

diff --git a/src/lib/eio_dir.c b/src/lib/eio_dir.c
index 5de5fb6..7bed4fb 100644 (file)
--- a/src/lib/eio_dir.c
+++ b/src/lib/eio_dir.c
@@ -89,7 +89,7 @@ _eio_file_recursiv_ls(Ecore_Thread *thread,
           {
            case EINA_FILE_DIR:
               if (_eio_lstat(info->path, &buffer) != 0)
-                goto on_error;
+               continue;
 
               if (S_ISLNK(buffer.st_mode))
                 info->type = EINA_FILE_LNK;

diff --git a/src/lib/eio_main.c b/src/lib/eio_main.c
index e65f75b..fa860be 100644 (file)
--- a/src/lib/eio_main.c
+++ b/src/lib/eio_main.c
@@ -16,6 +16,7 @@
  * License along with this library;
  * if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "eio_private.h"
 #include "Eio.h"
 

diff --git a/src/lib/eio_monitor_inotify.c b/src/lib/eio_monitor_inotify.c
index b5ffabd..ca5cb8b 100644 (file)
--- a/src/lib/eio_monitor_inotify.c
+++ b/src/lib/eio_monitor_inotify.c
@@ -184,11 +184,20 @@ _eio_inotify_handler(void *data __UNUSED__, Ecore_Fd_Handler *fdh)
 void eio_monitor_backend_init(void)
 {
    int fd;
+#ifdef HAVE_EXECVP
+   int flags;
+#endif
 
    fd = inotify_init();
    if (fd < 0)
      return ;
 
+#ifdef HAVE_EXECVP
+   flags = fcntl(fd, F_GETFD);
+   flags |= FD_CLOEXEC;
+   fcntl(fd, F_SETFD, flags);
+#endif
+
    _inotify_fdh = ecore_main_fd_handler_add(fd, ECORE_FD_READ, _eio_inotify_handler, NULL, NULL, NULL);
    if (!_inotify_fdh)
      {

diff --git a/src/lib/eio_private.h b/src/lib/eio_private.h
index ef983f9..d57277e 100644 (file)
--- a/src/lib/eio_private.h
+++ b/src/lib/eio_private.h
@@ -5,6 +5,32 @@
 # include "config.h"
 #endif
 
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#elif !defined alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# elif !defined HAVE_ALLOCA
+#  ifdef  __cplusplus
+extern "C"
+#  endif
+void *alloca (size_t);
+# endif
+#endif
+
 #include <sys/types.h>
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>

diff --git a/src/lib/eio_single.c b/src/lib/eio_single.c
index 8bc99fa..c39507e 100644 (file)
--- a/src/lib/eio_single.c
+++ b/src/lib/eio_single.c
@@ -18,6 +18,7 @@
  * License along with this library;
  * if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "eio_private.h"
 #include "Eio.h"