[zypp-commit] r11382 - in /trunk/libzypp: ./ vendor/ vendor/shttpd/

Author: dmacvicar Date: Thu Oct 16 19:23:14 2008 New Revision: 11382 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11382&view=rev Log: add embeded http library so we can test remote scenarios Added: trunk/libzypp/vendor/ trunk/libzypp/vendor/CMakeLists.txt trunk/libzypp/vendor/shttpd/ trunk/libzypp/vendor/shttpd/CMakeLists.txt trunk/libzypp/vendor/shttpd/auth.c trunk/libzypp/vendor/shttpd/cgi.c trunk/libzypp/vendor/shttpd/compat_rtems.c trunk/libzypp/vendor/shttpd/compat_rtems.h trunk/libzypp/vendor/shttpd/compat_unix.c trunk/libzypp/vendor/shttpd/compat_unix.h trunk/libzypp/vendor/shttpd/compat_win32.c trunk/libzypp/vendor/shttpd/compat_win32.h trunk/libzypp/vendor/shttpd/compat_wince.c trunk/libzypp/vendor/shttpd/compat_wince.h trunk/libzypp/vendor/shttpd/config.h trunk/libzypp/vendor/shttpd/defs.h trunk/libzypp/vendor/shttpd/io.h trunk/libzypp/vendor/shttpd/io_cgi.c trunk/libzypp/vendor/shttpd/io_dir.c trunk/libzypp/vendor/shttpd/io_emb.c trunk/libzypp/vendor/shttpd/io_file.c trunk/libzypp/vendor/shttpd/io_socket.c trunk/libzypp/vendor/shttpd/io_ssi.c trunk/libzypp/vendor/shttpd/io_ssl.c trunk/libzypp/vendor/shttpd/llist.h trunk/libzypp/vendor/shttpd/log.c trunk/libzypp/vendor/shttpd/md5.c trunk/libzypp/vendor/shttpd/md5.h trunk/libzypp/vendor/shttpd/shttpd.c trunk/libzypp/vendor/shttpd/shttpd.h trunk/libzypp/vendor/shttpd/ssl.h trunk/libzypp/vendor/shttpd/standalone.c trunk/libzypp/vendor/shttpd/std_includes.h trunk/libzypp/vendor/shttpd/string.c Modified: trunk/libzypp/CMakeLists.txt Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=11382&r1=11381&r2=11382&view=diff ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Thu Oct 16 19:23:14 2008 @@ -38,7 +38,7 @@ FOREACH( loop_var ${ARGV} ) SET_SOURCE_FILES_PROPERTIES( ${loop_var}_test.cc COMPILE_FLAGS "-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN -DBOOST_AUTO_TEST_MAIN=\"\" " ) ADD_EXECUTABLE( ${loop_var}_test ${loop_var}_test.cc ) - TARGET_LINK_LIBRARIES( ${loop_var}_test zypp boost_unit_test_framework) + TARGET_LINK_LIBRARIES( ${loop_var}_test zypp boost_unit_test_framework zypp_test_utils) ADD_TEST( ${loop_var}_test ${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test) ENDFOREACH( loop_var ) ENDMACRO(ADD_TESTS) @@ -161,6 +161,7 @@ #ADD_SUBDIRECTORY( examples ) ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL ) ADD_SUBDIRECTORY( doc ) +ADD_SUBDIRECTORY( vendor ) ADD_SUBDIRECTORY( tests EXCLUDE_FROM_ALL ) INCLUDE(CTest) Added: trunk/libzypp/vendor/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/CMakeLists.txt?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/CMakeLists.txt (added) +++ trunk/libzypp/vendor/CMakeLists.txt Thu Oct 16 19:23:14 2008 @@ -0,0 +1,2 @@ +ADD_SUBDIRECTORY(shttpd) + Added: trunk/libzypp/vendor/shttpd/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/CMakeLists.txt?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/CMakeLists.txt (added) +++ trunk/libzypp/vendor/shttpd/CMakeLists.txt Thu Oct 16 19:23:14 2008 @@ -0,0 +1,29 @@ +SET(shttp_SOURCES + auth.c + cgi.c + compat_unix.c + config.h + defs.h + io_cgi.c + io_dir.c + io_emb.c + io_file.c + io.h + io_socket.c + io_ssi.c + io_ssl.c + llist.h + log.c + md5.c + md5.h + shttpd.c + shttpd.h + ssl.h + standalone.c + std_includes.h + string.c +) + +ADD_LIBRARY(shttp ${shttp_SOURCES}) +TARGET_LINK_LIBRARIES(shttp dl pthread) + Added: trunk/libzypp/vendor/shttpd/auth.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/auth.c?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/auth.c (added) +++ trunk/libzypp/vendor/shttpd/auth.c Thu Oct 16 19:23:14 2008 @@ -0,0 +1,419 @@ +/* + * Copyright (c) 2004-2005 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#include "defs.h" + +#if !defined(NO_AUTH) +/* + * Stringify binary data. Output buffer must be twice as big as input, + * because each byte takes 2 bytes in string representation + */ +static void +bin2str(char *to, const unsigned char *p, size_t len) +{ + const char *hex = "0123456789abcdef"; + + for (;len--; p++) { + *to++ = hex[p[0] >> 4]; + *to++ = hex[p[0] & 0x0f]; + } +} + +/* + * Return stringified MD5 hash for list of vectors. + * buf must point to at least 32-bytes long buffer + */ +static void +md5(char *buf, ...) +{ + unsigned char hash[16]; + const struct vec *v; + va_list ap; + MD5_CTX ctx; + int i; + + MD5Init(&ctx); + + va_start(ap, buf); + for (i = 0; (v = va_arg(ap, const struct vec *)) != NULL; i++) { + assert(v->len >= 0); + if (v->len == 0) + continue; + if (i > 0) + MD5Update(&ctx, (unsigned char *) ":", 1); + MD5Update(&ctx,(unsigned char *)v->ptr,(unsigned int)v->len); + } + va_end(ap); + + MD5Final(hash, &ctx); + bin2str(buf, hash, sizeof(hash)); +} + +/* + * Compare to vectors. Return 1 if they are equal + */ +static int +vcmp(const struct vec *v1, const struct vec *v2) +{ + return (v1->len == v2->len && !memcmp(v1->ptr, v2->ptr, v1->len)); +} + +struct digest { + struct vec user; + struct vec uri; + struct vec nonce; + struct vec cnonce; + struct vec resp; + struct vec qop; + struct vec nc; +}; + +static const struct auth_keyword { + size_t offset; + struct vec vec; +} known_auth_keywords[] = { + {offsetof(struct digest, user), {"username=", 9}}, + {offsetof(struct digest, cnonce), {"cnonce=", 7}}, + {offsetof(struct digest, resp), {"response=", 9}}, + {offsetof(struct digest, uri), {"uri=", 4}}, + {offsetof(struct digest, qop), {"qop=", 4}}, + {offsetof(struct digest, nc), {"nc=", 3}}, + {offsetof(struct digest, nonce), {"nonce=", 6}}, + {0, {NULL, 0}} +}; + +static void +parse_authorization_header(const struct vec *h, struct digest *dig) +{ + const unsigned char *p, *e, *s; + struct vec *v, vec; + const struct auth_keyword *kw; + + (void) memset(dig, 0, sizeof(*dig)); + p = (unsigned char *) h->ptr + 7; + e = (unsigned char *) h->ptr + h->len; + + while (p < e) { + + /* Skip spaces */ + while (p < e && (*p == ' ' || *p == ',')) + p++; + + /* Skip to "=" */ + for (s = p; s < e && *s != '='; ) + s++; + s++; + + /* Is it known keyword ? */ + for (kw = known_auth_keywords; kw->vec.len > 0; kw++) + if (kw->vec.len <= s - p && + !memcmp(p, kw->vec.ptr, kw->vec.len)) + break; + + if (kw->vec.len == 0) + v = &vec; /* Dummy placeholder */ + else + v = (struct vec *) ((char *) dig + kw->offset); + + if (*s == '"') { + p = ++s; + while (p < e && *p != '"') + p++; + } else { + p = s; + while (p < e && *p != ' ' && *p != ',') + p++; + } + + v->ptr = (char *) s; + v->len = p - s; + + if (*p == '"') + p++; + + DBG(("auth field [%.*s]", v->len, v->ptr)); + } +} + +/* + * Check the user's password, return 1 if OK + */ +static int +check_password(int method, const struct vec *ha1, const struct digest *digest) +{ + char a2[32], resp[32]; + struct vec vec_a2; + + /* XXX Due to a bug in MSIE, we do not compare the URI */ + /* Also, we do not check for authentication timeout */ + if (/*strcmp(dig->uri, c->ouri) != 0 || */ + digest->resp.len != 32 /*|| + now - strtoul(dig->nonce, NULL, 10) > 3600 */) + return (0); + + md5(a2, &_shttpd_known_http_methods[method], &digest->uri, NULL); + vec_a2.ptr = a2; + vec_a2.len = sizeof(a2); + md5(resp, ha1, &digest->nonce, &digest->nc, + &digest->cnonce, &digest->qop, &vec_a2, NULL); + DBG(("%s: uri [%.*s] expected_resp [%.*s] resp [%.*s]", + "check_password", digest->uri.len, digest->uri.ptr, + 32, resp, digest->resp.len, digest->resp.ptr)); + + return (!memcmp(resp, digest->resp.ptr, 32)); +} + +static FILE * +open_auth_file(struct shttpd_ctx *ctx, const char *path) +{ + char name[FILENAME_MAX]; + const char *p, *e; + FILE *fp = NULL; + int fd; + + if (ctx->options[OPT_AUTH_GPASSWD] != NULL) { + /* Use global passwords file */ + _shttpd_snprintf(name, sizeof(name), "%s", + ctx->options[OPT_AUTH_GPASSWD]); + } else { + /* + * Try to find .htpasswd in requested directory. + * Given the path, create the path to .htpasswd file + * in the same directory. Find the right-most + * directory separator character first. That would be the + * directory name. If directory separator character is not + * found, 'e' will point to 'p'. + */ + for (p = path, e = p + strlen(p) - 1; e > p; e--) + if (IS_DIRSEP_CHAR(*e)) + break; + + /* + * Make up the path by concatenating directory name and + * .htpasswd file name. + */ + (void) _shttpd_snprintf(name, sizeof(name), "%.*s/%s", + (int) (e - p), p, HTPASSWD); + } + + if ((fd = _shttpd_open(name, O_RDONLY, 0)) == -1) { + DBG(("open_auth_file: open(%s)", name)); + } else if ((fp = fdopen(fd, "r")) == NULL) { + DBG(("open_auth_file: fdopen(%s)", name)); + (void) close(fd); + } + + return (fp); +} + +/* + * Parse the line from htpasswd file. Line should be in form of + * "user:domain:ha1". Fill in the vector values. Return 1 if successful. + */ +static int +parse_htpasswd_line(const char *s, struct vec *user, + struct vec *domain, struct vec *ha1) +{ + user->len = domain->len = ha1->len = 0; + + for (user->ptr = s; *s != '\0' && *s != ':'; s++, user->len++); + if (*s++ != ':') + return (0); + + for (domain->ptr = s; *s != '\0' && *s != ':'; s++, domain->len++); + if (*s++ != ':') + return (0); + + for (ha1->ptr = s; *s != '\0' && !isspace(* (unsigned char *) s); + s++, ha1->len++); + + DBG(("parse_htpasswd_line: [%.*s] [%.*s] [%.*s]", user->len, user->ptr, + domain->len, domain->ptr, ha1->len, ha1->ptr)); + + return (user->len > 0 && domain->len > 0 && ha1->len > 0); +} + +/* + * Authorize against the opened passwords file. Return 1 if authorized. + */ +static int +authorize(struct conn *c, FILE *fp) +{ + struct vec *auth_vec = &c->ch.auth.v_vec; + struct vec *user_vec = &c->ch.user.v_vec; + struct vec user, domain, ha1; + struct digest digest; + int ok = 0; + char line[256]; + + if (auth_vec->len > 20 && + !_shttpd_strncasecmp(auth_vec->ptr, "Digest ", 7)) { + + parse_authorization_header(auth_vec, &digest); + *user_vec = digest.user; + + while (fgets(line, sizeof(line), fp) != NULL) { + + if (!parse_htpasswd_line(line, &user, &domain, &ha1)) + continue; + + DBG(("[%.*s] [%.*s] [%.*s]", user.len, user.ptr, + domain.len, domain.ptr, ha1.len, ha1.ptr)); + + if (vcmp(user_vec, &user) && + !memcmp(c->ctx->options[OPT_AUTH_REALM], + domain.ptr, domain.len)) { + ok = check_password(c->method, &ha1, &digest); + break; + } + } + } + + return (ok); +} + +int +_shttpd_check_authorization(struct conn *c, const char *path) +{ + FILE *fp = NULL; + int len, n, authorized = 1; + const char *p, *s = c->ctx->options[OPT_PROTECT]; + char protected_path[FILENAME_MAX]; + + FOR_EACH_WORD_IN_LIST(s, len) { + + if ((p = memchr(s, '=', len)) == NULL || p >= s + len || p == s) + continue; + + if (!memcmp(c->uri, s, p - s)) { + + n = s + len - p; + if (n > (int) sizeof(protected_path) - 1) + n = sizeof(protected_path) - 1; + + _shttpd_strlcpy(protected_path, p + 1, n); + + if ((fp = fopen(protected_path, "r")) == NULL) + _shttpd_elog(E_LOG, c, + "check_auth: cannot open %s: %s", + protected_path, strerror(errno)); + break; + } + } + + if (fp == NULL) + fp = open_auth_file(c->ctx, path); + + if (fp != NULL) { + authorized = authorize(c, fp); + (void) fclose(fp); + } + + return (authorized); +} + +int +_shttpd_is_authorized_for_put(struct conn *c) +{ + FILE *fp; + int ret = 0; + + if ((fp = fopen(c->ctx->options[OPT_AUTH_PUT], "r")) != NULL) { + ret = authorize(c, fp); + (void) fclose(fp); + } + + return (ret); +} + +void +_shttpd_send_authorization_request(struct conn *c) +{ + char buf[512]; + + (void) _shttpd_snprintf(buf, sizeof(buf), "Unauthorized\r\n" + "WWW-Authenticate: Digest qop=\"auth\", realm=\"%s\", " + "nonce=\"%lu\"", c->ctx->options[OPT_AUTH_REALM], + (unsigned long) _shttpd_current_time); + + _shttpd_send_server_error(c, 401, buf); +} + +/* + * Edit the passwords file. + */ +int +_shttpd_edit_passwords(const char *fname, const char *domain, + const char *user, const char *pass) +{ + int ret = EXIT_SUCCESS, found = 0; + struct vec u, d, p; + char line[512], tmp[FILENAME_MAX], ha1[32]; + FILE *fp = NULL, *fp2 = NULL; + + (void) _shttpd_snprintf(tmp, sizeof(tmp), "%s.tmp", fname); + + /* Create the file if does not exist */ + if ((fp = fopen(fname, "a+"))) + (void) fclose(fp); + + /* Open the given file and temporary file */ + if ((fp = fopen(fname, "r")) == NULL) + _shttpd_elog(E_FATAL, NULL, + "Cannot open %s: %s", fname, strerror(errno)); + else if ((fp2 = fopen(tmp, "w+")) == NULL) + _shttpd_elog(E_FATAL, NULL, + "Cannot open %s: %s", tmp, strerror(errno)); + + p.ptr = pass; + p.len = strlen(pass); + + /* Copy the stuff to temporary file */ + while (fgets(line, sizeof(line), fp) != NULL) { + u.ptr = line; + if ((d.ptr = strchr(line, ':')) == NULL) + continue; + u.len = d.ptr - u.ptr; + d.ptr++; + if (strchr(d.ptr, ':') == NULL) + continue; + d.len = strchr(d.ptr, ':') - d.ptr; + + if ((int) strlen(user) == u.len && + !memcmp(user, u.ptr, u.len) && + (int) strlen(domain) == d.len && + !memcmp(domain, d.ptr, d.len)) { + found++; + md5(ha1, &u, &d, &p, NULL); + (void) fprintf(fp2, "%s:%s:%.32s\n", user, domain, ha1); + } else { + (void) fprintf(fp2, "%s", line); + } + } + + /* If new user, just add it */ + if (found == 0) { + u.ptr = user; u.len = strlen(user); + d.ptr = domain; d.len = strlen(domain); + md5(ha1, &u, &d, &p, NULL); + (void) fprintf(fp2, "%s:%s:%.32s\n", user, domain, ha1); + } + + /* Close files */ + (void) fclose(fp); + (void) fclose(fp2); + + /* Put the temp file in place of real file */ + (void) _shttpd_remove(fname); + (void) _shttpd_rename(tmp, fname); + + return (ret); +} +#endif /* NO_AUTH */ Added: trunk/libzypp/vendor/shttpd/cgi.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/cgi.c?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/cgi.c (added) +++ trunk/libzypp/vendor/shttpd/cgi.c Thu Oct 16 19:23:14 2008 @@ -0,0 +1,229 @@ +/* + * Copyright (c) 2004-2005 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#include "defs.h" + +#if !defined(NO_CGI) +struct env_block { + char buf[ENV_MAX]; /* Environment buffer */ + int len; /* Space taken */ + char *vars[CGI_ENV_VARS]; /* Point into the buffer */ + int nvars; /* Number of variables */ +}; + +static void +addenv(struct env_block *block, const char *fmt, ...) +{ + int n, space; + va_list ap; + + space = sizeof(block->buf) - block->len - 2; + assert(space >= 0); + + va_start(ap, fmt); + n = vsnprintf(block->buf + block->len, space, fmt, ap); + va_end(ap); + + if (n > 0 && n < space && block->nvars < CGI_ENV_VARS - 2) { + block->vars[block->nvars++] = block->buf + block->len; + block->len += n + 1; /* Include \0 terminator */ + } +} + +static void +add_http_headers_to_env(struct env_block *b, const char *s, int len) +{ + const char *p, *v, *e = s + len; + int space, n, i, ch; + + /* Loop through all headers in the request */ + while (s < e) { + + /* Find where this header ends. Remember where value starts */ + for (p = s, v = NULL; p < e && *p != '\n'; p++) + if (v == NULL && *p == ':') + v = p; + + /* 2 null terminators and "HTTP_" */ + space = (sizeof(b->buf) - b->len) - (2 + 5); + assert(space >= 0); + + /* Copy header if enough space in the environment block */ + if (v > s && p > v + 2 && space > p - s) { + + /* Store var */ + if (b->nvars < (int) NELEMS(b->vars) - 1) + b->vars[b->nvars++] = b->buf + b->len; + + (void) memcpy(b->buf + b->len, "HTTP_", 5); + b->len += 5; + + /* Copy header name. Substitute '-' to '_' */ + n = v - s; + for (i = 0; i < n; i++) { + ch = s[i] == '-' ? '_' : s[i]; + b->buf[b->len++] = toupper(ch); + } + + b->buf[b->len++] = '='; + + /* Copy header value */ + v += 2; + n = p[-1] == '\r' ? (p - v) - 1 : p - v; + for (i = 0; i < n; i++) + b->buf[b->len++] = v[i]; + + /* Null-terminate */ + b->buf[b->len++] = '\0'; + } + + s = p + 1; /* Shift to the next header */ + } +} + +static void +prepare_environment(const struct conn *c, const char *prog, + struct env_block *blk) +{ + const struct headers *h = &c->ch; + const char *s, *fname, *root = c->ctx->options[OPT_ROOT]; + size_t len; + + blk->len = blk->nvars = 0; + + /* SCRIPT_FILENAME */ + fname = prog; + if ((s = strrchr(prog, '/'))) + fname = s + 1; + + /* Prepare the environment block */ + addenv(blk, "%s", "GATEWAY_INTERFACE=CGI/1.1"); + addenv(blk, "%s", "SERVER_PROTOCOL=HTTP/1.1"); + addenv(blk, "%s", "REDIRECT_STATUS=200"); /* PHP */ + addenv(blk, "SERVER_PORT=%d", c->loc_port); + addenv(blk, "SERVER_NAME=%s", c->ctx->options[OPT_AUTH_REALM]); + addenv(blk, "SERVER_ROOT=%s", root); + addenv(blk, "DOCUMENT_ROOT=%s", root); + addenv(blk, "REQUEST_METHOD=%s", + _shttpd_known_http_methods[c->method].ptr); + addenv(blk, "REMOTE_ADDR=%s", inet_ntoa(c->sa.u.sin.sin_addr)); + addenv(blk, "REMOTE_PORT=%hu", ntohs(c->sa.u.sin.sin_port)); + addenv(blk, "REQUEST_URI=%s", c->uri); + addenv(blk, "SCRIPT_NAME=%s", prog + strlen(root)); + addenv(blk, "SCRIPT_FILENAME=%s", fname); /* PHP */ + addenv(blk, "PATH_TRANSLATED=%s", prog); + + if (h->ct.v_vec.len > 0) + addenv(blk, "CONTENT_TYPE=%.*s", + h->ct.v_vec.len, h->ct.v_vec.ptr); + + if (c->query != NULL) + addenv(blk, "QUERY_STRING=%s", c->query); + + if (c->path_info != NULL) + addenv(blk, "PATH_INFO=/%s", c->path_info); + + if (h->cl.v_big_int > 0) + addenv(blk, "CONTENT_LENGTH=%lu", h->cl.v_big_int); + + if ((s = getenv("PATH")) != NULL) + addenv(blk, "PATH=%s", s); + +#ifdef _WIN32 + if ((s = getenv("COMSPEC")) != NULL) + addenv(blk, "COMSPEC=%s", s); + if ((s = getenv("SYSTEMROOT")) != NULL) + addenv(blk, "SYSTEMROOT=%s", s); +#else + if ((s = getenv("LD_LIBRARY_PATH")) != NULL) + addenv(blk, "LD_LIBRARY_PATH=%s", s); +#endif /* _WIN32 */ + + if ((s = getenv("PERLLIB")) != NULL) + addenv(blk, "PERLLIB=%s", s); + + if (h->user.v_vec.len > 0) { + addenv(blk, "REMOTE_USER=%.*s", + h->user.v_vec.len, h->user.v_vec.ptr); + addenv(blk, "%s", "AUTH_TYPE=Digest"); + } + + /* Add user-specified variables */ + s = c->ctx->options[OPT_CGI_ENVIRONMENT]; + FOR_EACH_WORD_IN_LIST(s, len) + addenv(blk, "%.*s", len, s); + + /* Add all headers as HTTP_* variables */ + add_http_headers_to_env(blk, c->headers, + c->rem.headers_len - (c->headers - c->request)); + + blk->vars[blk->nvars++] = NULL; + blk->buf[blk->len++] = '\0'; + + assert(blk->nvars < CGI_ENV_VARS); + assert(blk->len > 0); + assert(blk->len < (int) sizeof(blk->buf)); + + /* Debug stuff to view passed environment */ + DBG(("%s: %d vars, %d env size", prog, blk->nvars, blk->len)); + { + int i; + for (i = 0 ; i < blk->nvars; i++) + DBG(("[%s]", blk->vars[i] ? blk->vars[i] : "null")); + } +} + +int +_shttpd_run_cgi(struct conn *c, const char *prog) +{ + struct env_block blk; + char dir[FILENAME_MAX], *p; + int ret, pair[2]; + + prepare_environment(c, prog, &blk); + pair[0] = pair[1] = -1; + + /* CGI must be executed in its own directory */ + (void) _shttpd_snprintf(dir, sizeof(dir), "%s", prog); + for (p = dir + strlen(dir) - 1; p > dir; p--) + if (*p == '/') { + *p++ = '\0'; + break; + } + + if (shttpd_socketpair(pair) != 0) { + ret = -1; + } else if (_shttpd_spawn_process(c, + prog, blk.buf, blk.vars, pair[1], dir)) { + ret = -1; + (void) closesocket(pair[0]); + (void) closesocket(pair[1]); + } else { + ret = 0; + c->loc.chan.sock = pair[0]; + } + + return (ret); +} + +void +_shttpd_do_cgi(struct conn *c) +{ + DBG(("running CGI: [%s]", c->uri)); + assert(c->loc.io.size > CGI_REPLY_LEN); + memcpy(c->loc.io.buf, CGI_REPLY, CGI_REPLY_LEN); + c->loc.io.head = c->loc.io.tail = c->loc.io.total = CGI_REPLY_LEN; + c->loc.io_class = &_shttpd_io_cgi; + c->loc.flags = FLAG_R; + if (c->method == METHOD_POST) + c->loc.flags |= FLAG_W; +} + +#endif /* !NO_CGI */ Added: trunk/libzypp/vendor/shttpd/compat_rtems.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/compat_rtems.c?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/compat_rtems.c (added) +++ trunk/libzypp/vendor/shttpd/compat_rtems.c Thu Oct 16 19:23:14 2008 @@ -0,0 +1,198 @@ +/********************************************************************** + * + * rtems shttpd management + * + * FILE NAME : rtems_shttpd.c + * + * AUTHOR : Steven Johnson + * + * DESCRIPTION : Defines the interface functions to the shttp daemon + * + * REVISION : $Id: compat_rtems.c,v 1.2 2006/11/12 03:29:17 infidel Exp $ + * + * COMMENTS : + * + **********************************************************************/ + + /********************************************************************** + * INCLUDED MODULES + **********************************************************************/ +#include +#include "defs.h" + +#define MAX_WEB_BASE_PATH_LENGTH 256 +#define MIN_SHTTPD_STACK (8*1024) + +typedef struct RTEMS_HTTPD_ARGS { + rtems_shttpd_init init_callback; + rtems_shttpd_addpages addpages_callback; + char webroot[MAX_WEB_BASE_PATH_LENGTH]; +} RTEMS_HTTPD_ARGS; + +static int rtems_webserver_running = FALSE; //not running. + +static rtems_task rtems_httpd_daemon(rtems_task_argument args ) +{ + RTEMS_HTTPD_ARGS *httpd_args = (RTEMS_HTTPD_ARGS*)args; + + struct shttpd_ctx *ctx; + + if (httpd_args != NULL) + if (httpd_args->init_callback != NULL) + httpd_args->init_callback(); + +/************************************** + * Initialize the web server + */ + /* + * Initialize SHTTPD context. + * Set WWW root to current WEB_ROOT_PATH. + */ + ctx = shttpd_init(NULL, "document_root", httpd_args->webroot, NULL); + + if (httpd_args != NULL) + if (httpd_args->addpages_callback != NULL) + httpd_args->addpages_callback(ctx); + + /* Finished with args, so free them */ + if (httpd_args != NULL) + free(httpd_args); + + /* Open listening socket */ + shttpd_listen(ctx, 9000); + + rtems_webserver_running = TRUE; + + /* Serve connections infinitely until someone kills us */ + while (rtems_webserver_running) + shttpd_poll(ctx, 1000); + + /* Unreached, because we will be killed by a signal */ + shttpd_fini(ctx); + + rtems_task_delete( RTEMS_SELF ); +} + +rtems_status_code rtems_initialize_webserver(rtems_task_priority initial_priority, + rtems_unsigned32 stack_size, + rtems_mode initial_modes, + rtems_attribute attribute_set, + rtems_shttpd_init init_callback, + rtems_shttpd_addpages addpages_callback, + char *webroot + ) +{ + rtems_status_code sc; + rtems_id tid; + RTEMS_HTTPD_ARGS *args; + + if (stack_size < MIN_SHTTPD_STACK) + stack_size = MIN_SHTTPD_STACK; + + args = malloc(sizeof(RTEMS_HTTPD_ARGS)); + + if (args != NULL) + { + args->init_callback = init_callback; + args->addpages_callback = addpages_callback; + strncpy(args->webroot,webroot,MAX_WEB_BASE_PATH_LENGTH); + + sc = rtems_task_create(rtems_build_name('H', 'T', 'P', 'D'), + initial_priority, + stack_size, + initial_modes, + attribute_set, + &tid); + + if (sc == RTEMS_SUCCESSFUL) + { + sc = rtems_task_start(tid, rtems_httpd_daemon, (rtems_task_argument)args); + } + } + else + { + sc = RTEMS_NO_MEMORY; + } + + return sc; +} + +void rtems_terminate_webserver(void) +{ + rtems_webserver_running = FALSE; //not running, so terminate +} + +int rtems_webserver_ok(void) +{ + return rtems_webserver_running; +} + +void +set_close_on_exec(int fd) +{ + // RTEMS Does not have a functional "execve" + // so technically this call does not do anything, + // but it doesnt hurt either. + (void) fcntl(fd, F_SETFD, FD_CLOEXEC); +} + +int +my_stat(const char *path, struct stat *stp) +{ + return (stat(path, stp)); +} + +int +my_open(const char *path, int flags, int mode) +{ + return (open(path, flags, mode)); +} + +int +my_remove(const char *path) +{ + return (remove(path)); +} + +int +my_rename(const char *path1, const char *path2) +{ + return (rename(path1, path2)); +} + +int +my_mkdir(const char *path, int mode) +{ + return (mkdir(path, mode)); +} + +char * +my_getcwd(char *buffer, int maxlen) +{ + return (getcwd(buffer, maxlen)); +} + +int +set_non_blocking_mode(int fd) +{ + int ret = -1; + int flags; + + if ((flags = fcntl(fd, F_GETFL, 0)) == -1) { + DBG(("nonblock: fcntl(F_GETFL): %d", ERRNO)); + } else if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) != 0) { + DBG(("nonblock: fcntl(F_SETFL): %d", ERRNO)); + } else { + ret = 0; /* Success */ + } + + return (ret); +} + +#if !defined(NO_CGI) +int +spawn_process(struct conn *c, const char *prog, char *envblk, char **envp) +{ + return (-1); // RTEMS does not have subprocess support as standard. +} +#endif Added: trunk/libzypp/vendor/shttpd/compat_rtems.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/compat_rtems.h?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/compat_rtems.h (added) +++ trunk/libzypp/vendor/shttpd/compat_rtems.h Thu Oct 16 19:23:14 2008 @@ -0,0 +1,60 @@ +/** + * @file rtems/rtems-shttpd.h + */ + +#ifndef _rtems_rtems_webserver_h +#define _rtems_rtems_webserver_h + +#include "shttpd.h" + +#include +#include +#include +#include + +/* RTEMS is an Real Time Embedded operating system, for operation in hardware. + It does not have SSL or CGI support, as it does not have dynamic library + loading or sub-processes. */ +#define EMBEDDED +#define NO_SSL +#define NO_CGI + +#define DIRSEP '/' +#define O_BINARY 0 +#define ERRNO errno + +/* RTEMS version is Thread Safe */ +#define InitializeCriticalSection(x) rtems_semaphore_create( \ + rtems_build_name('H','T','P','X'), \ + 1, /* Not Held Yet.*/ \ + RTEMS_FIFO | \ + RTEMS_BINARY_SEMAPHORE, \ + 0, \ + x); +#define EnterCriticalSection(x) rtems_semaphore_obtain(*(x),RTEMS_WAIT,RTEMS_NO_TIMEOUT) +#define LeaveCriticalSection(x) rtems_semaphore_release(*(x)) + + + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void (*rtems_shttpd_addpages)(struct shttpd_ctx *ctx); +typedef void (*rtems_shttpd_init)(void); + +rtems_status_code rtems_initialize_webserver(rtems_task_priority initial_priority, + rtems_unsigned32 stack_size, + rtems_mode initial_modes, + rtems_attribute attribute_set, + rtems_shttpd_init init_callback, + rtems_shttpd_addpages addpages_callback, + char *webroot + ); +void rtems_terminate_webserver(void); +int rtems_webserver_ok(void); + +#ifdef __cplusplus +} +#endif +#endif Added: trunk/libzypp/vendor/shttpd/compat_unix.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/compat_unix.c?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/compat_unix.c (added) +++ trunk/libzypp/vendor/shttpd/compat_unix.c Thu Oct 16 19:23:14 2008 @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2004-2005 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#include "defs.h" + +void +_shttpd_set_close_on_exec(int fd) +{ + (void) fcntl(fd, F_SETFD, FD_CLOEXEC); +} + +int +_shttpd_stat(const char *path, struct stat *stp) +{ + return (stat(path, stp)); +} + +int +_shttpd_open(const char *path, int flags, int mode) +{ + return (open(path, flags, mode)); +} + +int +_shttpd_remove(const char *path) +{ + return (remove(path)); +} + +int +_shttpd_rename(const char *path1, const char *path2) +{ + return (rename(path1, path2)); +} + +int +_shttpd_mkdir(const char *path, int mode) +{ + return (mkdir(path, mode)); +} + +char * +_shttpd_getcwd(char *buffer, int maxlen) +{ + return (getcwd(buffer, maxlen)); +} + +int +_shttpd_set_non_blocking_mode(int fd) +{ + int ret = -1; + int flags; + + if ((flags = fcntl(fd, F_GETFL, 0)) == -1) { + DBG(("nonblock: fcntl(F_GETFL): %d", ERRNO)); + } else if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) != 0) { + DBG(("nonblock: fcntl(F_SETFL): %d", ERRNO)); + } else { + ret = 0; /* Success */ + } + + return (ret); +} + +#ifndef NO_CGI +int +_shttpd_spawn_process(struct conn *c, const char *prog, char *envblk, + char *envp[], int sock, const char *dir) +{ + int ret; + pid_t pid; + const char *p, *interp = c->ctx->options[OPT_CGI_INTERPRETER]; + + envblk = NULL; /* unused */ + + if ((pid = vfork()) == -1) { + + ret = -1; + _shttpd_elog(E_LOG, c, "redirect: fork: %s", strerror(errno)); + + } else if (pid == 0) { + + /* Child */ + + (void) chdir(dir); + (void) dup2(sock, 0); + (void) dup2(sock, 1); + (void) closesocket(sock); + + /* If error file is specified, send errors there */ + if (c->ctx->error_log) + (void) dup2(fileno(c->ctx->error_log), 2); + + if ((p = strrchr(prog, '/')) != NULL) + p++; + else + p = prog; + + /* Execute CGI program */ + if (interp == NULL) { + (void) execle(p, p, NULL, envp); + _shttpd_elog(E_FATAL, c, "redirect: exec(%s)", prog); + } else { + (void) execle(interp, interp, p, NULL, envp); + _shttpd_elog(E_FATAL, c, "redirect: exec(%s %s)", + interp, prog); + } + + /* UNREACHED */ + exit(EXIT_FAILURE); + + } else { + + /* Parent */ + ret = 0; + (void) closesocket(sock); + } + + return (ret); +} +#endif /* !NO_CGI */ Added: trunk/libzypp/vendor/shttpd/compat_unix.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/compat_unix.h?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/compat_unix.h (added) +++ trunk/libzypp/vendor/shttpd/compat_unix.h Thu Oct 16 19:23:14 2008 @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2004-2007 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#if !defined(NO_THREADS) +#include "pthread.h" +#define _beginthread(a, b, c) do { pthread_t tid; \ + pthread_create(&tid, NULL, (void *(*)(void *))a, c); } while (0) +#endif /* !NO_THREADS */ + +#define SSL_LIB "libssl.so" +#define DIRSEP '/' +#define IS_DIRSEP_CHAR(c) ((c) == '/') +#define O_BINARY 0 +#define closesocket(a) close(a) +#define ERRNO errno Added: trunk/libzypp/vendor/shttpd/compat_win32.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/compat_win32.c?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/compat_win32.c (added) +++ trunk/libzypp/vendor/shttpd/compat_win32.c Thu Oct 16 19:23:14 2008 @@ -0,0 +1,687 @@ +/* + * Copyright (c) 2004-2005 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#include "defs.h" + +static SERVICE_STATUS ss; +static SERVICE_STATUS_HANDLE hStatus; +static SERVICE_DESCRIPTION service_descr = {"Web server"}; + +static void +fix_directory_separators(char *path) +{ + for (; *path != '\0'; path++) { + if (*path == '/') + *path = '\\'; + if (*path == '\\') + while (path[1] == '\\' || path[1] == '/') + (void) memmove(path + 1, + path + 2, strlen(path + 2) + 1); + } +} + +static int +protect_against_code_disclosure(const wchar_t *path) +{ + WIN32_FIND_DATAW data; + HANDLE handle; + const wchar_t *p; + + /* + * Protect against CGI code disclosure under Windows. + * This is very nasty hole. Windows happily opens files with + * some garbage in the end of file name. So fopen("a.cgi ", "r") + * actually opens "a.cgi", and does not return an error! And since + * "a.cgi " does not have valid CGI extension, this leads to + * the CGI code disclosure. + * To protect, here we delete all fishy characters from the + * end of file name. + */ + + if ((handle = FindFirstFileW(path, &data)) == INVALID_HANDLE_VALUE) + return (FALSE); + + FindClose(handle); + + for (p = path + wcslen(path); p > path && p[-1] != L'\\';) + p--; + + if (!(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && + wcscmp(data.cFileName, p) != 0) + return (FALSE); + + return (TRUE); +} + +int +_shttpd_open(const char *path, int flags, int mode) +{ + char buf[FILENAME_MAX]; + wchar_t wbuf[FILENAME_MAX]; + + _shttpd_strlcpy(buf, path, sizeof(buf)); + fix_directory_separators(buf); + MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, sizeof(wbuf)); + + if (protect_against_code_disclosure(wbuf) == FALSE) + return (-1); + + return (_wopen(wbuf, flags)); +} + +int +_shttpd_stat(const char *path, struct stat *stp) +{ + char buf[FILENAME_MAX], *p; + wchar_t wbuf[FILENAME_MAX]; + + _shttpd_strlcpy(buf, path, sizeof(buf)); + fix_directory_separators(buf); + + p = buf + strlen(buf) - 1; + while (p > buf && *p == '\\' && p[-1] != ':') + *p-- = '\0'; + + MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, sizeof(wbuf)); + + return (_wstat(wbuf, (struct _stat *) stp)); +} + +int +_shttpd_remove(const char *path) +{ + char buf[FILENAME_MAX]; + wchar_t wbuf[FILENAME_MAX]; + + _shttpd_strlcpy(buf, path, sizeof(buf)); + fix_directory_separators(buf); + + MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, sizeof(wbuf)); + + return (_wremove(wbuf)); +} + +int +_shttpd_rename(const char *path1, const char *path2) +{ + char buf1[FILENAME_MAX]; + char buf2[FILENAME_MAX]; + wchar_t wbuf1[FILENAME_MAX]; + wchar_t wbuf2[FILENAME_MAX]; + + _shttpd_strlcpy(buf1, path1, sizeof(buf1)); + _shttpd_strlcpy(buf2, path2, sizeof(buf2)); + fix_directory_separators(buf1); + fix_directory_separators(buf2); + + MultiByteToWideChar(CP_UTF8, 0, buf1, -1, wbuf1, sizeof(wbuf1)); + MultiByteToWideChar(CP_UTF8, 0, buf2, -1, wbuf2, sizeof(wbuf2)); + + return (_wrename(wbuf1, wbuf2)); +} + +int +_shttpd_mkdir(const char *path, int mode) +{ + char buf[FILENAME_MAX]; + wchar_t wbuf[FILENAME_MAX]; + + _shttpd_strlcpy(buf, path, sizeof(buf)); + fix_directory_separators(buf); + + MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, sizeof(wbuf)); + + return (_wmkdir(wbuf)); +} + +static char * +wide_to_utf8(const wchar_t *str) +{ + char *buf = NULL; + if (str) { + int nchar = WideCharToMultiByte(CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL); + if (nchar > 0) { + buf = malloc(nchar); + if (!buf) + errno = ENOMEM; + else if (!WideCharToMultiByte(CP_UTF8, 0, str, -1, buf, nchar, NULL, NULL)) { + free(buf); + buf = NULL; + errno = EINVAL; + } + } else + errno = EINVAL; + } else + errno = EINVAL; + return buf; +} + +char * +_shttpd_getcwd(char *buffer, int maxlen) +{ + char *result = NULL; + wchar_t *wbuffer, *wresult; + + if (buffer) { + /* User-supplied buffer */ + wbuffer = malloc(maxlen * sizeof(wchar_t)); + if (wbuffer == NULL) + return NULL; + } else + /* Dynamically allocated buffer */ + wbuffer = NULL; + wresult = _wgetcwd(wbuffer, maxlen); + if (wresult) { + int err = errno; + if (buffer) { + /* User-supplied buffer */ + int n = WideCharToMultiByte(CP_UTF8, 0, wresult, -1, buffer, maxlen, NULL, NULL); + if (n == 0) + err = ERANGE; + free(wbuffer); + result = buffer; + } else { + /* Buffer allocated by _wgetcwd() */ + result = wide_to_utf8(wresult); + err = errno; + free(wresult); + } + errno = err; + } + return result; +} + +DIR * +opendir(const char *name) +{ + DIR *dir = NULL; + char path[FILENAME_MAX]; + wchar_t wpath[FILENAME_MAX]; + + if (name == NULL || name[0] == '\0') { + errno = EINVAL; + } else if ((dir = malloc(sizeof(*dir))) == NULL) { + errno = ENOMEM; + } else { + _shttpd_snprintf(path, sizeof(path), "%s/*", name); + fix_directory_separators(path); + MultiByteToWideChar(CP_UTF8, 0, path, -1, wpath, sizeof(wpath)); + dir->handle = FindFirstFileW(wpath, &dir->info); + + if (dir->handle != INVALID_HANDLE_VALUE) { + dir->result.d_name[0] = '\0'; + } else { + free(dir); + dir = NULL; + } + } + + return (dir); +} + +int +closedir(DIR *dir) +{ + int result = -1; + + if (dir != NULL) { + if (dir->handle != INVALID_HANDLE_VALUE) + result = FindClose(dir->handle) ? 0 : -1; + + free(dir); + } + + if (result == -1) + errno = EBADF; + + return (result); +} + +struct dirent * +readdir(DIR *dir) +{ + struct dirent *result = 0; + + if (dir && dir->handle != INVALID_HANDLE_VALUE) { + if(!dir->result.d_name || + FindNextFileW(dir->handle, &dir->info)) { + result = &dir->result; + + WideCharToMultiByte(CP_UTF8, 0, dir->info.cFileName, + -1, result->d_name, + sizeof(result->d_name), NULL, NULL); + } + } else { + errno = EBADF; + } + + return (result); +} + +int +_shttpd_set_non_blocking_mode(int fd) +{ + unsigned long on = 1; + + return (ioctlsocket(fd, FIONBIO, &on)); +} + +void +_shttpd_set_close_on_exec(int fd) +{ + fd = 0; /* Do nothing. There is no FD_CLOEXEC on Windows */ +} + +#if !defined(NO_CGI) + +struct threadparam { + SOCKET s; + HANDLE hPipe; + big_int_t content_len; +}; + + +enum ready_mode_t {IS_READY_FOR_READ, IS_READY_FOR_WRITE}; + +/* + * Wait until given socket is in ready state. Always return TRUE. + */ +static int +is_socket_ready(int sock, enum ready_mode_t mode) +{ + fd_set read_set, write_set; + + FD_ZERO(&read_set); + FD_ZERO(&write_set); + + if (mode == IS_READY_FOR_READ) + FD_SET(sock, &read_set); + else + FD_SET(sock, &write_set); + + select(sock + 1, &read_set, &write_set, NULL, NULL); + + return (TRUE); +} + +/* + * Thread function that reads POST data from the socket pair + * and writes it to the CGI process. + */ +static void//DWORD WINAPI +stdoutput(void *arg) +{ + struct threadparam *tp = arg; + int n, sent, stop = 0; + big_int_t total = 0; + DWORD k; + char buf[BUFSIZ]; + size_t max_recv; + + max_recv = min(sizeof(buf), tp->content_len - total); + while (!stop && + max_recv > 0 && + is_socket_ready(tp->s, IS_READY_FOR_READ) && + (n = recv(tp->s, buf, max_recv, 0)) > 0) { + if (n == -1 && ERRNO == EWOULDBLOCK) + continue; + for (sent = 0; !stop && sent < n; sent += k) + if (!WriteFile(tp->hPipe, buf + sent, n - sent, &k, 0)) + stop++; + total += n; + max_recv = min(sizeof(buf), tp->content_len - total); + } + + CloseHandle(tp->hPipe); /* Suppose we have POSTed everything */ + free(tp); +} + +/* + * Thread function that reads CGI output and pushes it to the socket pair. + */ +static void +stdinput(void *arg) +{ + struct threadparam *tp = arg; + static int ntotal; + int k, stop = 0; + DWORD n, sent; + char buf[BUFSIZ]; + + while (!stop && ReadFile(tp->hPipe, buf, sizeof(buf), &n, NULL)) { + ntotal += n; + for (sent = 0; !stop && sent < n; sent += k) { + if (is_socket_ready(tp->s, IS_READY_FOR_WRITE) && + (k = send(tp->s, buf + sent, n - sent, 0)) <= 0) { + if (k == -1 && ERRNO == EWOULDBLOCK) { + k = 0; + continue; + } + stop++; + } + } + } + CloseHandle(tp->hPipe); + + /* + * Windows is a piece of crap. When this thread closes its end + * of the socket pair, the other end (get_cgi() function) may loose + * some data. I presume, this happens if get_cgi() is not fast enough, + * and the data written by this end does not "push-ed" to the other + * end socket buffer. So after closesocket() the remaining data is + * gone. If I put shutdown() before closesocket(), that seems to + * fix the problem, but I am not sure this is the right fix. + * XXX (submitted by James Marshall) we do not do shutdown() on UNIX. + * If fork() is called from user callback, shutdown() messes up things. + */ + shutdown(tp->s, 2); + + closesocket(tp->s); + free(tp); + + _endthread(); +} + +static void +spawn_stdio_thread(int sock, HANDLE hPipe, void (*func)(void *), + big_int_t content_len) +{ + struct threadparam *tp; + DWORD tid; + + tp = malloc(sizeof(*tp)); + assert(tp != NULL); + + tp->s = sock; + tp->hPipe = hPipe; + tp->content_len = content_len; + _beginthread(func, 0, tp); +} + +int +_shttpd_spawn_process(struct conn *c, const char *prog, char *envblk, + char *envp[], int sock, const char *dir) +{ + HANDLE a[2], b[2], h[2], me; + DWORD flags; + char *p, *interp, cmdline[FILENAME_MAX], line[FILENAME_MAX]; + FILE *fp; + STARTUPINFOA si; + PROCESS_INFORMATION pi; + + me = GetCurrentProcess(); + flags = DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS; + + /* FIXME add error checking code here */ + CreatePipe(&a[0], &a[1], NULL, 0); + CreatePipe(&b[0], &b[1], NULL, 0); + DuplicateHandle(me, a[0], me, &h[0], 0, TRUE, flags); + DuplicateHandle(me, b[1], me, &h[1], 0, TRUE, flags); + + (void) memset(&si, 0, sizeof(si)); + (void) memset(&pi, 0, sizeof(pi)); + + /* XXX redirect CGI errors to the error log file */ + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; + si.wShowWindow = SW_HIDE; + si.hStdOutput = h[1]; + si.hStdInput = h[0]; + + /* If CGI file is a script, try to read the interpreter line */ + interp = c->ctx->options[OPT_CGI_INTERPRETER]; + if (interp == NULL) { + if ((fp = fopen(prog, "r")) != NULL) { + (void) fgets(line, sizeof(line), fp); + if (memcmp(line, "#!", 2) != 0) + line[2] = '\0'; + /* Trim whitespaces from interpreter name */ + for (p = &line[strlen(line) - 1]; p > line && + isspace(*p); p--) + *p = '\0'; + (void) fclose(fp); + } + interp = line + 2; + (void) _shttpd_snprintf(cmdline, sizeof(cmdline), "%s%s%s", + line + 2, line[2] == '\0' ? "" : " ", prog); + } + + if ((p = strrchr(prog, '/')) != NULL) + prog = p + 1; + + (void) _shttpd_snprintf(cmdline, sizeof(cmdline), "%s %s", interp, prog); + + (void) _shttpd_snprintf(line, sizeof(line), "%s", dir); + fix_directory_separators(line); + fix_directory_separators(cmdline); + + /* + * Spawn reader & writer threads before we create CGI process. + * Otherwise CGI process may die too quickly, loosing the data + */ + spawn_stdio_thread(sock, b[0], stdinput, 0); + spawn_stdio_thread(sock, a[1], stdoutput, c->rem.content_len); + + if (CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, + CREATE_NEW_PROCESS_GROUP, envblk, line, &si, &pi) == 0) { + _shttpd_elog(E_LOG, c, + "redirect: CreateProcess(%s): %d", cmdline, ERRNO); + return (-1); + } else { + CloseHandle(h[0]); + CloseHandle(h[1]); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } + + return (0); +} + +#endif /* !NO_CGI */ + +#define ID_TRAYICON 100 +#define ID_QUIT 101 +static NOTIFYICONDATA ni; + +static LRESULT CALLBACK +WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + POINT pt; + HMENU hMenu; + + switch (msg) { + case WM_COMMAND: + switch (LOWORD(wParam)) { + case ID_QUIT: + exit(EXIT_SUCCESS); + break; + } + break; + case WM_USER: + switch (lParam) { + case WM_RBUTTONUP: + case WM_LBUTTONUP: + case WM_LBUTTONDBLCLK: + hMenu = CreatePopupMenu(); + AppendMenu(hMenu, 0, ID_QUIT, "Exit SHTTPD"); + GetCursorPos(&pt); + TrackPopupMenu(hMenu, 0, pt.x, pt.y, 0, hWnd, NULL); + DestroyMenu(hMenu); + break; + } + break; + } + + return (DefWindowProc(hWnd, msg, wParam, lParam)); +} + +static void +systray(void *arg) +{ + WNDCLASS cls; + HWND hWnd; + MSG msg; + + (void) memset(&cls, 0, sizeof(cls)); + + cls.lpfnWndProc = (WNDPROC) WindowProc; + cls.hIcon = LoadIcon(NULL, IDI_APPLICATION); + cls.lpszClassName = "shttpd v." VERSION; + + if (!RegisterClass(&cls)) + _shttpd_elog(E_FATAL, NULL, "RegisterClass: %d", ERRNO); + else if ((hWnd = CreateWindow(cls.lpszClassName, "", + WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, NULL, NULL, NULL, arg)) == NULL) + _shttpd_elog(E_FATAL, NULL, "CreateWindow: %d", ERRNO); + ShowWindow(hWnd, SW_HIDE); + + ni.cbSize = sizeof(ni); + ni.uID = ID_TRAYICON; + ni.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; + ni.hIcon = LoadIcon(NULL, IDI_APPLICATION); + ni.hWnd = hWnd; + _shttpd_snprintf(ni.szTip, sizeof(ni.szTip), "SHTTPD web server"); + ni.uCallbackMessage = WM_USER; + Shell_NotifyIcon(NIM_ADD, &ni); + + while (GetMessage(&msg, hWnd, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } +} + +int +_shttpd_set_systray(struct shttpd_ctx *ctx, const char *opt) +{ + HWND hWnd; + char title[512]; + static WNDPROC oldproc; + + if (!_shttpd_is_true(opt)) + return (TRUE); + + FreeConsole(); + GetConsoleTitle(title, sizeof(title)); + hWnd = FindWindow(NULL, title); + ShowWindow(hWnd, SW_HIDE); + _beginthread(systray, 0, hWnd); + + return (TRUE); +} + +int +_shttpd_set_nt_service(struct shttpd_ctx *ctx, const char *action) +{ + SC_HANDLE hSCM, hService; + char path[FILENAME_MAX], key[128]; + HKEY hKey; + DWORD dwData; + + + if (!strcmp(action, "install")) { + if ((hSCM = OpenSCManager(NULL, NULL, + SC_MANAGER_ALL_ACCESS)) == NULL) + _shttpd_elog(E_FATAL, NULL, "Error opening SCM (%d)", ERRNO); + + GetModuleFileName(NULL, path, sizeof(path)); + + hService = CreateService(hSCM, SERVICE_NAME, SERVICE_NAME, + SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, + SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, path, + NULL, NULL, NULL, NULL, NULL); + + if (!hService) + _shttpd_elog(E_FATAL, NULL, + "Error installing service (%d)", ERRNO); + + ChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, + &service_descr); + _shttpd_elog(E_FATAL, NULL, "Service successfully installed"); + + + } else if (!strcmp(action, "uninstall")) { + + if ((hSCM = OpenSCManager(NULL, NULL, + SC_MANAGER_ALL_ACCESS)) == NULL) { + _shttpd_elog(E_FATAL, NULL, "Error opening SCM (%d)", ERRNO); + } else if ((hService = OpenService(hSCM, + SERVICE_NAME, DELETE)) == NULL) { + _shttpd_elog(E_FATAL, NULL, + "Error opening service (%d)", ERRNO); + } else if (!DeleteService(hService)) { + _shttpd_elog(E_FATAL, NULL, + "Error deleting service (%d)", ERRNO); + } else { + _shttpd_elog(E_FATAL, NULL, "Service deleted"); + } + + } else { + _shttpd_elog(E_FATAL, NULL, "Use -service "); + } + + /* NOTREACHED */ + return (TRUE); +} + +static void WINAPI +ControlHandler(DWORD code) +{ + if (code == SERVICE_CONTROL_STOP || code == SERVICE_CONTROL_SHUTDOWN) { + ss.dwWin32ExitCode = 0; + ss.dwCurrentState = SERVICE_STOPPED; + } + + SetServiceStatus(hStatus, &ss); +} + +static void WINAPI +ServiceMain(int argc, char *argv[]) +{ + char path[MAX_PATH], *p, *av[] = {"shttpd_service", path, NULL}; + struct shttpd_ctx *ctx; + + ss.dwServiceType = SERVICE_WIN32; + ss.dwCurrentState = SERVICE_RUNNING; + ss.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + + hStatus = RegisterServiceCtrlHandler(SERVICE_NAME, ControlHandler); + SetServiceStatus(hStatus, &ss); + + GetModuleFileName(NULL, path, sizeof(path)); + + if ((p = strrchr(path, DIRSEP)) != NULL) + *++p = '\0'; + + strcat(path, CONFIG_FILE); /* woo ! */ + + ctx = shttpd_init(NELEMS(av) - 1, av); + if ((ctx = shttpd_init(NELEMS(av) - 1, av)) == NULL) + _shttpd_elog(E_FATAL, NULL, "Cannot initialize SHTTP context"); + + while (ss.dwCurrentState == SERVICE_RUNNING) + shttpd_poll(ctx, INT_MAX); + shttpd_fini(ctx); + + ss.dwCurrentState = SERVICE_STOPPED; + ss.dwWin32ExitCode = -1; + SetServiceStatus(hStatus, &ss); +} + +void +try_to_run_as_nt_service(void) +{ + static SERVICE_TABLE_ENTRY service_table[] = { + {SERVICE_NAME, (LPSERVICE_MAIN_FUNCTION) ServiceMain}, + {NULL, NULL} + }; + + if (StartServiceCtrlDispatcher(service_table)) + exit(EXIT_SUCCESS); +} Added: trunk/libzypp/vendor/shttpd/compat_win32.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/compat_win32.h?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/compat_win32.h (added) +++ trunk/libzypp/vendor/shttpd/compat_win32.h Thu Oct 16 19:23:14 2008 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2004-2007 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +/* Tip from Justin Maximilian, suppress errors from winsock2.h */ +#define _WINSOCKAPI_ + +#include +#include +#include +#include +#include +#include + +#ifndef _WIN32_WCE + +#include +#include +#include + +#else /* _WIN32_WCE */ + +/* Windows CE-specific definitions */ +#define NO_CGI /* WinCE has no pipes */ +#define NO_GUI /* temporarily until it is fixed */ +#pragma comment(lib,"ws2") +/* WinCE has both Unicode and ANSI versions of GetProcAddress */ +#undef GetProcAddress +#define GetProcAddress GetProcAddressA +#include "compat_wince.h" + +#endif /* _WIN32_WCE */ + +#define ERRNO GetLastError() +#define NO_SOCKLEN_T +#define SSL_LIB L"ssleay32.dll" +#define DIRSEP '\\' +#define IS_DIRSEP_CHAR(c) ((c) == '/' || (c) == '\\') +#define O_NONBLOCK 0 +#define EWOULDBLOCK WSAEWOULDBLOCK +#define snprintf _snprintf +#define vsnprintf _vsnprintf +#define mkdir(x,y) _mkdir(x) +#define popen(x,y) _popen(x, y) +#define pclose(x) _pclose(x) +#define dlopen(x,y) LoadLibraryW(x) +#define dlsym(x,y) (void *) GetProcAddress(x,y) +#define _POSIX_ + +#ifdef __LCC__ +#include +#endif /* __LCC__ */ + +#ifdef _MSC_VER /* MinGW already has these */ +typedef unsigned int uint32_t; +typedef unsigned short uint16_t; +typedef __int64 uint64_t; +#define S_ISDIR(x) ((x) & _S_IFDIR) +#endif /* _MSC_VER */ + +/* + * POSIX dirent interface + */ +struct dirent { + char d_name[FILENAME_MAX]; +}; + +typedef struct DIR { + HANDLE handle; + WIN32_FIND_DATAW info; + struct dirent result; + char *name; +} DIR; + +extern DIR *opendir(const char *name); +extern int closedir(DIR *dir); +extern struct dirent *readdir(DIR *dir); Added: trunk/libzypp/vendor/shttpd/compat_wince.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/compat_wince.c?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/compat_wince.c (added) +++ trunk/libzypp/vendor/shttpd/compat_wince.c Thu Oct 16 19:23:14 2008 @@ -0,0 +1,1593 @@ +/* + vi:ts=8:sw=8:noet + * Copyright (c) 2006 Luke Dunstan + * Partly based on code by David Kashtan, Validus Medical Systems + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +/* + * This file provides various functions that are available on desktop Windows + * but not on Windows CE + */ + +#ifdef _MSC_VER +/* Level 4 warnings caused by windows.h */ +#pragma warning(disable : 4214) // nonstandard extension used : bit field types other than int +#pragma warning(disable : 4115) // named type definition in parentheses +#pragma warning(disable : 4201) // nonstandard extension used : nameless struct/union +#pragma warning(disable : 4514) // unreferenced inline function has been removed +#pragma warning(disable : 4244) // conversion from 'int ' to 'unsigned short ', possible loss of data +#pragma warning(disable : 4100) // unreferenced formal parameter +#endif + +#include +#include + +#include "compat_wince.h" + + +static WCHAR *to_wide_string(LPCSTR pStr) +{ + int nwide; + WCHAR *buf; + + if(pStr == NULL) + return NULL; + nwide = MultiByteToWideChar(CP_ACP, 0, pStr, -1, NULL, 0); + if(nwide == 0) + return NULL; + buf = malloc(nwide * sizeof(WCHAR)); + if(buf == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + if(MultiByteToWideChar(CP_ACP, 0, pStr, -1, buf, nwide) == 0) { + free(buf); + return NULL; + } + return buf; +} + +FILE *fdopen(int handle, const char *mode) +{ + WCHAR *wmode = to_wide_string(mode); + FILE *result; + + if(wmode != NULL) + result = _wfdopen((void *)handle, wmode); + else + result = NULL; + free(wmode); + return result; +} + +/* + * Time conversion constants + */ +#define FT_EPOCH (116444736000000000i64) +#define FT_TICKS (10000000i64) + + /* + * Convert a FILETIME to a time_t + */ +static time_t convert_FILETIME_to_time_t(FILETIME *File_Time) +{ + __int64 Temp; + + /* + * Convert the FILETIME structure to 100nSecs since 1601 (as a 64-bit value) + */ + Temp = (((__int64)File_Time->dwHighDateTime) << 32) + (__int64)File_Time->dwLowDateTime; + /* + * Convert to seconds from 1970 + */ + return((time_t)((Temp - FT_EPOCH) / FT_TICKS)); +} + +/* + * Convert a FILETIME to a tm structure + */ +static struct tm *Convert_FILETIME_To_tm(FILETIME *File_Time) +{ + SYSTEMTIME System_Time; + static struct tm tm = {0}; + static const short Day_Of_Year_By_Month[12] = {(short)(0), + (short)(31), + (short)(31 + 28), + (short)(31 + 28 + 31), + (short)(31 + 28 + 31 + 30), + (short)(31 + 28 + 31 + 30 + 31), + (short)(31 + 28 + 31 + 30 + 31 + 30), + (short)(31 + 28 + 31 + 30 + 31 + 30 + 31), + (short)(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31), + (short)(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30), + (short)(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31), + (short)(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30)}; + + + /* + * Turn the FILETIME into a SYSTEMTIME + */ + FileTimeToSystemTime(File_Time, &System_Time); + /* + * Use SYSTEMTIME to fill in the tm structure + */ + tm.tm_sec = System_Time.wSecond; + tm.tm_min = System_Time.wMinute; + tm.tm_hour = System_Time.wHour; + tm.tm_mday = System_Time.wDay; + tm.tm_mon = System_Time.wMonth - 1; + tm.tm_year = System_Time.wYear - 1900; + tm.tm_wday = System_Time.wDayOfWeek; + tm.tm_yday = Day_Of_Year_By_Month[tm.tm_mon] + tm.tm_mday - 1; + if (tm.tm_mon >= 2) { + /* + * Check for leap year (every 4 years but not every 100 years but every 400 years) + */ + if ((System_Time.wYear % 4) == 0) { + /* + * It Is a 4th year + */ + if ((System_Time.wYear % 100) == 0) { + /* + * It is a 100th year + */ + if ((System_Time.wYear % 400) == 0) { + /* + * It is a 400th year: It is a leap year + */ + tm.tm_yday++; + } + } else { + /* + * It is not a 100th year: It is a leap year + */ + tm.tm_yday++; + } + } + } + return(&tm); +} + +/* + * Convert a time_t to a FILETIME + */ +static void Convert_time_t_To_FILETIME(time_t Time, FILETIME *File_Time) +{ + __int64 Temp; + + /* + * Use 64-bit calculation to convert seconds since 1970 to + * 100nSecs since 1601 + */ + Temp = ((__int64)Time * FT_TICKS) + FT_EPOCH; + /* + * Put it into the FILETIME structure + */ + File_Time->dwLowDateTime = (DWORD)Temp; + File_Time->dwHighDateTime = (DWORD)(Temp >> 32); +} + +/* + * Convert a tm structure to a FILETIME + */ +static FILETIME *Convert_tm_To_FILETIME(struct tm *tm) +{ + SYSTEMTIME System_Time; + static FILETIME File_Time = {0}; + + /* + * Use the tm structure to fill in a SYSTEM + */ + System_Time.wYear = tm->tm_year + 1900; + System_Time.wMonth = tm->tm_mon + 1; + System_Time.wDayOfWeek = tm->tm_wday; + System_Time.wDay = tm->tm_mday; + System_Time.wHour = tm->tm_hour; + System_Time.wMinute = tm->tm_min; + System_Time.wSecond = tm->tm_sec; + System_Time.wMilliseconds = 0; + /* + * Convert it to a FILETIME and return it + */ + SystemTimeToFileTime(&System_Time, &File_Time); + return(&File_Time); +} + + +/************************************************************************/ +/* */ +/* Errno emulation: There is no errno on Windows/CE and we need */ +/* to make it per-thread. So we have a function */ +/* that returns a pointer to the errno for the */ +/* current thread. */ +/* */ +/* If there is ONLY the main thread then we can */ +/* quickly return some static storage. */ +/* */ +/* If we have multiple threads running, we use */ +/* Thread-Local Storage to hold the pointer */ +/* */ +/************************************************************************/ + +/* + * Function pointer for returning errno pointer + */ +static int *Initialize_Errno(void); +int *(*__WinCE_Errno_Pointer_Function)(void) = Initialize_Errno; + +/* + * Static errno storage for the main thread + */ +static int Errno_Storage = 0; + +/* + * Thread-Local storage slot for errno + */ +static int TLS_Errno_Slot = 0xffffffff; + +/* + * Number of threads we have running and critical section protection + * for manipulating it + */ +static int Number_Of_Threads = 0; +static CRITICAL_SECTION Number_Of_Threads_Critical_Section; + +/* + * For the main thread only -- return the errno pointer + */ +static int *Get_Main_Thread_Errno(void) +{ + return &Errno_Storage; +} + +/* + * When there is more than one thread -- return the errno pointer + */ +static int *Get_Thread_Errno(void) +{ + return (int *)TlsGetValue(TLS_Errno_Slot); +} + +/* + * Initialize a thread's errno + */ +static void Initialize_Thread_Errno(int *Errno_Pointer) +{ + /* + * Make sure we have a slot + */ + if (TLS_Errno_Slot == 0xffffffff) { + /* + * No: Get one + */ + TLS_Errno_Slot = (int)TlsAlloc(); + if (TLS_Errno_Slot == 0xffffffff) ExitProcess(3); + } + /* + * We can safely check for 0 threads, because + * only the main thread will be initializing + * at this point. Make sure the critical + * section that protects the number of threads + * is initialized + */ + if (Number_Of_Threads == 0) + InitializeCriticalSection(&Number_Of_Threads_Critical_Section); + /* + * Store the errno pointer + */ + if (TlsSetValue(TLS_Errno_Slot, (LPVOID)Errno_Pointer) == 0) ExitProcess(3); + /* + * Bump the number of threads + */ + EnterCriticalSection(&Number_Of_Threads_Critical_Section); + Number_Of_Threads++; + if (Number_Of_Threads > 1) { + /* + * We have threads other than the main thread: + * Use thread-local storage + */ + __WinCE_Errno_Pointer_Function = Get_Thread_Errno; + } + LeaveCriticalSection(&Number_Of_Threads_Critical_Section); +} + +/* + * Initialize errno emulation on Windows/CE (Main thread) + */ +static int *Initialize_Errno(void) +{ + /* + * Initialize the main thread's errno in thread-local storage + */ + Initialize_Thread_Errno(&Errno_Storage); + /* + * Set the errno function to be the one that returns the + * main thread's errno + */ + __WinCE_Errno_Pointer_Function = Get_Main_Thread_Errno; + /* + * Return the main thread's errno + */ + return &Errno_Storage; +} + +/* + * Initialize errno emulation on Windows/CE (New thread) + */ +void __WinCE_Errno_New_Thread(int *Errno_Pointer) +{ + Initialize_Thread_Errno(Errno_Pointer); +} + +/* + * Note that a thread has exited + */ +void __WinCE_Errno_Thread_Exit(void) +{ + /* + * Decrease the number of threads + */ + EnterCriticalSection(&Number_Of_Threads_Critical_Section); + Number_Of_Threads--; + if (Number_Of_Threads <= 1) { + /* + * We only have the main thread + */ + __WinCE_Errno_Pointer_Function = Get_Main_Thread_Errno; + } + LeaveCriticalSection(&Number_Of_Threads_Critical_Section); +} + + +char * +strerror(int errnum) +{ + return "(strerror not implemented)"; +} + +#define FT_EPOCH (116444736000000000i64) +#define FT_TICKS (10000000i64) + +int +_wstat(const WCHAR *path, struct _stat *buffer) +{ + WIN32_FIND_DATA data; + HANDLE handle; + WCHAR *p; + + /* Fail if wildcard characters are specified */ + if (wcscspn(path, L"?*") != wcslen(path)) + return -1; + + handle = FindFirstFile(path, &data); + if (handle == INVALID_HANDLE_VALUE) { + errno = GetLastError(); + return -1; + } + FindClose(handle); + + /* Found: Convert the file times */ + buffer->st_mtime = convert_FILETIME_to_time_t(&data.ftLastWriteTime); + if (data.ftLastAccessTime.dwLowDateTime || data.ftLastAccessTime.dwHighDateTime) + buffer->st_atime = convert_FILETIME_to_time_t(&data.ftLastAccessTime); + else + buffer->st_atime = buffer->st_mtime; + if (data.ftCreationTime.dwLowDateTime || data.ftCreationTime.dwHighDateTime) + buffer->st_ctime = convert_FILETIME_to_time_t(&data.ftCreationTime); + else + buffer->st_ctime = buffer->st_mtime; + + /* Convert the file modes */ + buffer->st_mode = (unsigned short)((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? (S_IFDIR | S_IEXEC) : S_IFREG); + buffer->st_mode |= (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? S_IREAD : (S_IREAD | S_IWRITE); + if((p = wcsrchr(path, L'.')) != NULL) { + p++; + if (_wcsicmp(p, L".exe") == 0) + buffer->st_mode |= S_IEXEC; + } + buffer->st_mode |= (buffer->st_mode & 0700) >> 3; + buffer->st_mode |= (buffer->st_mode & 0700) >> 6; + /* Set the other information */ + buffer->st_nlink = 1; + buffer->st_size = (unsigned long int)data.nFileSizeLow; + buffer->st_uid = 0; + buffer->st_gid = 0; + buffer->st_ino = 0 /*data.dwOID ?*/; + buffer->st_dev = 0; + + return 0; /* success */ +} + +/* + * Helper function for cemodule -- do an fstat() operation on a Win32 File Handle + */ +int +_fstat(int handle, struct _stat *st) +{ + BY_HANDLE_FILE_INFORMATION Data; + + /* + * Get the file information + */ + if (!GetFileInformationByHandle((HANDLE)handle, &Data)) { + /* + * Return error + */ + errno = GetLastError(); + return(-1); + } + /* + * Found: Convert the file times + */ + st->st_mtime=(time_t)((*(__int64*)&Data.ftLastWriteTime-FT_EPOCH)/FT_TICKS); + if(Data.ftLastAccessTime.dwLowDateTime || Data.ftLastAccessTime.dwHighDateTime) + st->st_atime=(time_t)((*(__int64*)&Data.ftLastAccessTime-FT_EPOCH)/FT_TICKS); + else + st->st_atime=st->st_mtime ; + if(Data.ftCreationTime.dwLowDateTime || Data.ftCreationTime.dwHighDateTime ) + st->st_ctime=(time_t)((*(__int64*)&Data.ftCreationTime-FT_EPOCH)/FT_TICKS); + else + st->st_ctime=st->st_mtime ; + /* + * Convert the file modes + */ + st->st_mode = (unsigned short)((Data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? (S_IFDIR | S_IEXEC) : S_IFREG); + st->st_mode |= (Data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? S_IREAD : (S_IREAD | S_IWRITE); + st->st_mode |= (st->st_mode & 0700) >> 3; + st->st_mode |= (st->st_mode & 0700) >> 6; + /* + * Set the other information + */ + st->st_nlink=1; + st->st_size=(unsigned long int)Data.nFileSizeLow; + st->st_uid=0; + st->st_gid=0; + st->st_ino=0; + st->st_dev=0; + /* + * Return success + */ + return(0); +} + +int _wopen(const wchar_t *filename, int oflag, ...) +{ + DWORD Access, ShareMode, CreationDisposition; + HANDLE Handle; + static int Modes[4] = {0, (GENERIC_READ | GENERIC_WRITE), GENERIC_READ, GENERIC_WRITE}; + + /* + * Calculate the CreateFile arguments + */ + Access = Modes[oflag & O_MODE_MASK]; + ShareMode = (oflag & O_EXCL) ? 0 : (FILE_SHARE_READ | FILE_SHARE_WRITE); + if (oflag & O_TRUNC) + CreationDisposition = (oflag & O_CREAT) ? CREATE_ALWAYS : TRUNCATE_EXISTING; + else + CreationDisposition = (oflag & O_CREAT) ? CREATE_NEW : OPEN_EXISTING; + + Handle = CreateFileW(filename, Access, ShareMode, NULL, CreationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); + + /* + * Deal with errors + */ + if (Handle == INVALID_HANDLE_VALUE) { + errno = GetLastError(); + if ((errno == ERROR_ALREADY_EXISTS) || (errno == ERROR_FILE_EXISTS)) + errno = ERROR_ALREADY_EXISTS; + return -1; + } + /* + * Return the handle + */ + return (int)Handle; +} + +int +_close(int handle) +{ + if(CloseHandle((HANDLE)handle)) + return 0; + errno = GetLastError(); + return -1; +} + +int +_write(int handle, const void *buffer, unsigned int count) +{ + DWORD numwritten = 0; + if(!WriteFile((HANDLE)handle, buffer, count, &numwritten, NULL)) { + errno = GetLastError(); + return -1; + } + return numwritten; +} + +int +_read(int handle, void *buffer, unsigned int count) +{ + DWORD numread = 0; + if(!ReadFile((HANDLE)handle, buffer, count, &numread, NULL)) { + errno = GetLastError(); + return -1; + } + return numread; +} + +long +_lseek(int handle, long offset, int origin) +{ + DWORD dwMoveMethod; + DWORD result; + + switch(origin) { + default: + errno = EINVAL; + return -1L; + case SEEK_SET: + dwMoveMethod = FILE_BEGIN; + break; + case SEEK_CUR: + dwMoveMethod = FILE_CURRENT; + break; + case SEEK_END: + dwMoveMethod = FILE_END; + break; + } + result = SetFilePointer((HANDLE)handle, offset, NULL, dwMoveMethod); + if(result == 0xFFFFFFFF) { + errno = GetLastError(); + return -1; + } + return (long)result; +} + +int +_wmkdir(const wchar_t *dirname) +{ + if(!CreateDirectoryW(dirname, NULL)) { + errno = GetLastError(); + return -1; + } + return 0; +} + +int +_wremove(const wchar_t *filename) +{ + if(!DeleteFileW(filename)) { + errno = GetLastError(); + return -1; + } + return 0; +} + +int +_wrename(const wchar_t *oldname, const wchar_t *newname) +{ + if(!MoveFileW(oldname, newname)) { + errno = GetLastError(); + return -1; + } + return 0; +} + +wchar_t * +_wgetcwd(wchar_t *buffer, int maxlen) +{ + wchar_t *result; + WCHAR wszPath[MAX_PATH + 1]; + WCHAR *p; + + if(!GetModuleFileNameW(NULL, wszPath, MAX_PATH + 1)) { + errno = GetLastError(); + return NULL; + } + /* Remove the filename part of the path to leave the directory */ + p = wcsrchr(wszPath, L'\\'); + if(p) + *p = L'\0'; + + if(buffer == NULL) + result = _wcsdup(wszPath); + else if(wcslen(wszPath) + 1 > (size_t)maxlen) { + result = NULL; + errno = ERROR_INSUFFICIENT_BUFFER; + } else { + wcsncpy(buffer, wszPath, maxlen); + buffer[maxlen - 1] = L'\0'; + result = buffer; + } + return result; +} + +/* + * The missing "C" runtime gmtime() function + */ +struct tm *gmtime(const time_t *TimeP) +{ + FILETIME File_Time; + + /* + * Deal with null time pointer + */ + if (!TimeP) return(NULL); + /* + * time_t -> FILETIME -> tm + */ + Convert_time_t_To_FILETIME(*TimeP, &File_Time); + return(Convert_FILETIME_To_tm(&File_Time)); +} + +/* + * The missing "C" runtime localtime() function + */ +struct tm *localtime(const time_t *TimeP) +{ + FILETIME File_Time, Local_File_Time; + + /* + * Deal with null time pointer + */ + if (!TimeP) return(NULL); + /* + * time_t -> FILETIME -> Local FILETIME -> tm + */ + Convert_time_t_To_FILETIME(*TimeP, &File_Time); + FileTimeToLocalFileTime(&File_Time, &Local_File_Time); + return(Convert_FILETIME_To_tm(&Local_File_Time)); +} + +/* + * The missing "C" runtime mktime() function + */ +time_t mktime(struct tm *tm) +{ + FILETIME *Local_File_Time; + FILETIME File_Time; + + /* + * tm -> Local FILETIME -> FILETIME -> time_t + */ + Local_File_Time = Convert_tm_To_FILETIME(tm); + LocalFileTimeToFileTime(Local_File_Time, &File_Time); + return(convert_FILETIME_to_time_t(&File_Time)); +} + +/* + * Missing "C" runtime time() function + */ +time_t time(time_t *TimeP) +{ + SYSTEMTIME System_Time; + FILETIME File_Time; + time_t Result; + + /* + * Get the current system time + */ + GetSystemTime(&System_Time); + /* + * SYSTEMTIME -> FILETIME -> time_t + */ + SystemTimeToFileTime(&System_Time, &File_Time); + Result = convert_FILETIME_to_time_t(&File_Time); + /* + * Return the time_t + */ + if (TimeP) *TimeP = Result; + return(Result); +} + +static char Standard_Name[32] = "GMT"; +static char Daylight_Name[32] = "GMT"; +char *tzname[2] = {Standard_Name, Daylight_Name}; +long timezone = 0; +int daylight = 0; + +void tzset(void) +{ + TIME_ZONE_INFORMATION Info; + int Result; + + /* + * Get our current timezone information + */ + Result = GetTimeZoneInformation(&Info); + switch(Result) { + /* + * We are on standard time + */ + case TIME_ZONE_ID_STANDARD: + daylight = 0; + break; + /* + * We are on daylight savings time + */ + case TIME_ZONE_ID_DAYLIGHT: + daylight = 1; + break; + /* + * We don't know the timezone information (leave it GMT) + */ + default: return; + } + /* + * Extract the timezone information + */ + timezone = Info.Bias * 60; + if (Info.StandardName[0]) + WideCharToMultiByte(CP_ACP, 0, Info.StandardName, -1, Standard_Name, sizeof(Standard_Name) - 1, NULL, NULL); + if (Info.DaylightName[0]) + WideCharToMultiByte(CP_ACP, 0, Info.DaylightName, -1, Daylight_Name, sizeof(Daylight_Name) - 1, NULL, NULL); +} + +/*** strftime() from newlib libc/time/strftime.c ***/ + +/* + * Sane snprintf(). Acts like snprintf(), but never return -1 or the + * value bigger than supplied buffer. + */ +static int +Snprintf(char *buf, size_t buflen, const char *fmt, ...) +{ + va_list ap; + int n; + + if (buflen == 0) + return (0); + + va_start(ap, fmt); + n = _vsnprintf(buf, buflen, fmt, ap); + va_end(ap); + + if (n < 0 || n > (int) buflen - 1) { + n = buflen - 1; + } + buf[n] = '\0'; + + return (n); +} + +#define snprintf Snprintf + +/* from libc/include/_ansi.h */ +#define _CONST const +#define _DEFUN(name, arglist, args) name(args) +#define _AND , +/* from libc/time/local.h */ +#define TZ_LOCK +#define TZ_UNLOCK +#define _tzname tzname +#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) +#define YEAR_BASE 1900 +#define SECSPERMIN 60L +#define MINSPERHOUR 60L +#define HOURSPERDAY 24L +#define SECSPERHOUR (SECSPERMIN * MINSPERHOUR) + +/* + * strftime.c + * Original Author: G. Haley + * Additions from: Eric Blake + * + * Places characters into the array pointed to by s as controlled by the string + * pointed to by format. If the total number of resulting characters including + * the terminating null character is not more than maxsize, returns the number + * of characters placed into the array pointed to by s (not including the + * terminating null character); otherwise zero is returned and the contents of + * the array indeterminate. + */ + +/* +FUNCTION +<<strftime>>---flexible calendar time formatter + +INDEX + strftime + +ANSI_SYNOPSIS + #include + size_t strftime(char *<[s]>, size_t <[maxsize]>, + const char *<[format]>, const struct tm *<[timp]>); + +TRAD_SYNOPSIS + #include + size_t strftime(<[s]>, <[maxsize]>, <[format]>, <[timp]>) + char *<[s]>; + size_t <[maxsize]>; + char *<[format]>; + struct tm *<[timp]>; + +DESCRIPTION +<<strftime>> converts a <<struct tm>> representation of the time (at +<[timp]>) into a null-terminated string, starting at <[s]> and occupying +no more than <[maxsize]> characters. + +You control the format of the output using the string at <[format]>. +<<*<[format]>>> can contain two kinds of specifications: text to be +copied literally into the formatted string, and time conversion +specifications. Time conversion specifications are two- and +three-character sequences beginning with `<<%>>' (use `<<%%>>' to +include a percent sign in the output). Each defined conversion +specification selects only the specified field(s) of calendar time +data from <<*<[timp]>>>, and converts it to a string in one of the +following ways: + +o+ +o %a +A three-letter abbreviation for the day of the week. [tm_wday] + +o %A +The full name for the day of the week, one of `<<Sunday>>', +`<<Monday>>', `<<Tuesday>>', `<<Wednesday>>', `<<Thursday>>', +`<<Friday>>', or `<<Saturday>>'. [tm_wday] + +o %b +A three-letter abbreviation for the month name. [tm_mon] + +o %B +The full name of the month, one of `<<January>>', `<<February>>', +`<<March>>', `<<April>>', `<<May>>', `<<June>>', `<<July>>', +`<<August>>', `<<September>>', `<<October>>', `<<November>>', +`<<December>>'. [tm_mon] + +o %c +A string representing the complete date and time, in the form +`<<"%a %b %e %H:%M:%S %Y">>' (example "Mon Apr 01 13:13:13 +1992"). [tm_sec, tm_min, tm_hour, tm_mday, tm_mon, tm_year, tm_wday] + +o %C +The century, that is, the year divided by 100 then truncated. For +4-digit years, the result is zero-padded and exactly two characters; +but for other years, there may a negative sign or more digits. In +this way, `<<%C%y>>' is equivalent to `<<%Y>>'. [tm_year] + +o %d +The day of the month, formatted with two digits (from `<<01>>' to +`<<31>>'). [tm_mday] + +o %D +A string representing the date, in the form `<<"%m/%d/%y">>'. +[tm_mday, tm_mon, tm_year] + +o %e +The day of the month, formatted with leading space if single digit +(from `<<1>>' to `<<31>>'). [tm_mday] + +o %E<<x>> +In some locales, the E modifier selects alternative representations of +certain modifiers <<x>>. But in the "C" locale supported by newlib, +it is ignored, and treated as %<<x>>. + +o %F +A string representing the ISO 8601:2000 date format, in the form +`<<"%Y-%m-%d">>'. [tm_mday, tm_mon, tm_year] + +o %g +The last two digits of the week-based year, see specifier %G (from +`<<00>>' to `<<99>>'). [tm_year, tm_wday, tm_yday] + +o %G +The week-based year. In the ISO 8601:2000 calendar, week 1 of the year +includes January 4th, and begin on Mondays. Therefore, if January 1st, +2nd, or 3rd falls on a Sunday, that day and earlier belong to the last +week of the previous year; and if December 29th, 30th, or 31st falls +on Monday, that day and later belong to week 1 of the next year. For +consistency with %Y, it always has at least four characters. +Example: "%G" for Saturday 2nd January 1999 gives "1998", and for +Tuesday 30th December 1997 gives "1998". [tm_year, tm_wday, tm_yday] + +o %h +A three-letter abbreviation for the month name (synonym for +"%b"). [tm_mon] + +o %H +The hour (on a 24-hour clock), formatted with two digits (from +`<<00>>' to `<<23>>'). [tm_hour] + +o %I +The hour (on a 12-hour clock), formatted with two digits (from +`<<01>>' to `<<12>>'). [tm_hour] + +o %j +The count of days in the year, formatted with three digits +(from `<<001>>' to `<<366>>'). [tm_yday] + +o %k +The hour (on a 24-hour clock), formatted with leading space if single +digit (from `<<0>>' to `<<23>>'). Non-POSIX extension. [tm_hour] + +o %l +The hour (on a 12-hour clock), formatted with leading space if single +digit (from `<<1>>' to `<<12>>'). Non-POSIX extension. [tm_hour] + +o %m +The month number, formatted with two digits (from `<<01>>' to `<<12>>'). +[tm_mon] + +o %M +The minute, formatted with two digits (from `<<00>>' to `<<59>>'). [tm_min] + +o %n +A newline character (`<<\n>>'). + +o %O<<x>> +In some locales, the O modifier selects alternative digit characters +for certain modifiers <<x>>. But in the "C" locale supported by newlib, it +is ignored, and treated as %<<x>>. + +o %p +Either `<<AM>>' or `<<PM>>' as appropriate. [tm_hour] + +o %r +The 12-hour time, to the second. Equivalent to "%I:%M:%S %p". [tm_sec, +tm_min, tm_hour] + +o %R +The 24-hour time, to the minute. Equivalent to "%H:%M". [tm_min, tm_hour] + +o %S +The second, formatted with two digits (from `<<00>>' to `<<60>>'). The +value 60 accounts for the occasional leap second. [tm_sec] + +o %t +A tab character (`<<\t>>'). + +o %T +The 24-hour time, to the second. Equivalent to "%H:%M:%S". [tm_sec, +tm_min, tm_hour] + +o %u +The weekday as a number, 1-based from Monday (from `<<1>>' to +`<<7>>'). [tm_wday] + +o %U +The week number, where weeks start on Sunday, week 1 contains the first +Sunday in a year, and earlier days are in week 0. Formatted with two +digits (from `<<00>>' to `<<53>>'). See also <<%W>>. [tm_wday, tm_yday] + +o %V +The week number, where weeks start on Monday, week 1 contains January 4th, +and earlier days are in the previous year. Formatted with two digits +(from `<<01>>' to `<<53>>'). See also <<%G>>. [tm_year, tm_wday, tm_yday] + +o %w +The weekday as a number, 0-based from Sunday (from `<<0>>' to `<<6>>'). +[tm_wday] + +o %W +The week number, where weeks start on Monday, week 1 contains the first +Monday in a year, and earlier days are in week 0. Formatted with two +digits (from `<<00>>' to `<<53>>'). [tm_wday, tm_yday] + +o %x +A string representing the complete date, equivalent to "%m/%d/%y". +[tm_mon, tm_mday, tm_year] + +o %X +A string representing the full time of day (hours, minutes, and +seconds), equivalent to "%H:%M:%S". [tm_sec, tm_min, tm_hour] + +o %y +The last two digits of the year (from `<<00>>' to `<<99>>'). [tm_year] + +o %Y +The full year, equivalent to <<%C%y>>. It will always have at least four +characters, but may have more. The year is accurate even when tm_year +added to the offset of 1900 overflows an int. [tm_year] + +o %z +The offset from UTC. The format consists of a sign (negative is west of +Greewich), two characters for hour, then two characters for minutes +(-hhmm or +hhmm). If tm_isdst is negative, the offset is unknown and no +output is generated; if it is zero, the offset is the standard offset for +the current time zone; and if it is positive, the offset is the daylight +savings offset for the current timezone. The offset is determined from +the TZ environment variable, as if by calling tzset(). [tm_isdst] + +o %Z +The time zone name. If tm_isdst is negative, no output is generated. +Otherwise, the time zone name is based on the TZ environment variable, +as if by calling tzset(). [tm_isdst] + +o %% +A single character, `<<%>>'. +o- + +RETURNS +When the formatted time takes up no more than <[maxsize]> characters, +the result is the length of the formatted string. Otherwise, if the +formatting operation was abandoned due to lack of room, the result is +<<0>>, and the string starting at <[s]> corresponds to just those +parts of <<*<[format]>>> that could be completely filled in within the +<[maxsize]> limit. + +PORTABILITY +ANSI C requires <<strftime>>, but does not specify the contents of +<<*<[s]>>> when the formatted string would require more than +<[maxsize]> characters. Unrecognized specifiers and fields of +<<timp>> that are out of range cause undefined results. Since some +formats expand to 0 bytes, it is wise to set <<*<[s]>>> to a nonzero +value beforehand to distinguish between failure and an empty string. +This implementation does not support <<s>> being NULL, nor overlapping +<<s>> and <<format>>. + +<<strftime>> requires no supporting OS subroutines. +*/ + +static _CONST int dname_len[7] = +{6, 6, 7, 9, 8, 6, 8}; + +static _CONST char *_CONST dname[7] = +{"Sunday", "Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday"}; + +static _CONST int mname_len[12] = +{7, 8, 5, 5, 3, 4, 4, 6, 9, 7, 8, 8}; + +static _CONST char *_CONST mname[12] = +{"January", "February", "March", "April", + "May", "June", "July", "August", "September", "October", "November", + "December"}; + +/* Using the tm_year, tm_wday, and tm_yday components of TIM_P, return + -1, 0, or 1 as the adjustment to add to the year for the ISO week + numbering used in "%g%G%V", avoiding overflow. */ +static int +_DEFUN (iso_year_adjust, (tim_p), + _CONST struct tm *tim_p) +{ + /* Account for fact that tm_year==0 is year 1900. */ + int leap = isleap (tim_p->tm_year + (YEAR_BASE + - (tim_p->tm_year < 0 ? 0 : 2000))); + + /* Pack the yday, wday, and leap year into a single int since there are so + many disparate cases. */ +#define PACK(yd, wd, lp) (((yd) << 4) + (wd << 1) + (lp)) + switch (PACK (tim_p->tm_yday, tim_p->tm_wday, leap)) + { + case PACK (0, 5, 0): /* Jan 1 is Fri, not leap. */ + case PACK (0, 6, 0): /* Jan 1 is Sat, not leap. */ + case PACK (0, 0, 0): /* Jan 1 is Sun, not leap. */ + case PACK (0, 5, 1): /* Jan 1 is Fri, leap year. */ + case PACK (0, 6, 1): /* Jan 1 is Sat, leap year. */ + case PACK (0, 0, 1): /* Jan 1 is Sun, leap year. */ + case PACK (1, 6, 0): /* Jan 2 is Sat, not leap. */ + case PACK (1, 0, 0): /* Jan 2 is Sun, not leap. */ + case PACK (1, 6, 1): /* Jan 2 is Sat, leap year. */ + case PACK (1, 0, 1): /* Jan 2 is Sun, leap year. */ + case PACK (2, 0, 0): /* Jan 3 is Sun, not leap. */ + case PACK (2, 0, 1): /* Jan 3 is Sun, leap year. */ + return -1; /* Belongs to last week of previous year. */ + case PACK (362, 1, 0): /* Dec 29 is Mon, not leap. */ + case PACK (363, 1, 1): /* Dec 29 is Mon, leap year. */ + case PACK (363, 1, 0): /* Dec 30 is Mon, not leap. */ + case PACK (363, 2, 0): /* Dec 30 is Tue, not leap. */ + case PACK (364, 1, 1): /* Dec 30 is Mon, leap year. */ + case PACK (364, 2, 1): /* Dec 30 is Tue, leap year. */ + case PACK (364, 1, 0): /* Dec 31 is Mon, not leap. */ + case PACK (364, 2, 0): /* Dec 31 is Tue, not leap. */ + case PACK (364, 3, 0): /* Dec 31 is Wed, not leap. */ + case PACK (365, 1, 1): /* Dec 31 is Mon, leap year. */ + case PACK (365, 2, 1): /* Dec 31 is Tue, leap year. */ + case PACK (365, 3, 1): /* Dec 31 is Wed, leap year. */ + return 1; /* Belongs to first week of next year. */ + } + return 0; /* Belongs to specified year. */ +#undef PACK +} + +size_t +_DEFUN (strftime, (s, maxsize, format, tim_p), + char *s _AND + size_t maxsize _AND + _CONST char *format _AND + _CONST struct tm *tim_p) +{ + size_t count = 0; + int i; + + for (;;) + { + while (*format && *format != '%') + { + if (count < maxsize - 1) + s[count++] = *format++; + else + return 0; + } + + if (*format == '\0') + break; + + format++; + if (*format == 'E' || *format == 'O') + format++; + + switch (*format) + { + case 'a': + for (i = 0; i < 3; i++) + { + if (count < maxsize - 1) + s[count++] = + dname[tim_p->tm_wday][i]; + else + return 0; + } + break; + case 'A': + for (i = 0; i < dname_len[tim_p->tm_wday]; i++) + { + if (count < maxsize - 1) + s[count++] = + dname[tim_p->tm_wday][i]; + else + return 0; + } + break; + case 'b': + case 'h': + for (i = 0; i < 3; i++) + { + if (count < maxsize - 1) + s[count++] = + mname[tim_p->tm_mon][i]; + else + return 0; + } + break; + case 'B': + for (i = 0; i < mname_len[tim_p->tm_mon]; i++) + { + if (count < maxsize - 1) + s[count++] = + mname[tim_p->tm_mon][i]; + else + return 0; + } + break; + case 'c': + { + /* Length is not known because of %C%y, so recurse. */ + size_t adjust = strftime (&s[count], maxsize - count, + "%a %b %e %H:%M:%S %C%y", tim_p); + if (adjust > 0) + count += adjust; + else + return 0; + } + break; + case 'C': + { + /* Examples of (tm_year + YEAR_BASE) that show how %Y == %C%y + with 32-bit int. + %Y %C %y + 2147485547 21474855 47 + 10000 100 00 + 9999 99 99 + 0999 09 99 + 0099 00 99 + 0001 00 01 + 0000 00 00 + -001 -0 01 + -099 -0 99 + -999 -9 99 + -1000 -10 00 + -10000 -100 00 + -2147481748 -21474817 48 + + Be careful of both overflow and sign adjustment due to the + asymmetric range of years. + */ + int neg = tim_p->tm_year < -YEAR_BASE; + int century = tim_p->tm_year >= 0 + ? tim_p->tm_year / 100 + YEAR_BASE / 100 + : abs (tim_p->tm_year + YEAR_BASE) / 100; + count += snprintf (&s[count], maxsize - count, "%s%.*d", + neg ? "-" : "", 2 - neg, century); + if (count >= maxsize) + return 0; + } + break; + case 'd': + case 'e': + if (count < maxsize - 2) + { + sprintf (&s[count], *format == 'd' ? "%.2d" : "%2d", + tim_p->tm_mday); + count += 2; + } + else + return 0; + break; + case 'D': + case 'x': + /* %m/%d/%y */ + if (count < maxsize - 8) + { + sprintf (&s[count], "%.2d/%.2d/%.2d", + tim_p->tm_mon + 1, tim_p->tm_mday, + tim_p->tm_year >= 0 ? tim_p->tm_year % 100 + : abs (tim_p->tm_year + YEAR_BASE) % 100); + count += 8; + } + else + return 0; + break; + case 'F': + { + /* Length is not known because of %C%y, so recurse. */ + size_t adjust = strftime (&s[count], maxsize - count, + "%C%y-%m-%d", tim_p); + if (adjust > 0) + count += adjust; + else + return 0; + } + break; + case 'g': + if (count < maxsize - 2) + { + /* Be careful of both overflow and negative years, thanks to + the asymmetric range of years. */ + int adjust = iso_year_adjust (tim_p); + int year = tim_p->tm_year >= 0 ? tim_p->tm_year % 100 + : abs (tim_p->tm_year + YEAR_BASE) % 100; + if (adjust < 0 && tim_p->tm_year <= -YEAR_BASE) + adjust = 1; + else if (adjust > 0 && tim_p->tm_year < -YEAR_BASE) + adjust = -1; + sprintf (&s[count], "%.2d", + ((year + adjust) % 100 + 100) % 100); + count += 2; + } + else + return 0; + break; + case 'G': + { + /* See the comments for 'C' and 'Y'; this is a variable length + field. Although there is no requirement for a minimum number + of digits, we use 4 for consistency with 'Y'. */ + int neg = tim_p->tm_year < -YEAR_BASE; + int adjust = iso_year_adjust (tim_p); + int century = tim_p->tm_year >= 0 + ? tim_p->tm_year / 100 + YEAR_BASE / 100 + : abs (tim_p->tm_year + YEAR_BASE) / 100; + int year = tim_p->tm_year >= 0 ? tim_p->tm_year % 100 + : abs (tim_p->tm_year + YEAR_BASE) % 100; + if (adjust < 0 && tim_p->tm_year <= -YEAR_BASE) + neg = adjust = 1; + else if (adjust > 0 && neg) + adjust = -1; + year += adjust; + if (year == -1) + { + year = 99; + --century; + } + else if (year == 100) + { + year = 0; + ++century; + } + count += snprintf (&s[count], maxsize - count, "%s%.*d%.2d", + neg ? "-" : "", 2 - neg, century, year); + if (count >= maxsize) + return 0; + } + break; + case 'H': + case 'k': + if (count < maxsize - 2) + { + sprintf (&s[count], *format == 'k' ? "%2d" : "%.2d", + tim_p->tm_hour); + count += 2; + } + else + return 0; + break; + case 'I': + case 'l': + if (count < maxsize - 2) + { + if (tim_p->tm_hour == 0 || + tim_p->tm_hour == 12) + { + s[count++] = '1'; + s[count++] = '2'; + } + else + { + sprintf (&s[count], *format == 'I' ? "%.2d" : "%2d", + tim_p->tm_hour % 12); + count += 2; + } + } + else + return 0; + break; + case 'j': + if (count < maxsize - 3) + { + sprintf (&s[count], "%.3d", + tim_p->tm_yday + 1); + count += 3; + } + else + return 0; + break; + case 'm': + if (count < maxsize - 2) + { + sprintf (&s[count], "%.2d", + tim_p->tm_mon + 1); + count += 2; + } + else + return 0; + break; + case 'M': + if (count < maxsize - 2) + { + sprintf (&s[count], "%.2d", + tim_p->tm_min); + count += 2; + } + else + return 0; + break; + case 'n': + if (count < maxsize - 1) + s[count++] = '\n'; + else + return 0; + break; + case 'p': + if (count < maxsize - 2) + { + if (tim_p->tm_hour < 12) + s[count++] = 'A'; + else + s[count++] = 'P'; + + s[count++] = 'M'; + } + else + return 0; + break; + case 'r': + if (count < maxsize - 11) + { + if (tim_p->tm_hour == 0 || + tim_p->tm_hour == 12) + { + s[count++] = '1'; + s[count++] = '2'; + } + else + { + sprintf (&s[count], "%.2d", tim_p->tm_hour % 12); + count += 2; + } + s[count++] = ':'; + sprintf (&s[count], "%.2d", + tim_p->tm_min); + count += 2; + s[count++] = ':'; + sprintf (&s[count], "%.2d", + tim_p->tm_sec); + count += 2; + s[count++] = ' '; + if (tim_p->tm_hour < 12) + s[count++] = 'A'; + else + s[count++] = 'P'; + + s[count++] = 'M'; + } + else + return 0; + break; + case 'R': + if (count < maxsize - 5) + { + sprintf (&s[count], "%.2d:%.2d", tim_p->tm_hour, tim_p->tm_min); + count += 5; + } + else + return 0; + break; + case 'S': + if (count < maxsize - 2) + { + sprintf (&s[count], "%.2d", + tim_p->tm_sec); + count += 2; + } + else + return 0; + break; + case 't': + if (count < maxsize - 1) + s[count++] = '\t'; + else + return 0; + break; + case 'T': + case 'X': + if (count < maxsize - 8) + { + sprintf (&s[count], "%.2d:%.2d:%.2d", tim_p->tm_hour, + tim_p->tm_min, tim_p->tm_sec); + count += 8; + } + else + return 0; + break; + case 'u': + if (count < maxsize - 1) + { + if (tim_p->tm_wday == 0) + s[count++] = '7'; + else + s[count++] = '0' + tim_p->tm_wday; + } + else + return 0; + break; + case 'U': + if (count < maxsize - 2) + { + sprintf (&s[count], "%.2d", + (tim_p->tm_yday + 7 - + tim_p->tm_wday) / 7); + count += 2; + } + else + return 0; + break; + case 'V': + if (count < maxsize - 2) + { + int adjust = iso_year_adjust (tim_p); + int wday = (tim_p->tm_wday) ? tim_p->tm_wday - 1 : 6; + int week = (tim_p->tm_yday + 10 - wday) / 7; + if (adjust > 0) + week = 1; + else if (adjust < 0) + /* Previous year has 53 weeks if current year starts on + Fri, and also if current year starts on Sat and + previous year was leap year. */ + week = 52 + (4 >= (wday - tim_p->tm_yday + - isleap (tim_p->tm_year + + (YEAR_BASE - 1 + - (tim_p->tm_year < 0 + ? 0 : 2000))))); + sprintf (&s[count], "%.2d", week); + count += 2; + } + else + return 0; + break; + case 'w': + if (count < maxsize - 1) + s[count++] = '0' + tim_p->tm_wday; + else + return 0; + break; + case 'W': + if (count < maxsize - 2) + { + int wday = (tim_p->tm_wday) ? tim_p->tm_wday - 1 : 6; + sprintf (&s[count], "%.2d", + (tim_p->tm_yday + 7 - wday) / 7); + count += 2; + } + else + return 0; + break; + case 'y': + if (count < maxsize - 2) + { + /* Be careful of both overflow and negative years, thanks to + the asymmetric range of years. */ + int year = tim_p->tm_year >= 0 ? tim_p->tm_year % 100 + : abs (tim_p->tm_year + YEAR_BASE) % 100; + sprintf (&s[count], "%.2d", year); + count += 2; + } + else + return 0; + break; + case 'Y': + { + /* Length is not known because of %C%y, so recurse. */ + size_t adjust = strftime (&s[count], maxsize - count, + "%C%y", tim_p); + if (adjust > 0) + count += adjust; + else + return 0; + } + break; + case 'z': +#ifndef _WIN32_WCE + if (tim_p->tm_isdst >= 0) + { + if (count < maxsize - 5) + { + long offset; + __tzinfo_type *tz = __gettzinfo (); + TZ_LOCK; + /* The sign of this is exactly opposite the envvar TZ. We + could directly use the global _timezone for tm_isdst==0, + but have to use __tzrule for daylight savings. */ + offset = -tz->__tzrule[tim_p->tm_isdst > 0].offset; + TZ_UNLOCK; + sprintf (&s[count], "%+03ld%.2ld", offset / SECSPERHOUR, + labs (offset / SECSPERMIN) % 60L); + count += 5; + } + else + return 0; + } + break; +#endif + case 'Z': + if (tim_p->tm_isdst >= 0) + { + int size; + TZ_LOCK; + size = strlen(_tzname[tim_p->tm_isdst > 0]); + for (i = 0; i < size; i++) + { + if (count < maxsize - 1) + s[count++] = _tzname[tim_p->tm_isdst > 0][i]; + else + { + TZ_UNLOCK; + return 0; + } + } + TZ_UNLOCK; + } + break; + case '%': + if (count < maxsize - 1) + s[count++] = '%'; + else + return 0; + break; + } + if (*format) + format++; + else + break; + } + if (maxsize) + s[count] = '\0'; + + return count; +} Added: trunk/libzypp/vendor/shttpd/compat_wince.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/compat_wince.h?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/compat_wince.h (added) +++ trunk/libzypp/vendor/shttpd/compat_wince.h Thu Oct 16 19:23:14 2008 @@ -0,0 +1,145 @@ + +#ifndef INCLUDE_WINCE_COMPAT_H +#define INCLUDE_WINCE_COMPAT_H + +#ifdef __cplusplus +extern "C" { +#endif + +/*** ANSI C library ***/ + +/* Missing ANSI C definitions */ + +#define BUFSIZ 4096 + +#define ENOMEM ERROR_NOT_ENOUGH_MEMORY +#define EBADF ERROR_INVALID_HANDLE +#define EINVAL ERROR_INVALID_PARAMETER +#define ENOENT ERROR_FILE_NOT_FOUND +#define ERANGE ERROR_INSUFFICIENT_BUFFER +#define EINTR WSAEINTR + +/* + * Because we need a per-thread errno, we define a function + * pointer that we can call to return a pointer to the errno + * for the current thread. Then we define a macro for errno + * that dereferences this function's result. + * + * This makes it syntactically just like the "real" errno. + * + * Using a function pointer allows us to use a very fast + * function when there are no threads running and a slower + * function when there are multiple threads running. + */ +void __WinCE_Errno_New_Thread(int *Errno_Pointer); +void __WinCE_Errno_Thread_Exit(void); +extern int *(*__WinCE_Errno_Pointer_Function)(void); + +#define errno (*(*__WinCE_Errno_Pointer_Function)()) + +char *strerror(int errnum); + +struct tm { + int tm_sec; /* seconds after the minute - [0,59] */ + int tm_min; /* minutes after the hour - [0,59] */ + int tm_hour; /* hours since midnight - [0,23] */ + int tm_mday; /* day of the month - [1,31] */ + int tm_mon; /* months since January - [0,11] */ + int tm_year; /* years since 1900 */ + int tm_wday; /* days since Sunday - [0,6] */ + int tm_yday; /* days since January 1 - [0,365] */ + int tm_isdst; /* daylight savings time flag */ +}; + +struct tm *gmtime(const time_t *TimeP); /* for future use */ +struct tm *localtime(const time_t *TimeP); +time_t mktime(struct tm *tm); +time_t time(time_t *TimeP); + +size_t strftime(char *s, size_t maxsize, const char *format, const struct tm *tim_p); + +int _wrename(const wchar_t *oldname, const wchar_t *newname); +int _wremove(const wchar_t *filename); + +/* Environment variables are not supported */ +#define getenv(x) (NULL) + +/* Redefine fileno so that it returns an integer */ +#undef fileno +#define fileno(f) (int)_fileno(f) + +/* Signals are not supported */ +#define signal(num, handler) (0) +#define SIGTERM 0 +#define SIGINT 0 + + +/*** POSIX API ***/ + +/* Missing POSIX definitions */ + +#define FILENAME_MAX MAX_PATH + +struct _stat { + unsigned long st_size; + unsigned long st_ino; + int st_mode; + unsigned long st_atime; + unsigned long st_mtime; + unsigned long st_ctime; + unsigned short st_dev; + unsigned short st_nlink; + unsigned short st_uid; + unsigned short st_gid; +}; + +#define S_IFMT 0170000 +#define S_IFDIR 0040000 +#define S_IFREG 0100000 +#define S_IEXEC 0000100 +#define S_IWRITE 0000200 +#define S_IREAD 0000400 + +#define _S_IFDIR S_IFDIR /* MSVCRT compatibilit */ + +int _fstat(int handle, struct _stat *buffer); +int _wstat(const wchar_t *path, struct _stat *buffer); + +#define stat _stat /* NOTE: applies to _stat() and also struct _stat */ +#define fstat _fstat + +#define O_RDWR (1<<0) +#define O_RDONLY (2<<0) +#define O_WRONLY (3<<0) +#define O_MODE_MASK (3<<0) +#define O_TRUNC (1<<2) +#define O_EXCL (1<<3) +#define O_CREAT (1<<4) +#define O_BINARY 0 + +int _wopen(const wchar_t *filename, int oflag, ...); +int _close(int handle); +int _write(int handle, const void *buffer, unsigned int count); +int _read(int handle, void *buffer, unsigned int count); +long _lseek(int handle, long offset, int origin); + +#define close _close +#define write _write +#define read _read +#define lseek _lseek + +/* WinCE has only a Unicode version of this function */ +FILE *fdopen(int handle, const char *mode); + +int _wmkdir(const wchar_t *dirname); + +/* WinCE has no concept of current directory so we return a constant path */ +wchar_t *_wgetcwd(wchar_t *buffer, int maxlen); + +#define freopen(path, mode, stream) assert(0) + +#ifdef __cplusplus +} +#endif + +#endif /* INCLUDE_WINCE_COMPAT_H */ Added: trunk/libzypp/vendor/shttpd/config.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/config.h?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/config.h (added) +++ trunk/libzypp/vendor/shttpd/config.h Thu Oct 16 19:23:14 2008 @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2004-2005 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#ifndef CONFIG_HEADER_DEFINED +#define CONFIG_HEADER_DEFINED + +#undef VERSION +#define VERSION "1.42" /* Version */ +#define CONFIG_FILE "shttpd.conf" /* Configuration file */ +#define HTPASSWD ".htpasswd" /* Passwords file name */ +#define URI_MAX 16384 /* Default max request size */ +#define LISTENING_PORTS "80" /* Default listening ports */ +#define INDEX_FILES "index.html,index.htm,index.php,index.cgi" +#define CGI_EXT "cgi,pl,php" /* Default CGI extensions */ +#define SSI_EXT "shtml,shtm" /* Default SSI extensions */ +#define REALM "mydomain.com" /* Default authentication realm */ +#define DELIM_CHARS "," /* Separators for lists */ +#define EXPIRE_TIME 3600 /* Expiration time, seconds */ +#define ENV_MAX 4096 /* Size of environment block */ +#define CGI_ENV_VARS 64 /* Maximum vars passed to CGI */ +#define SERVICE_NAME "SHTTPD " VERSION /* NT service name */ + +#endif /* CONFIG_HEADER_DEFINED */ Added: trunk/libzypp/vendor/shttpd/defs.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/defs.h?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/defs.h (added) +++ trunk/libzypp/vendor/shttpd/defs.h Thu Oct 16 19:23:14 2008 @@ -0,0 +1,395 @@ +/* + * Copyright (c) 2004-2005 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#ifndef DEFS_HEADER_DEFINED +#define DEFS_HEADER_DEFINED + +#include "std_includes.h" +#include "llist.h" +#include "io.h" +#include "md5.h" +#include "config.h" +#include "shttpd.h" + +#define NELEMS(ar) (sizeof(ar) / sizeof(ar[0])) + +#ifdef _DEBUG +#define DBG(x) do { printf x ; putchar('\n'); fflush(stdout); } while (0) +#else +#define DBG(x) +#endif /* DEBUG */ + +/* + * Darwin prior to 7.0 and Win32 do not have socklen_t + */ +#ifdef NO_SOCKLEN_T +typedef int socklen_t; +#endif /* NO_SOCKLEN_T */ + +/* + * For parsing. This guy represents a substring. + */ +struct vec { + const char *ptr; + int len; +}; + +#if !defined(FALSE) +enum {FALSE, TRUE}; +#endif /* !FALSE */ + +enum {METHOD_GET, METHOD_POST, METHOD_PUT, METHOD_DELETE, METHOD_HEAD}; +enum {HDR_DATE, HDR_INT, HDR_STRING}; /* HTTP header types */ +enum {E_FATAL = 1, E_LOG = 2}; /* Flags for elog() function */ +typedef unsigned long big_int_t; /* Type for Content-Length */ + +/* + * Unified socket address + */ +struct usa { + socklen_t len; + union { + struct sockaddr sa; + struct sockaddr_in sin; + } u; +}; + +/* + * This thing is aimed to hold values of any type. + * Used to store parsed headers' values. + */ +union variant { + char *v_str; + int v_int; + big_int_t v_big_int; + time_t v_time; + void (*v_func)(void); + void *v_void; + struct vec v_vec; +}; + +/* + * This is used only in embedded configuration. This structure holds a + * registered URI, associated callback function with callback data. + * For non-embedded compilation shttpd_callback_t is not defined, so + * we use union variant to keep the compiler silent. + */ +struct registered_uri { + struct llhead link; + const char *uri; + union variant callback; + void *callback_data; +}; + +/* + * User may want to handle certain errors. This structure holds the + * handlers for corresponding error codes. + */ +struct error_handler { + struct llhead link; + int code; + union variant callback; + void *callback_data; +}; + +struct http_header { + int len; /* Header name length */ + int type; /* Header type */ + size_t offset; /* Value placeholder */ + const char *name; /* Header name */ +}; + +/* + * This guy holds parsed HTTP headers + */ +struct headers { + union variant cl; /* Content-Length: */ + union variant ct; /* Content-Type: */ + union variant connection; /* Connection: */ + union variant ims; /* If-Modified-Since: */ + union variant user; /* Remote user name */ + union variant auth; /* Authorization */ + union variant useragent; /* User-Agent: */ + union variant referer; /* Referer: */ + union variant cookie; /* Cookie: */ + union variant location; /* Location: */ + union variant range; /* Range: */ + union variant status; /* Status: */ + union variant transenc; /* Transfer-Encoding: */ +}; + +/* Must go after union variant definition */ +#include "ssl.h" + +/* + * The communication channel + */ +union channel { + int fd; /* Regular static file */ + int sock; /* Connected socket */ + struct { + int sock; /* XXX important. must be first */ + SSL *ssl; /* shttpd_poll() assumes that */ + } ssl; /* SSL-ed socket */ + struct { + DIR *dirp; + char *path; + } dir; /* Opened directory */ + struct { + void *state; /* For keeping state */ + union variant func; /* User callback function */ + void *data; /* User defined parameters */ + } emb; /* Embedded, user callback */ +}; + +struct stream; + +/* + * IO class descriptor (file, directory, socket, SSL, CGI, etc) + * These classes are defined in io_*.c files. + */ +struct io_class { + const char *name; + int (*read)(struct stream *, void *buf, size_t len); + int (*write)(struct stream *, const void *buf, size_t len); + void (*close)(struct stream *); +}; + +/* + * Data exchange stream. It is backed by some communication channel: + * opened file, socket, etc. The 'read' and 'write' methods are + * determined by a communication channel. + */ +struct stream { + struct conn *conn; + union channel chan; /* Descriptor */ + struct io io; /* IO buffer */ + const struct io_class *io_class; /* IO class */ + int headers_len; + big_int_t content_len; + unsigned int flags; +#define FLAG_HEADERS_PARSED 1 +#define FLAG_SSL_ACCEPTED 2 +#define FLAG_R 4 /* Can read in general */ +#define FLAG_W 8 /* Can write in general */ +#define FLAG_CLOSED 16 +#define FLAG_DONT_CLOSE 32 +#define FLAG_ALWAYS_READY 64 /* File, dir, user_func */ +#define FLAG_SUSPEND 128 +}; + +struct worker { + struct llhead link; + int num_conns; /* Num of active connections */ + int exit_flag; /* Ditto - exit flag */ + int ctl[2]; /* Control socket pair */ + struct shttpd_ctx *ctx; /* Context reference */ + struct llhead connections; /* List of connections */ +}; + +struct conn { + struct llhead link; /* Connections chain */ + struct worker *worker; /* Worker this conn belongs to */ + struct shttpd_ctx *ctx; /* Context this conn belongs to */ + struct usa sa; /* Remote socket address */ + time_t birth_time; /* Creation time */ + time_t expire_time; /* Expiration time */ + + int loc_port; /* Local port */ + int status; /* Reply status code */ + int method; /* Request method */ + char *uri; /* Decoded URI */ + unsigned long major_version; /* Major HTTP version number */ + unsigned long minor_version; /* Minor HTTP version number */ + char *request; /* Request line */ + char *headers; /* Request headers */ + char *query; /* QUERY_STRING part of the URI */ + char *path_info; /* PATH_INFO thing */ + struct vec mime_type; /* Mime type */ + + struct headers ch; /* Parsed client headers */ + + struct stream loc; /* Local stream */ + struct stream rem; /* Remote stream */ + +#if !defined(NO_SSI) + void *ssi; /* SSI descriptor */ +#endif /* NO_SSI */ +}; + +enum { + OPT_ROOT, OPT_INDEX_FILES, OPT_PORTS, OPT_DIR_LIST, + OPT_CGI_EXTENSIONS, OPT_CGI_INTERPRETER, OPT_CGI_ENVIRONMENT, + OPT_SSI_EXTENSIONS, OPT_AUTH_REALM, OPT_AUTH_GPASSWD, + OPT_AUTH_PUT, OPT_ACCESS_LOG, OPT_ERROR_LOG, OPT_MIME_TYPES, + OPT_SSL_CERTIFICATE, OPT_ALIASES, OPT_ACL, OPT_INETD, OPT_UID, + OPT_CFG_URI, OPT_PROTECT, OPT_SERVICE, OPT_HIDE, OPT_THREADS, + NUM_OPTIONS +}; + +/* + * SHTTPD context + */ +struct shttpd_ctx { + SSL_CTX *ssl_ctx; /* SSL context */ + + struct llhead registered_uris;/* User urls */ + struct llhead error_handlers; /* Embedded error handlers */ + struct llhead acl; /* Access control list */ + struct llhead ssi_funcs; /* SSI callback functions */ + struct llhead listeners; /* Listening sockets */ + struct llhead workers; /* Worker workers */ + + FILE *access_log; /* Access log stream */ + FILE *error_log; /* Error log stream */ + + char *options[NUM_OPTIONS]; /* Configurable options */ +#if defined(__rtems__) + rtems_id mutex; +#endif /* _WIN32 */ +}; + +struct listener { + struct llhead link; + struct shttpd_ctx *ctx; /* Context that socket belongs */ + int sock; /* Listening socket */ + int is_ssl; /* Should be SSL-ed */ +}; + +/* Types of messages that could be sent over the control socket */ +enum {CTL_PASS_SOCKET, CTL_WAKEUP}; + +/* + * In SHTTPD, list of values are represented as comma or space separated + * string. For example, list of CGI extensions can be represented as + * ".cgi,.php,.pl", or ".cgi .php .pl". The macro that follows allows to + * loop through the individual values in that list. + * + * A "const char *" pointer and size_t variable must be passed to the macro. + * Spaces or commas can be used as delimiters (macro DELIM_CHARS). + * + * In every iteration of the loop, "s" points to the current value, and + * "len" specifies its length. The code inside loop must not change + * "s" and "len" parameters. + */ +#define FOR_EACH_WORD_IN_LIST(s,len) \ + for (; s != NULL && (len = strcspn(s, DELIM_CHARS)) != 0; \ + s += len, s+= strspn(s, DELIM_CHARS)) + +/* + * IPv4 ACL entry. Specifies subnet with deny/allow flag + */ +struct acl { + struct llhead link; + uint32_t ip; /* IP, in network byte order */ + uint32_t mask; /* Also in network byte order */ + int flag; /* Either '+' or '-' */ +}; + +/* + * shttpd.c + */ +extern time_t _shttpd_current_time; /* Current UTC time */ +extern int _shttpd_tz_offset; /* Offset from GMT time zone */ +extern const struct vec _shttpd_known_http_methods[]; + +extern void _shttpd_stop_stream(struct stream *stream); +extern int _shttpd_url_decode(const char *, int, char *dst, int); +extern void _shttpd_send_server_error(struct conn *, int, const char *); +extern int _shttpd_get_headers_len(const char *buf, size_t buflen); +extern void _shttpd_parse_headers(const char *s, int, struct headers *); +extern int _shttpd_is_true(const char *str); +extern int _shttpd_socketpair(int pair[2]); +extern void _shttpd_get_mime_type(struct shttpd_ctx *, + const char *, int, struct vec *); + +#define IS_TRUE(ctx, opt) _shttpd_is_true((ctx)->options[opt]) + +/* + * config.c + */ +extern void _shttpd_usage(const char *prog); + +/* + * log.c + */ +extern void _shttpd_elog(int flags, struct conn *c, const char *fmt, ...); +extern void _shttpd_log_access(FILE *fp, const struct conn *c); + +/* + * string.c + */ +extern void _shttpd_strlcpy(register char *, register const char *, size_t); +extern int _shttpd_strncasecmp(register const char *, + register const char *, size_t); +extern char *_shttpd_strndup(const char *ptr, size_t len); +extern char *_shttpd_strdup(const char *str); +extern int _shttpd_snprintf(char *buf, size_t len, const char *fmt, ...); +extern int _shttpd_match_extension(const char *path, const char *ext_list); + +/* + * compat_*.c + */ +extern void _shttpd_set_close_on_exec(int fd); +extern int _shttpd_set_non_blocking_mode(int fd); +extern int _shttpd_stat(const char *, struct stat *stp); +extern int _shttpd_open(const char *, int flags, int mode); +extern int _shttpd_remove(const char *); +extern int _shttpd_rename(const char *, const char *); +extern int _shttpd_mkdir(const char *, int); +extern char * _shttpd_getcwd(char *, int); +extern int _shttpd_spawn_process(struct conn *c, const char *prog, + char *envblk, char *envp[], int sock, const char *dir); + +extern int _shttpd_set_nt_service(struct shttpd_ctx *, const char *); +extern int _shttpd_set_systray(struct shttpd_ctx *, const char *); +extern void _shttpd_try_to_run_as_nt_service(void); + +/* + * io_*.c + */ +extern const struct io_class _shttpd_io_file; +extern const struct io_class _shttpd_io_socket; +extern const struct io_class _shttpd_io_ssl; +extern const struct io_class _shttpd_io_cgi; +extern const struct io_class _shttpd_io_dir; +extern const struct io_class _shttpd_io_embedded; +extern const struct io_class _shttpd_io_ssi; + +extern int _shttpd_put_dir(const char *path); +extern void _shttpd_get_dir(struct conn *c); +extern void _shttpd_get_file(struct conn *c, struct stat *stp); +extern void _shttpd_ssl_handshake(struct stream *stream); +extern void _shttpd_setup_embedded_stream(struct conn *, + union variant, void *); +extern struct registered_uri *_shttpd_is_registered_uri(struct shttpd_ctx *, + const char *uri); +extern void _shttpd_do_ssi(struct conn *); +extern void _shttpd_ssi_func_destructor(struct llhead *lp); + +/* + * auth.c + */ +extern int _shttpd_check_authorization(struct conn *c, const char *path); +extern int _shttpd_is_authorized_for_put(struct conn *c); +extern void _shttpd_send_authorization_request(struct conn *c); +extern int _shttpd_edit_passwords(const char *fname, const char *domain, + const char *user, const char *pass); + +/* + * cgi.c + */ +extern int _shttpd_run_cgi(struct conn *c, const char *prog); +extern void _shttpd_do_cgi(struct conn *c); + +#define CGI_REPLY "HTTP/1.1 OK\r\n" +#define CGI_REPLY_LEN (sizeof(CGI_REPLY) - 1) + +#endif /* DEFS_HEADER_DEFINED */ Added: trunk/libzypp/vendor/shttpd/io.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/io.h?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/io.h (added) +++ trunk/libzypp/vendor/shttpd/io.h Thu Oct 16 19:23:14 2008 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2004-2005 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#ifndef IO_HEADER_INCLUDED +#define IO_HEADER_INCLUDED + +#include +#include + +/* + * I/O buffer descriptor + */ +struct io { + char *buf; /* IO Buffer */ + size_t size; /* IO buffer size */ + size_t head; /* Bytes read */ + size_t tail; /* Bytes written */ + size_t total; /* Total bytes read */ +}; + +static __inline void +io_clear(struct io *io) +{ + assert(io->buf != NULL); + assert(io->size > 0); + io->total = io->tail = io->head = 0; +} + +static __inline char * +io_space(struct io *io) +{ + assert(io->buf != NULL); + assert(io->size > 0); + assert(io->head <= io->size); + return (io->buf + io->head); +} + +static __inline char * +io_data(struct io *io) +{ + assert(io->buf != NULL); + assert(io->size > 0); + assert(io->tail <= io->size); + return (io->buf + io->tail); +} + +static __inline size_t +io_space_len(const struct io *io) +{ + assert(io->buf != NULL); + assert(io->size > 0); + assert(io->head <= io->size); + return (io->size - io->head); +} + +static __inline size_t +io_data_len(const struct io *io) +{ + assert(io->buf != NULL); + assert(io->size > 0); + assert(io->head <= io->size); + assert(io->tail <= io->head); + return (io->head - io->tail); +} + +static __inline void +io_inc_tail(struct io *io, size_t n) +{ + assert(io->buf != NULL); + assert(io->size > 0); + assert(io->tail <= io->head); + assert(io->head <= io->size); + io->tail += n; + assert(io->tail <= io->head); + if (io->tail == io->head) + io->head = io->tail = 0; +} + +static __inline void +io_inc_head(struct io *io, size_t n) +{ + assert(io->buf != NULL); + assert(io->size > 0); + assert(io->tail <= io->head); + io->head += n; + io->total += n; + assert(io->head <= io->size); +} + +#endif /* IO_HEADER_INCLUDED */ Added: trunk/libzypp/vendor/shttpd/io_cgi.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/io_cgi.c?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/io_cgi.c (added) +++ trunk/libzypp/vendor/shttpd/io_cgi.c Thu Oct 16 19:23:14 2008 @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2004-2005 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#include "defs.h" + +static int +write_cgi(struct stream *stream, const void *buf, size_t len) +{ + assert(stream->chan.sock != -1); + assert(stream->flags & FLAG_W); + + return (send(stream->chan.sock, buf, len, 0)); +} + +static int +read_cgi(struct stream *stream, void *buf, size_t len) +{ + struct headers parsed; + char status[4]; + int n; + + assert(stream->chan.sock != -1); + assert(stream->flags & FLAG_R); + + stream->flags &= ~FLAG_DONT_CLOSE; + + n = recv(stream->chan.sock, buf, len, 0); + + if (stream->flags & FLAG_HEADERS_PARSED) + return (n); + + if (n <= 0 && ERRNO != EWOULDBLOCK) { + _shttpd_send_server_error(stream->conn, 500, + "Error running CGI"); + return (n); + } + + /* + * CGI script may output Status: and Location: headers, which + * may alter the status code. Buffer in headers, parse + * them, send correct status code and then forward all data + * from CGI script back to the remote end. + * Reply line was alredy appended to the IO buffer in + * decide_what_to_do(), with blank status code. + */ + + stream->flags |= FLAG_DONT_CLOSE; + io_inc_head(&stream->io, n); + + stream->headers_len = _shttpd_get_headers_len(stream->io.buf, + stream->io.head); + if (stream->headers_len < 0) { + stream->flags &= ~FLAG_DONT_CLOSE; + _shttpd_send_server_error(stream->conn, 500, + "Bad headers sent"); + _shttpd_elog(E_LOG, stream->conn, + "CGI script sent invalid headers: " + "[%.*s]", stream->io.head - CGI_REPLY_LEN, + stream->io.buf + CGI_REPLY_LEN); + return (0); + } + + /* + * If we did not received full headers yet, we must not send any + * data read from the CGI back to the client. Suspend sending by + * setting tail = head, which tells that there is no data in IO buffer + */ + + if (stream->headers_len == 0) { + stream->io.tail = stream->io.head; + return (0); + } + + /* Received all headers. Set status code for the connection. */ + (void) memset(&parsed, 0, sizeof(parsed)); + _shttpd_parse_headers(stream->io.buf, stream->headers_len, &parsed); + stream->content_len = parsed.cl.v_big_int; + stream->conn->status = (int) parsed.status.v_big_int; + + /* If script outputs 'Location:' header, set status code to 302 */ + if (parsed.location.v_vec.len > 0) + stream->conn->status = 302; + + /* + * If script did not output neither 'Location:' nor 'Status' headers, + * set the default status code 200, which means 'success'. + */ + if (stream->conn->status == 0) + stream->conn->status = 200; + + /* Append the status line to the beginning of the output */ + (void) _shttpd_snprintf(status, + sizeof(status), "%3d", stream->conn->status); + (void) memcpy(stream->io.buf + 9, status, 3); + DBG(("read_cgi: content len %lu status %s", + stream->content_len, status)); + + /* Next time, pass output directly back to the client */ + assert((big_int_t) stream->headers_len <= stream->io.total); + stream->io.total -= stream->headers_len; + stream->io.tail = 0; + stream->flags |= FLAG_HEADERS_PARSED; + + /* Return 0 because we've already shifted the head */ + return (0); +} + +static void +close_cgi(struct stream *stream) +{ + assert(stream->chan.sock != -1); + (void) closesocket(stream->chan.sock); +} + +const struct io_class _shttpd_io_cgi = { + "cgi", + read_cgi, + write_cgi, + close_cgi +}; Added: trunk/libzypp/vendor/shttpd/io_dir.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/vendor/shttpd/io_dir.c?rev=11382&view=auto ============================================================================== --- trunk/libzypp/vendor/shttpd/io_dir.c (added) +++ trunk/libzypp/vendor/shttpd/io_dir.c Thu Oct 16 19:23:14 2008 @@ -0,0 +1,153 @@ +/* + * Copyright (c) 2004-2005 Sergey Lyubka + * All rights reserved + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#include "defs.h" + +/* + * For a given PUT path, create all intermediate subdirectories + * for given path. Return 0 if the path itself is a directory, + * or -1 on error, 1 if OK. + */ +int +_shttpd_put_dir(const char *path) +{ + char buf[FILENAME_MAX]; + const char *s, *p; + struct stat st; + size_t len; + + for (s = p = path + 2; (p = strchr(s, '/')) != NULL; s = ++p) { + len = p - path; + assert(len < sizeof(buf)); + (void) memcpy(buf, path, len); + buf[len] = '\0'; + + /* Try to create intermediate directory */ + if (_shttpd_stat(buf, &st) == -1 && + _shttpd_mkdir(buf, 0755) != 0) + return (-1); + + /* Is path itself a directory ? */ + if (p[1] == '\0') + return (0); + } + + return (1); +} + +static int +read_dir(struct stream *stream, void *buf, size_t len) +{ + static const char footer[] = "</table></body></html>\n"; + + struct dirent *dp = NULL; + char file[FILENAME_MAX], line[FILENAME_MAX + 512], + size[64], mod[64]; + struct stat st; + struct conn *c = stream->conn; + int n, nwritten = 0; + const char *slash = ""; + + assert(stream->chan.dir.dirp != NULL); + assert(stream->conn->uri[0] != '\0'); + + do { + if (len < sizeof(line)) + break; + + if ((dp = readdir(stream->chan.dir.dirp)) == NULL) + break; + DBG(("read_dir: %s", dp->d_name)); + + /* Do not show current dir and passwords file */ + if (strcmp(dp->d_name, ".") == 0 || + strcmp(dp->d_name, HTPASSWD) == 0) + continue; + + (void) _shttpd_snprintf(file, sizeof(file), + "%s%s%s", stream->chan.dir.path, slash, dp->d_name); + (void) _shttpd_stat(file, &st); + if (S_ISDIR(st.st_mode)) { + _shttpd_snprintf(size,sizeof(size),"%s","<DIR>"); + } else { + if (st.st_size < 1024) + (void) _shttpd_snprintf(size, sizeof(size), + "%lu", (unsigned long) st.st_size); + else if (st.st_size < 1024 * 1024) + (void) _shttpd_snprintf(size, + sizeof(size), "%luk", + (unsigned long) (st.st_size >> 10) + 1); + else + (void) _shttpd_snprintf(size, sizeof(size), + "%.1fM", (float) st.st_size / 1048576); + } + (void) strftime(mod, sizeof(mod), "%d-%b-%Y %H:%M", + localtime(&st.st_mtime)); + + n = _shttpd_snprintf(line, sizeof(line), + "<tr><td>%s%s</a></td>" + "<td> %s</td><td>  %s</td></tr>\n", + c->uri, slash, dp->d_name, dp->d_name, + S_ISDIR(st.st_mode) ? "/" : "", mod, size); + (void) memcpy(buf, line, n); + buf = (char *) buf + n; + nwritten += n; + len -= n; + } while (dp != NULL); + + /* Append proper HTML footer for the page */ + if (dp == NULL && len >= sizeof(footer)) { + (void) memcpy(buf, footer, sizeof(footer)); + nwritten += sizeof(footer); + stream->flags |= FLAG_CLOSED; + } + + return (nwritten); +} + +static void +close_dir(struct stream *stream) +{ + assert(stream->chan.dir.dirp != NULL); + assert(stream->chan.dir.path != NULL); + (void) closedir(stream->chan.dir.dirp); + free(stream->chan.dir.path); +} + +void +_shttpd_get_dir(struct conn *c) +{ + if ((c->loc.chan.dir.dirp = opendir(c->loc.chan.dir.path)) == NULL) { + (void) free(c->loc.chan.dir.path); + _shttpd_send_server_error(c, 500, "Cannot open directory"); + } else { + c->loc.io.head = _shttpd_snprintf(c->loc.io.buf, c->loc.io.size, + "HTTP/1.1 200 OK\r\n" + "Connection: close\r\n" + "Content-Type: text/html; charset=utf-8\r\n\r\n" + "<html><head><title>Index of %s</title>" + "<style>th {text-align: left;}</style></head>" + "<body><h1>Index of %s</h1><pre>