From 3e53a26e31b30d65ddaffd94a792b5efdb154729 Mon Sep 17 00:00:00 2001 From: Frank Busse Date: Fri, 18 Oct 2013 13:33:06 +0200 Subject: stubs.c: fix use of undeclared identifier PATH_MAX --- runtime/POSIX/stubs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'runtime/POSIX/stubs.c') diff --git a/runtime/POSIX/stubs.c b/runtime/POSIX/stubs.c index 7a424d05..1a6ee12b 100644 --- a/runtime/POSIX/stubs.c +++ b/runtime/POSIX/stubs.c @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +#define _XOPEN_SOURCE 700 + #include #include #include @@ -252,11 +254,7 @@ unsigned long long int gnu_dev_makedev(unsigned int __major, unsigned int __mino char *canonicalize_file_name (const char *name) __attribute__((weak)); char *canonicalize_file_name (const char *name) { - char *res = malloc(PATH_MAX); - char *rp_res = realpath(name, res); - if (!rp_res) - free(res); - return rp_res; + return realpath(name, NULL); } int getloadavg(double loadavg[], int nelem) __attribute__((weak)); -- cgit 1.4.1 From 45bc57b046f4afdb4737dafd42ea8e2d5ed05c95 Mon Sep 17 00:00:00 2001 From: Frank Busse Date: Fri, 18 Oct 2013 13:37:06 +0200 Subject: stubs.c: cleanup --- runtime/POSIX/stubs.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'runtime/POSIX/stubs.c') diff --git a/runtime/POSIX/stubs.c b/runtime/POSIX/stubs.c index 1a6ee12b..99e2e768 100644 --- a/runtime/POSIX/stubs.c +++ b/runtime/POSIX/stubs.c @@ -9,19 +9,19 @@ #define _XOPEN_SOURCE 700 -#include -#include #include +#include #include +#include +#include +#include #include +#include #include #include -#include -#include -#include #include -#include #include +#include #include #include #include @@ -33,20 +33,20 @@ void klee_warning_once(const char*); /* Silent ignore */ -int __syscall_rt_sigaction(int signum, const struct sigaction *act, +int __syscall_rt_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact, size_t _something) __attribute__((weak)); -int __syscall_rt_sigaction(int signum, const struct sigaction *act, +int __syscall_rt_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact, size_t _something) { klee_warning_once("silently ignoring"); return 0; } -int sigaction(int signum, const struct sigaction *act, +int sigaction(int signum, const struct sigaction *act, struct sigaction *oldact) __attribute__((weak)); -int sigaction(int signum, const struct sigaction *act, +int sigaction(int signum, const struct sigaction *act, struct sigaction *oldact) { klee_warning_once("silently ignoring"); return 0; @@ -124,21 +124,21 @@ int link(const char *oldpath, const char *newpath) __attribute__((weak)); int link(const char *oldpath, const char *newpath) { klee_warning("ignoring (EPERM)"); errno = EPERM; - return -1; + return -1; } int symlink(const char *oldpath, const char *newpath) __attribute__((weak)); int symlink(const char *oldpath, const char *newpath) { klee_warning("ignoring (EPERM)"); errno = EPERM; - return -1; + return -1; } int rename(const char *oldpath, const char *newpath) __attribute__((weak)); int rename(const char *oldpath, const char *newpath) { klee_warning("ignoring (EPERM)"); errno = EPERM; - return -1; + return -1; } int nanosleep(const struct timespec *req, struct timespec *rem) __attribute__((weak)); @@ -248,8 +248,8 @@ unsigned int gnu_dev_minor(unsigned long long int __dev) { unsigned long long int gnu_dev_makedev(unsigned int __major, unsigned int __minor) __attribute__((weak)); unsigned long long int gnu_dev_makedev(unsigned int __major, unsigned int __minor) { return ((__minor & 0xff) | ((__major & 0xfff) << 8) - | (((unsigned long long int) (__minor & ~0xff)) << 12) - | (((unsigned long long int) (__major & ~0xfff)) << 32)); + | (((unsigned long long int) (__minor & ~0xff)) << 12) + | (((unsigned long long int) (__major & ~0xfff)) << 32)); } char *canonicalize_file_name (const char *name) __attribute__((weak)); -- cgit 1.4.1