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;
|