uhttpd: rename struct uh_path_info to path_info, drop wdir member

diff --git a/contrib/package/uhttpd/src/uhttpd-cgi.c b/contrib/package/uhttpd/src/uhttpd-cgi.c
index 7b3337d..a89dffa 100644 (file)
--- a/contrib/package/uhttpd/src/uhttpd-cgi.c
+++ b/contrib/package/uhttpd/src/uhttpd-cgi.c
@@ -132,7 +132,7 @@ static void uh_cgi_error_500(struct client *cl, struct http_request *req, const
 }
 
 
 }
 
 

-void uh_cgi_request(struct client *cl, struct http_request *req, struct uh_path_info *pi)
+void uh_cgi_request(struct client *cl, struct http_request *req, struct path_info *pi)

 {
        int i, hdroff, bufoff;
        int hdrlen = 0;
 {
        int i, hdroff, bufoff;
        int hdrlen = 0;

diff --git a/contrib/package/uhttpd/src/uhttpd-cgi.h b/contrib/package/uhttpd/src/uhttpd-cgi.h
index 1a73d88..6b9c9c6 100644 (file)
--- a/contrib/package/uhttpd/src/uhttpd-cgi.h
+++ b/contrib/package/uhttpd/src/uhttpd-cgi.h
@@ -25,7 +25,7 @@
 #include <linux/limits.h>
 
 void uh_cgi_request(
 #include <linux/limits.h>
 
 void uh_cgi_request(

-       struct client *cl, struct http_request *req, struct uh_path_info *pi
+       struct client *cl, struct http_request *req, struct path_info *pi

 );
 
 #endif
 );
 
 #endif

diff --git a/contrib/package/uhttpd/src/uhttpd-file.c b/contrib/package/uhttpd/src/uhttpd-file.c
index 6e083cb..63c2d7e 100644 (file)
--- a/contrib/package/uhttpd/src/uhttpd-file.c
+++ b/contrib/package/uhttpd/src/uhttpd-file.c
@@ -248,7 +248,7 @@ static int uh_file_scandir_filter_dir(const struct dirent *e)
        return strcmp(e->d_name, ".") ? 1 : 0;
 }
 
        return strcmp(e->d_name, ".") ? 1 : 0;
 }
 

-static void uh_file_dirlist(struct client *cl, struct http_request *req, struct uh_path_info *pi)
+static void uh_file_dirlist(struct client *cl, struct http_request *req, struct path_info *pi)

 {
        int i, count;
        char filename[PATH_MAX];
 {
        int i, count;
        char filename[PATH_MAX];


@@ -314,7 +314,7 @@ static void uh_file_dirlist(struct client *cl, struct http_request *req, struct
 }
 
 
 }
 
 

-void uh_file_request(struct client *cl, struct http_request *req, struct uh_path_info *pi)
+void uh_file_request(struct client *cl, struct http_request *req, struct path_info *pi)

 {
        int fd, rlen;
        char buf[UH_LIMIT_MSGHEAD];
 {
        int fd, rlen;
        char buf[UH_LIMIT_MSGHEAD];

diff --git a/contrib/package/uhttpd/src/uhttpd-file.h b/contrib/package/uhttpd/src/uhttpd-file.h
index 3dce525..623820c 100644 (file)
--- a/contrib/package/uhttpd/src/uhttpd-file.h
+++ b/contrib/package/uhttpd/src/uhttpd-file.h
@@ -32,7 +32,7 @@ struct mimetype {
 };
 
 void uh_file_request(
 };
 
 void uh_file_request(

-       struct client *cl, struct http_request *req, struct uh_path_info *pi
+       struct client *cl, struct http_request *req, struct path_info *pi

 );
 
 #endif
 );
 
 #endif

diff --git a/contrib/package/uhttpd/src/uhttpd-utils.c b/contrib/package/uhttpd/src/uhttpd-utils.c
index c3ff35f..12d68ff 100644 (file)
--- a/contrib/package/uhttpd/src/uhttpd-utils.c
+++ b/contrib/package/uhttpd/src/uhttpd-utils.c
@@ -352,11 +352,11 @@ int uh_path_normalize(char *buf, int blen, const char *src, int slen)
 }
 
 
 }
 
 

-struct uh_path_info * uh_path_lookup(struct client *cl, const char *url)
+struct path_info * uh_path_lookup(struct client *cl, const char *url)

 {
        static char path_phys[PATH_MAX];
        static char path_info[PATH_MAX];
 {
        static char path_phys[PATH_MAX];
        static char path_info[PATH_MAX];

-       static struct uh_path_info p;
+       static struct path_info p;

 
        char buffer[UH_LIMIT_MSGHEAD];
        char *docroot = cl->server->conf->docroot;
 
        char buffer[UH_LIMIT_MSGHEAD];
        char *docroot = cl->server->conf->docroot;

diff --git a/contrib/package/uhttpd/src/uhttpd-utils.h b/contrib/package/uhttpd/src/uhttpd-utils.h
index eac737b..7d4bcf6 100644 (file)
--- a/contrib/package/uhttpd/src/uhttpd-utils.h
+++ b/contrib/package/uhttpd/src/uhttpd-utils.h
@@ -31,9 +31,8 @@
 #define foreach_header(i, h) \
        for( i = 0; (i + 1) < (sizeof(h) / sizeof(h[0])) && h[i]; i += 2 )
 
 #define foreach_header(i, h) \
        for( i = 0; (i + 1) < (sizeof(h) / sizeof(h[0])) && h[i]; i += 2 )
 

-struct uh_path_info {
+struct path_info {

        char *root;
        char *root;

-       char *wdir;

        char *phys;
        char *name;
        char *info;
        char *phys;
        char *name;
        char *info;


@@ -74,7 +73,7 @@ int uh_urldecode(char *buf, int blen, const char *src, int slen);
 int uh_urlencode(char *buf, int blen, const char *src, int slen);
 int uh_path_normalize(char *buf, int blen, const char *src, int slen);
 
 int uh_urlencode(char *buf, int blen, const char *src, int slen);
 int uh_path_normalize(char *buf, int blen, const char *src, int slen);
 

-struct uh_path_info * uh_path_lookup(struct client *cl, const char *url);
+struct path_info * uh_path_lookup(struct client *cl, const char *url);

 
 struct listener * uh_listener_add(int sock, struct config *conf);
 struct listener * uh_listener_lookup(int sock);
 
 struct listener * uh_listener_add(int sock, struct config *conf);
 struct listener * uh_listener_lookup(int sock);

diff --git a/contrib/package/uhttpd/src/uhttpd.c b/contrib/package/uhttpd/src/uhttpd.c
index 54c16a8..f2972a0 100644 (file)
--- a/contrib/package/uhttpd/src/uhttpd.c
+++ b/contrib/package/uhttpd/src/uhttpd.c
@@ -347,7 +347,7 @@ int main (int argc, char **argv)
        /* working structs */
        struct addrinfo hints;
        struct http_request *req;
        /* working structs */
        struct addrinfo hints;
        struct http_request *req;

-       struct uh_path_info *pin;
+       struct path_info *pin;

        struct client *cl;
        struct sigaction sa;
        struct config conf;
        struct client *cl;
        struct sigaction sa;
        struct config conf;