projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: disable crashlog, ioremap of RAM does not work properly here
[openwrt.git]
/
package
/
uhttpd
/
src
/
uhttpd-utils.h
diff --git
a/package/uhttpd/src/uhttpd-utils.h
b/package/uhttpd/src/uhttpd-utils.h
index 95535d6fe74ce5138d4ccd60342bd9ce3c2145cc..769e5b45d6137801f79ce4440e09e691f52d814c 100644
(file)
--- a/
package/uhttpd/src/uhttpd-utils.h
+++ b/
package/uhttpd/src/uhttpd-utils.h
@@
-21,9
+21,12
@@
#include <stdarg.h>
#include <fcntl.h>
#include <pwd.h>
#include <stdarg.h>
#include <fcntl.h>
#include <pwd.h>
-#include <shadow.h>
#include <sys/stat.h>
#include <sys/stat.h>
+#ifdef HAVE_SHADOW
+#include <shadow.h>
+#endif
+
#define min(x, y) (((x) < (y)) ? (x) : (y))
#define max(x, y) (((x) > (y)) ? (x) : (y))
#define min(x, y) (((x) < (y)) ? (x) : (y))
#define max(x, y) (((x) > (y)) ? (x) : (y))
@@
-36,12
+39,20
@@
#define fd_cloexec(fd) \
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC)
#define fd_cloexec(fd) \
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC)
+#define ensure_out(x) \
+ do { if((x) < 0) goto out; } while(0)
+
+#define ensure_ret(x) \
+ do { if((x) < 0) return -1; } while(0)
+
+
struct path_info {
char *root;
char *phys;
char *name;
char *info;
char *query;
struct path_info {
char *root;
char *phys;
char *name;
char *info;
char *query;
+ int redirected;
struct stat stat;
};
struct stat stat;
};