diff -Naur original/lib/config-plan9.h port/lib/config-plan9.h --- original/lib/config-plan9.h 1970-01-01 01:00:00.000000000 +0100 +++ port/lib/config-plan9.h 2012-04-03 08:01:53.140074060 +0200 @@ -0,0 +1,26 @@ +/* manually added definitions requested during compilation on Plan9 */ + +#include "curl_config.h" + +#define HAVE_POSIX_STRERROR_R 1 + +#define HAVE_SYS_SELECT 1 +#define HAVE_SELECT 1 +#define HAVE_SYS_SOCKET_H 1 +#define HAVE_UNISTD_H 1 + +#define VALID_SOCK(x) 1 +#define VERIFY_SOCK(x) 0 /* no idea what I should put here but this at least makes stuff compile */ + +#define TRUE 1 +#define FALSE 0 + +#include +#define EWOULDBLOCK EAGAIN +#define EISCONN EISCON + + + + + + diff -Naur original/lib/cookie.c port/lib/cookie.c --- original/lib/cookie.c 2011-11-04 23:32:55.000000000 +0100 +++ port/lib/cookie.c 2012-04-02 18:27:05.000000000 +0200 @@ -75,7 +75,7 @@ Session_Key@6791a9e0-901a-11d0-a1c8-9b012c88aa77=none;expires=Monday, 13-Jun-1988 03:04:55 GMT; domain=.fidelity.com; path=/; secure ****/ - +/* find: tok_buf */ /* plan9 bunny cookies! yaay! */ #include "setup.h" @@ -496,7 +496,7 @@ if(ptr) *ptr=0; /* clear it */ - firstptr=strtok_r(lineptr, "\t", &tok_buf); /* tokenize it on the TAB */ + firstptr= (char *) strtok_r(lineptr, "\t", &tok_buf); /* tokenize it on the TAB */ /* Here's a quick check to eliminate normal HTTP-headers from this */ if(!firstptr || strchr(firstptr, ':')) { @@ -507,7 +507,7 @@ /* Now loop through the fields and init the struct we already have allocated */ for(ptr=firstptr, fields=0; ptr && !badcookie; - ptr=strtok_r(NULL, "\t", &tok_buf), fields++) { + ptr= (char *) strtok_r(NULL, "\t", &tok_buf), fields++) { switch(fields) { case 0: if(ptr[0]=='.') /* skip preceding dots */ @@ -518,7 +518,7 @@ break; case 1: /* This field got its explanation on the 23rd of May 2001 by - Andrés García: + Andr�s Garc�a: flag: A TRUE/FALSE value indicating if all machines within a given domain can access the variable. This value is set automatically by @@ -532,7 +532,7 @@ case 2: /* It turns out, that sometimes the file format allows the path field to remain not filled in, we try to detect this and work - around it! Andrés García made us aware of this... */ + around it! Andr�s Garc�a made us aware of this... */ if(strcmp("TRUE", ptr) && strcmp("FALSE", ptr)) { /* only if the path doesn't look like a boolean option! */ co->path = strdup(ptr); diff -Naur original/lib/mkfile port/lib/mkfile --- original/lib/mkfile 1970-01-01 01:00:00.000000000 +0100 +++ port/lib/mkfile 2012-03-19 20:38:00.000000000 +0100 @@ -0,0 +1,249 @@ + mkfile + diff -Naur original/lib/select.c port/lib/select.c --- original/lib/select.c 2011-11-04 23:32:56.000000000 +0100 +++ port/lib/select.c 2012-03-19 20:02:24.000000000 +0100 @@ -19,6 +19,7 @@ * KIND, either express or implied. * ***************************************************************************/ +/* find: pollfd */ #include "setup.h" @@ -56,6 +57,45 @@ #define error_not_EINTR (error != EINTR) #endif +/* for some reason, the definintions from "select.h" did not carry over... */ +/*perhaps I need to change the order of the include files... */ + +#if defined PLAN9 +#define POLLIN 0x01 +#define POLLPRI 0x02 +#define POLLOUT 0x04 +#define POLLERR 0x08 +#define POLLHUP 0x10 +#define POLLNVAL 0x20 + +struct pollfd +{ + curl_socket_t fd; + short events; + short revents; +}; + +#ifndef POLLRDNORM +#define POLLRDNORM POLLIN +#endif + +#ifndef POLLWRNORM +#define POLLWRNORM POLLOUT +#endif + +#ifndef POLLRDBAND +#define POLLRDBAND POLLPRI +#endif + +int Curl_socket_ready(curl_socket_t readfd, curl_socket_t writefd, + long timeout_ms); + +int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms); + +int Curl_wait_ms(int timeout_ms); + +#endif + /* * Internal function used for waiting a specific amount of ms * in Curl_socket_ready() and Curl_poll() when no file descriptor diff -Naur original/lib/select.h port/lib/select.h --- original/lib/select.h 2011-11-04 23:32:56.000000000 +0100 +++ port/lib/select.h 2012-04-03 07:55:42.896734109 +0200 @@ -21,6 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ +/* Curl_socket_ready */ #include "setup.h" @@ -96,9 +97,10 @@ fd_set* excepts, struct timeval* tv); #endif +#ifndef PLAN9 /* Winsock and TPF sockets are not in range [0..FD_SETSIZE-1], which unfortunately makes it impossible for us to easily check if they're valid -*/ +*/ /* Plan9 also had issues with this */ #if defined(USE_WINSOCK) || defined(TPF) #define VALID_SOCK(x) 1 #define VERIFY_SOCK(x) Curl_nop_stmt @@ -111,5 +113,7 @@ } \ } WHILE_FALSE #endif +#endif /* Plan9 got messed up here. Defined in config-plan9.h */ + #endif /* __SELECT_H */ diff -Naur original/lib/setup.h port/lib/setup.h --- original/lib/setup.h 2011-11-04 23:32:57.000000000 +0100 +++ port/lib/setup.h 2012-03-19 19:35:29.000000000 +0100 @@ -74,6 +74,10 @@ # include "config-vxworks.h" #endif +#ifdef PLAN9 +#include "config-plan9.h" +#endif + #endif /* HAVE_CONFIG_H */ /* ================================================================ */ diff -Naur original/mkfile port/mkfile --- original/mkfile 1970-01-01 01:00:00.000000000 +0100 +++ port/mkfile 2012-04-01 03:04:26.000000000 +0200 @@ -0,0 +1,19 @@ +, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +#include "setup.h" + +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#ifdef HAVE_SYS_IOCTL_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_FCNTL_H +#include +#endif + +#if (defined(HAVE_IOCTL_FIONBIO) && defined(NETWARE)) +#include +#endif +#ifdef __VMS +#include +#include +#endif + +#include "nonblock.h" + +/* + * curlx_nonblock() set the given socket to either blocking or non-blocking + * mode based on the 'nonblock' boolean argument. This function is highly + * portable. + */ +int curlx_nonblock(curl_socket_t sockfd, /* operate on this */ + int nonblock /* TRUE or FALSE */) +{ +#if defined(USE_BLOCKING_SOCKETS) + + return 0; /* returns success */ + +#elif defined(HAVE_FCNTL_O_NONBLOCK) + + /* most recent unix versions */ + int flags; + flags = fcntl(sockfd, F_GETFL, 0); + if(nonblock) + return fcntl(sockfd, F_SETFL, flags | O_NONBLOCK); + else + return fcntl(sockfd, F_SETFL, flags & (~O_NONBLOCK)); + +#elif defined(HAVE_IOCTL_FIONBIO) + + /* older unix versions */ + int flags = nonblock ? 1 : 0; + return ioctl(sockfd, FIONBIO, &flags); + +#elif defined(HAVE_IOCTLSOCKET_FIONBIO) + + /* Windows */ + unsigned long flags = nonblock ? 1UL : 0UL; + return ioctlsocket(sockfd, FIONBIO, &flags); + +#elif defined(HAVE_IOCTLSOCKET_CAMEL_FIONBIO) + + /* Amiga */ + long flags = nonblock ? 1L : 0L; + return IoctlSocket(sockfd, FIONBIO, flags); + +#elif defined(HAVE_SETSOCKOPT_SO_NONBLOCK) + + /* BeOS */ + long b = nonblock ? 1L : 0L; + return setsockopt(sockfd, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b)); + +#else +# error "no non-blocking method was found/used/set" +#endif +} diff -Naur original/src/rawstr.c port/src/rawstr.c --- original/src/rawstr.c 1970-01-01 01:00:00.000000000 +0100 +++ port/src/rawstr.c 2012-03-20 01:17:30.000000000 +0100 @@ -0,0 +1,142 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +#include "setup.h" + +#include "rawstr.h" + +/* Portable, consistent toupper (remember EBCDIC). Do not use toupper() because + its behavior is altered by the current locale. */ +char Curl_raw_toupper(char in) +{ + switch (in) { + case 'a': + return 'A'; + case 'b': + return 'B'; + case 'c': + return 'C'; + case 'd': + return 'D'; + case 'e': + return 'E'; + case 'f': + return 'F'; + case 'g': + return 'G'; + case 'h': + return 'H'; + case 'i': + return 'I'; + case 'j': + return 'J'; + case 'k': + return 'K'; + case 'l': + return 'L'; + case 'm': + return 'M'; + case 'n': + return 'N'; + case 'o': + return 'O'; + case 'p': + return 'P'; + case 'q': + return 'Q'; + case 'r': + return 'R'; + case 's': + return 'S'; + case 't': + return 'T'; + case 'u': + return 'U'; + case 'v': + return 'V'; + case 'w': + return 'W'; + case 'x': + return 'X'; + case 'y': + return 'Y'; + case 'z': + return 'Z'; + } + return in; +} + +/* + * Curl_raw_equal() is for doing "raw" case insensitive strings. This is meant + * to be locale independent and only compare strings we know are safe for + * this. See http://daniel.haxx.se/blog/2008/10/15/strcasecmp-in-turkish/ for + * some further explanation to why this function is necessary. + * + * The function is capable of comparing a-z case insensitively even for + * non-ascii. + */ + +int Curl_raw_equal(const char *first, const char *second) +{ + while(*first && *second) { + if(Curl_raw_toupper(*first) != Curl_raw_toupper(*second)) + /* get out of the loop as soon as they don't match */ + break; + first++; + second++; + } + /* we do the comparison here (possibly again), just to make sure that if the + loop above is skipped because one of the strings reached zero, we must not + return this as a successful match */ + return (Curl_raw_toupper(*first) == Curl_raw_toupper(*second)); +} + +int Curl_raw_nequal(const char *first, const char *second, size_t max) +{ + while(*first && *second && max) { + if(Curl_raw_toupper(*first) != Curl_raw_toupper(*second)) { + break; + } + max--; + first++; + second++; + } + if(0 == max) + return 1; /* they are equal this far */ + + return Curl_raw_toupper(*first) == Curl_raw_toupper(*second); +} + +/* Copy an upper case version of the string from src to dest. The + * strings may overlap. No more than n characters of the string are copied + * (including any NUL) and the destination string will NOT be + * NUL-terminated if that limit is reached. + */ +void Curl_strntoupper(char *dest, const char *src, size_t n) +{ + if(n < 1) + return; + + do { + *dest++ = Curl_raw_toupper(*src); + } while(*src++ && --n); +} diff -Naur original/src/README.Plan9 port/src/README.Plan9 --- original/src/README.Plan9 1970-01-01 01:00:00.000000000 +0100 +++ port/src/README.Plan9 2012-03-20 01:23:01.000000000 +0100 @@ -0,0 +1,10 @@ +Makefile.inc gave some interesting info on needed files. +the files represented by CURLX_ONES +term% cp ../lib/strdup.c . +term% cp ../lib/rawstr.c . +term% cp ../lib/nonblock.c . + + +mkfile generated by: + +mkmk -o curl -a -S -B -I. -I../lib -I../include -I../include/curl -I/sys/include/ape -I/$objtype/include/ape -I/sys/src/cmd/gs/zlib -DPLAN9 -D_POSIX_SOURCE -D_SUSV2_SOURCE -D_BSD_EXTENSION -D_REENTRANT_SOURCE -DNEED_REENTRANT -D_EXPERIMENTAL_SOURCE -D_C99_SNPRINTF_EXTENSION -x .deps -H/$objtype/lib/ape/libssl.a -H/$objtype/lib/ape/libcrypto.a -H/$objtype/lib/ape/libz.a -H/$objtype/lib/ape/libbz2.a -H/$objtype/lib/ape/libcurl.a > mkfile diff -Naur original/src/setup.h port/src/setup.h --- original/src/setup.h 2011-11-04 23:32:58.000000000 +0100 +++ port/src/setup.h 2012-03-20 01:24:48.000000000 +0100 @@ -66,6 +66,10 @@ #include "config-tpf.h" #endif +#ifdef PLAN9 +#include "config-plan9.h" +#endif + #endif /* HAVE_CONFIG_H */ /* diff -Naur original/src/strdup.c port/src/strdup.c --- original/src/strdup.c 1970-01-01 01:00:00.000000000 +0100 +++ port/src/strdup.c 2012-03-20 01:17:02.000000000 +0100 @@ -0,0 +1,50 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +#include "setup.h" + +#include "strdup.h" + +#ifndef HAVE_STRDUP +char *curlx_strdup(const char *str) +{ + size_t len; + char *newstr; + + if(!str) + return (char *)NULL; + + len = strlen(str); + + if(len >= ((size_t)-1) / sizeof(char)) + return (char *)NULL; + + newstr = malloc((len+1)*sizeof(char)); + if(!newstr) + return (char *)NULL; + + memcpy(newstr,str,(len+1)*sizeof(char)); + + return newstr; + +} +#endif diff -Naur original/src/tool_cb_skt.c port/src/tool_cb_skt.c --- original/src/tool_cb_skt.c 2011-11-04 23:32:58.000000000 +0100 +++ port/src/tool_cb_skt.c 2012-03-20 01:35:44.000000000 +0100 @@ -27,6 +27,12 @@ # include #endif +#ifdef PLAN9 +/* for some reason this did not carry over */ +/* found in APE sys/socket.h */ +#define SO_KEEPALIVE 0x0008 /* keep connections alive */ +#endif + #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ #include "curlx.h"