2011-11-28 05:28:53 +00:00
|
|
|
--- a/source/popt/popt.c
|
|
|
|
+++ b/source/popt/popt.c
|
2008-08-11 14:00:58 +00:00
|
|
|
@@ -10,13 +10,14 @@
|
|
|
|
|
|
|
|
#include "system.h"
|
|
|
|
|
|
|
|
-#if HAVE_FLOAT_H
|
|
|
|
+//#if HAVE_FLOAT_H
|
|
|
|
#include <float.h>
|
|
|
|
-#endif
|
|
|
|
+//#endif
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
#include "findme.h"
|
|
|
|
#include "poptint.h"
|
|
|
|
+#include "../include/config.h"
|
|
|
|
|
|
|
|
#ifdef MYDEBUG
|
|
|
|
/*@unchecked@*/
|
2011-11-28 05:28:53 +00:00
|
|
|
@@ -388,7 +389,7 @@ static int execCommand(poptContext con)
|
2008-08-11 14:00:58 +00:00
|
|
|
sprintf(s, "%s/%s", con->execPath, item->argv[0]);
|
|
|
|
argv[argc] = s;
|
|
|
|
} else {
|
|
|
|
- argv[argc] = findProgramPath(item->argv[0]);
|
|
|
|
+ argv[argc] = ""/*findProgramPath(item->argv[0])*/;
|
|
|
|
}
|
|
|
|
if (argv[argc++] == NULL) return POPT_ERROR_NOARG;
|
|
|
|
|
2011-11-28 05:28:53 +00:00
|
|
|
@@ -1246,4 +1247,3 @@ int poptStrippedArgv(poptContext con, in
|
2008-08-11 14:00:58 +00:00
|
|
|
|
|
|
|
return numargs;
|
|
|
|
}
|
|
|
|
-/*@=boundswrite@*/
|
2011-11-28 05:28:53 +00:00
|
|
|
--- a/source/modules/vfs_default.c
|
|
|
|
+++ b/source/modules/vfs_default.c
|
|
|
|
@@ -977,7 +977,7 @@ static int vfswrap_linux_setlease(vfs_ha
|
2008-08-11 14:00:58 +00:00
|
|
|
|
2011-11-27 18:28:39 +00:00
|
|
|
START_PROFILE(syscall_linux_setlease);
|
2008-08-11 14:00:58 +00:00
|
|
|
|
2011-11-27 18:28:39 +00:00
|
|
|
-#ifdef LINUX
|
|
|
|
+#if defined(LINUX) && defined(HAVE_KERNEL_OPLOCKS_LINUX)
|
|
|
|
/* first set the signal handler */
|
|
|
|
if(linux_set_lease_sighandler(fd) == -1)
|
|
|
|
return -1;
|
2011-11-28 05:28:53 +00:00
|
|
|
--- a/source/configure
|
|
|
|
+++ b/source/configure
|
|
|
|
@@ -37206,194 +37206,6 @@ fi
|
|
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
|
|
|
|
|
#
|
|
|
|
-#
|
|
|
|
-#
|
|
|
|
-case "$host_os" in
|
|
|
|
- *linux*)
|
|
|
|
- # glibc <= 2.3.2 has a broken getgrouplist
|
|
|
|
- if test "$cross_compiling" = yes; then
|
|
|
|
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
|
|
|
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
|
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
|
|
|
-See \`config.log' for more details." >&5
|
|
|
|
-$as_echo "$as_me: error: cannot run test program while cross compiling
|
|
|
|
-See \`config.log' for more details." >&2;}
|
|
|
|
- { (exit 1); exit 1; }; }; }
|
|
|
|
-else
|
|
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
|
|
-/* confdefs.h. */
|
|
|
|
-_ACEOF
|
|
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
|
|
-/* end confdefs.h. */
|
|
|
|
-
|
|
|
|
-#include <unistd.h>
|
|
|
|
-#include <sys/utsname.h>
|
|
|
|
-main() {
|
|
|
|
- /* glibc up to 2.3 has a broken getgrouplist */
|
|
|
|
-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
|
|
|
|
- int libc_major = __GLIBC__;
|
|
|
|
- int libc_minor = __GLIBC_MINOR__;
|
|
|
|
-
|
|
|
|
- if (libc_major < 2)
|
|
|
|
- exit(1);
|
|
|
|
- if ((libc_major == 2) && (libc_minor <= 3))
|
|
|
|
- exit(1);
|
|
|
|
-#endif
|
|
|
|
- exit(0);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-_ACEOF
|
|
|
|
-rm -f conftest$ac_exeext
|
|
|
|
-if { (ac_try="$ac_link"
|
|
|
|
-case "(($ac_try" in
|
|
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
|
- *) ac_try_echo=$ac_try;;
|
|
|
|
-esac
|
|
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
|
|
-$as_echo "$ac_try_echo") >&5
|
|
|
|
- (eval "$ac_link") 2>&5
|
|
|
|
- ac_status=$?
|
|
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
|
|
- { (case "(($ac_try" in
|
|
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
|
- *) ac_try_echo=$ac_try;;
|
|
|
|
-esac
|
|
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
|
|
-$as_echo "$ac_try_echo") >&5
|
|
|
|
- (eval "$ac_try") 2>&5
|
|
|
|
- ac_status=$?
|
|
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
|
- (exit $ac_status); }; }; then
|
|
|
|
- linux_getgrouplist_ok=yes
|
|
|
|
-else
|
|
|
|
- $as_echo "$as_me: program exited with status $ac_status" >&5
|
|
|
|
-$as_echo "$as_me: failed program was:" >&5
|
|
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-
|
|
|
|
-( exit $ac_status )
|
|
|
|
-linux_getgrouplist_ok=no
|
|
|
|
-fi
|
|
|
|
-rm -rf conftest.dSYM
|
|
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
|
|
-fi
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- if test x"$linux_getgrouplist_ok" = x"yes"; then
|
|
|
|
-
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
|
|
-#define HAVE_GETGROUPLIST 1
|
|
|
|
-_ACEOF
|
|
|
|
-
|
|
|
|
- fi
|
|
|
|
- ;;
|
|
|
|
- *)
|
|
|
|
-
|
|
|
|
-for ac_func in getgrouplist
|
|
|
|
-do
|
|
|
|
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
|
|
-$as_echo_n "checking for $ac_func... " >&6; }
|
|
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
|
|
- $as_echo_n "(cached) " >&6
|
|
|
|
-else
|
|
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
|
|
-/* confdefs.h. */
|
|
|
|
-_ACEOF
|
|
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
|
|
-/* end confdefs.h. */
|
|
|
|
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
|
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
|
|
-#define $ac_func innocuous_$ac_func
|
|
|
|
-
|
|
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
|
|
- which can conflict with char $ac_func (); below.
|
|
|
|
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
|
|
- <limits.h> exists even on freestanding compilers. */
|
|
|
|
-
|
|
|
|
-#ifdef __STDC__
|
|
|
|
-# include <limits.h>
|
|
|
|
-#else
|
|
|
|
-# include <assert.h>
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
-#undef $ac_func
|
|
|
|
-
|
|
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
|
|
- Use char because int might match the return type of a GCC
|
|
|
|
- builtin and then its argument prototype would still apply. */
|
|
|
|
-#ifdef __cplusplus
|
|
|
|
-extern "C"
|
|
|
|
-#endif
|
|
|
|
-char $ac_func ();
|
|
|
|
-/* The GNU C library defines this for functions which it implements
|
|
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
|
|
- something starting with __ and the normal name is an alias. */
|
|
|
|
-#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
|
|
-choke me
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
-int
|
|
|
|
-main ()
|
|
|
|
-{
|
|
|
|
-return $ac_func ();
|
|
|
|
- ;
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-_ACEOF
|
|
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
|
|
-if { (ac_try="$ac_link"
|
|
|
|
-case "(($ac_try" in
|
|
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
|
|
- *) ac_try_echo=$ac_try;;
|
|
|
|
-esac
|
|
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
|
|
-$as_echo "$ac_try_echo") >&5
|
|
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
|
|
- ac_status=$?
|
|
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
|
|
- rm -f conftest.er1
|
|
|
|
- cat conftest.err >&5
|
|
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
|
- (exit $ac_status); } && {
|
|
|
|
- test -z "$ac_c_werror_flag" ||
|
|
|
|
- test ! -s conftest.err
|
|
|
|
- } && test -s conftest$ac_exeext && {
|
|
|
|
- test "$cross_compiling" = yes ||
|
|
|
|
- $as_test_x conftest$ac_exeext
|
|
|
|
- }; then
|
|
|
|
- eval "$as_ac_var=yes"
|
|
|
|
-else
|
|
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-
|
|
|
|
- eval "$as_ac_var=no"
|
|
|
|
-fi
|
|
|
|
-
|
|
|
|
-rm -rf conftest.dSYM
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
|
|
-fi
|
|
|
|
-ac_res=`eval 'as_val=${'$as_ac_var'}
|
|
|
|
- $as_echo "$as_val"'`
|
|
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
|
|
-$as_echo "$ac_res" >&6; }
|
|
|
|
-as_val=`eval 'as_val=${'$as_ac_var'}
|
|
|
|
- $as_echo "$as_val"'`
|
|
|
|
- if test "x$as_val" = x""yes; then
|
|
|
|
- cat >>confdefs.h <<_ACEOF
|
|
|
|
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
|
|
-_ACEOF
|
|
|
|
-
|
|
|
|
-fi
|
|
|
|
-done
|
|
|
|
-
|
|
|
|
- ;;
|
|
|
|
-esac
|
|
|
|
-
|
|
|
|
-#
|
|
|
|
# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
|
|
|
|
#
|
|
|
|
|
|
|
|
--- a/source/configure.in
|
|
|
|
+++ b/source/configure.in
|
|
|
|
@@ -1384,38 +1384,6 @@ AC_TRY_COMPILE([
|
|
|
|
AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
|
|
|
|
|
|
|
|
#
|
|
|
|
-#
|
|
|
|
-#
|
|
|
|
-case "$host_os" in
|
|
|
|
- *linux*)
|
|
|
|
- # glibc <= 2.3.2 has a broken getgrouplist
|
|
|
|
- AC_TRY_RUN([
|
|
|
|
-#include <unistd.h>
|
|
|
|
-#include <sys/utsname.h>
|
|
|
|
-main() {
|
|
|
|
- /* glibc up to 2.3 has a broken getgrouplist */
|
|
|
|
-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
|
|
|
|
- int libc_major = __GLIBC__;
|
|
|
|
- int libc_minor = __GLIBC_MINOR__;
|
|
|
|
-
|
|
|
|
- if (libc_major < 2)
|
|
|
|
- exit(1);
|
|
|
|
- if ((libc_major == 2) && (libc_minor <= 3))
|
|
|
|
- exit(1);
|
|
|
|
-#endif
|
|
|
|
- exit(0);
|
|
|
|
-}
|
|
|
|
-], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
|
|
|
|
- if test x"$linux_getgrouplist_ok" = x"yes"; then
|
|
|
|
- AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
|
|
|
|
- fi
|
|
|
|
- ;;
|
|
|
|
- *)
|
|
|
|
- AC_CHECK_FUNCS(getgrouplist)
|
|
|
|
- ;;
|
|
|
|
-esac
|
|
|
|
-
|
|
|
|
-#
|
|
|
|
# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
|
|
|
|
#
|
|
|
|
|