diff options
Diffstat (limited to 'WWW')
-rw-r--r-- | WWW/Library/Implementation/HTAABrow.h | 43 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTAAUtil.h | 5 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTFTP.c | 4 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTFile.c | 5 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTFormat.h | 8 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTNews.c | 3 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTTCP.c | 5 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTUtils.h | 10 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTVMS_WaisUI.c | 6 | ||||
-rw-r--r-- | WWW/Library/Implementation/LYexit.h | 22 | ||||
-rw-r--r-- | WWW/Library/Implementation/tidy_tls.h | 5 | ||||
-rw-r--r-- | WWW/Library/Implementation/www_tcp.h | 9 |
12 files changed, 69 insertions, 56 deletions
diff --git a/WWW/Library/Implementation/HTAABrow.h b/WWW/Library/Implementation/HTAABrow.h index 94034254..064f11e3 100644 --- a/WWW/Library/Implementation/HTAABrow.h +++ b/WWW/Library/Implementation/HTAABrow.h @@ -1,5 +1,5 @@ /* - * $LynxId: HTAABrow.h,v 1.15 2010/09/25 11:42:32 tom Exp $ + * $LynxId: HTAABrow.h,v 1.16 2010/10/27 00:13:53 tom Exp $ * * BROWSER SIDE ACCESS AUTHORIZATION MODULE @@ -40,8 +40,7 @@ extern "C" { #endif /* - -Routines for Browser Side Recording of AA Info + Routines for Browser Side Recording of AA Info Most of the browser-side AA is done by the following two functions (which are called from file HTTP.c so the browsers using libwww only need to be linked with the new @@ -55,24 +54,26 @@ Routines for Browser Side Recording of AA Info HTAA_shouldRetryWithAuth() determines whether to retry the request with AA or with a new AA (in case username or password was misspelled). - *//* PUBLIC HTAA_composeAuth() - * - * COMPOSE THE ENTIRE AUTHORIZATION HEADER LINE IF WE - * ALREADY KNOW, THAT THE HOST MIGHT REQUIRE AUTHORIZATION - * - * ON ENTRY: - * hostname is the hostname of the server. - * portnumber is the portnumber in which the server runs. - * docname is the pathname of the document (as in URL) - * - * ON EXIT: - * returns NULL, if no authorization seems to be needed, or - * if it is the entire Authorization: line, e.g. - * - * "Authorization: basic username:password" - * - * As usual, this string is automatically freed. - */ extern char *HTAA_composeAuth(const char *hostname, + */ +/* PUBLIC HTAA_composeAuth() + * + * COMPOSE THE ENTIRE AUTHORIZATION HEADER LINE IF WE + * ALREADY KNOW, THAT THE HOST MIGHT REQUIRE AUTHORIZATION + * + * ON ENTRY: + * hostname is the hostname of the server. + * portnumber is the portnumber in which the server runs. + * docname is the pathname of the document (as in URL) + * + * ON EXIT: + * returns NULL, if no authorization seems to be needed, or + * if it is the entire Authorization: line, e.g. + * + * "Authorization: basic username:password" + * + * As usual, this string is automatically freed. + */ + extern char *HTAA_composeAuth(const char *hostname, const int portnumber, const char *docname, int IsProxy); diff --git a/WWW/Library/Implementation/HTAAUtil.h b/WWW/Library/Implementation/HTAAUtil.h index 1fd9ee75..33a8ee30 100644 --- a/WWW/Library/Implementation/HTAAUtil.h +++ b/WWW/Library/Implementation/HTAAUtil.h @@ -1,5 +1,5 @@ /* - * $LynxId: HTAAUtil.h,v 1.12 2010/06/17 00:36:04 tom Exp $ + * $LynxId: HTAAUtil.h,v 1.13 2010/10/27 00:09:52 tom Exp $ * * Utilities for the Authorization parts of libwww * COMMON PARTS OF AUTHORIZATION MODULE TO BOTH SERVER AND BROWSER @@ -48,7 +48,8 @@ extern "C" { #define MAX_FIELDNAME_LEN 16 /* @@ Longest field name in */ /* protection setup file */ #define MAX_PATHNAME_LEN 80 /* @@ Longest passwd/group file */ -/* pathname to allow *//* +/* pathname to allow */ +/* Datatype definitions diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c index 0786d2f3..7ac5d208 100644 --- a/WWW/Library/Implementation/HTFTP.c +++ b/WWW/Library/Implementation/HTFTP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTFTP.c,v 1.98 2010/09/25 00:05:51 tom Exp $ + * $LynxId: HTFTP.c,v 1.99 2010/10/31 17:56:13 tom Exp $ * * File Transfer Protocol (FTP) Client * for a WorldWideWeb browser @@ -133,7 +133,7 @@ typedef struct _connection { #elif defined(SYS_HPUX) # if defined(_XOPEN_SOURCE_EXTENDED) && defined(SO_PROTOTYPE) # define LY_SOCKLEN socklen_t -# else /* HPUX 10.20, etc. */ +# else /* HPUX 10.20, etc. */ # define LY_SOCKLEN int # endif #elif defined(SYS_TRU64) diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c index f8ea537f..5d692616 100644 --- a/WWW/Library/Implementation/HTFile.c +++ b/WWW/Library/Implementation/HTFile.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTFile.c,v 1.126 2010/09/24 08:52:55 tom Exp $ + * $LynxId: HTFile.c,v 1.127 2010/10/27 00:10:02 tom Exp $ * * File Access HTFile.c * =========== @@ -31,7 +31,8 @@ #define LONG_LIST /* Define this for long style unix listings (ls -l), the actual style is configurable from lynx.cfg */ #endif -/* #define NO_PARENT_DIR_REFERENCE *//* Define this for no parent links */ +/* #define NO_PARENT_DIR_REFERENCE */ +/* Define this for no parent links */ #endif /* !VMS */ #if defined(DOSPATH) diff --git a/WWW/Library/Implementation/HTFormat.h b/WWW/Library/Implementation/HTFormat.h index a2c15902..1e82fd76 100644 --- a/WWW/Library/Implementation/HTFormat.h +++ b/WWW/Library/Implementation/HTFormat.h @@ -1,5 +1,5 @@ /* - * $LynxId: HTFormat.h,v 1.32 2010/09/25 11:42:03 tom Exp $ + * $LynxId: HTFormat.h,v 1.33 2010/10/27 00:13:53 tom Exp $ * * HTFormat: The format manager in the WWW Library * MANAGE DIFFERENT DOCUMENT FORMATS @@ -44,7 +44,11 @@ extern "C" { useful for diagnostics, and for users who want to see the original, whatever it is. - *//* Internal ones *//* #define WWW_SOURCE HTAtom_for("www/source") *//* Whatever it was originally */ extern HTAtom *WWW_SOURCE; + */ +/* Internal ones */ +/* #define WWW_SOURCE HTAtom_for("www/source") */ +/* Whatever it was originally */ + extern HTAtom *WWW_SOURCE; /* calculated once, heavy used */ /* diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c index ab4a6cb5..eda9bf58 100644 --- a/WWW/Library/Implementation/HTNews.c +++ b/WWW/Library/Implementation/HTNews.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTNews.c,v 1.66 2010/09/25 00:42:40 tom Exp $ + * $LynxId: HTNews.c,v 1.67 2010/10/27 00:10:51 tom Exp $ * * NEWS ACCESS HTNews.c * =========== @@ -94,7 +94,6 @@ static int s; /* Socket for NewsHost */ static int HTCanPost = FALSE; /* Current POST permission */ static char response_text[LINE_LENGTH + 1]; /* Last response */ -/* static HText * HT; *//* the new hypertext */ static HTStructured *target; /* The output sink */ static HTStructuredClass targetClass; /* Copy of fn addresses */ static HTStream *rawtarget = NULL; /* The output sink for rawtext */ diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index ec456175..d85f2d35 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTTCP.c,v 1.104 2010/09/25 11:32:53 tom Exp $ + * $LynxId: HTTCP.c,v 1.105 2010/10/27 00:11:11 tom Exp $ * * Generic Communication Code HTTCP.c * ========================== @@ -77,9 +77,6 @@ static char *hostname = NULL; /* The name of this host */ unsigned long socks_bind_remoteAddr; /* for long Rbind */ #endif /* SOCKS */ -/* PUBLIC SockA HTHostAddress; *//* The internet address of the host */ - /* Valid after call to HTHostName() */ - /* Encode INET status (as in sys/errno.h) inet_status() * ------------------ * diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index ba10b1b3..cdc0a09e 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -1,5 +1,5 @@ /* - * $LynxId: HTUtils.h,v 1.102 2010/09/25 15:32:56 tom Exp $ + * $LynxId: HTUtils.h,v 1.103 2010/10/27 00:08:52 tom Exp $ * * Utility macros for the W3 code library * MACROS FOR GENERAL USE @@ -157,12 +157,12 @@ char *alloca(); #define LY_MAXPATH 256 #endif -#ifndef GCC_NORETURN -#define GCC_NORETURN /* nothing */ +#ifndef GCC_NORETURN +#define GCC_NORETURN /* nothing */ #endif -#ifndef GCC_UNUSED -#define GCC_UNUSED /* nothing */ +#ifndef GCC_UNUSED +#define GCC_UNUSED /* nothing */ #endif #if defined(__GNUC__) && defined(_FORTIFY_SOURCE) diff --git a/WWW/Library/Implementation/HTVMS_WaisUI.c b/WWW/Library/Implementation/HTVMS_WaisUI.c index 45a38a60..d8f73019 100644 --- a/WWW/Library/Implementation/HTVMS_WaisUI.c +++ b/WWW/Library/Implementation/HTVMS_WaisUI.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTVMS_WaisUI.c,v 1.16 2010/09/25 00:32:18 tom Exp $ + * $LynxId: HTVMS_WaisUI.c,v 1.17 2010/10/29 21:10:14 tom Exp $ * HTVMS_WAISUI.c * * Adaptation for Lynx by F.Macrides (macrides@sci.wfeb.edu) @@ -695,7 +695,7 @@ SearchAPDU *makeSearchAPDU(long small, query->DatabaseNames = (char **) s_realloc((char *) query->DatabaseNames, (size_t) (sizeof(char *) * - (i + 2))); + (i + 2))); query->DatabaseNames[i] = s_strdup(ptr); query->DatabaseNames[i + 1] = NULL; @@ -713,7 +713,7 @@ SearchAPDU *makeSearchAPDU(long small, query->ElementSetNames = (char **) s_realloc((char *) query->ElementSetNames, (size_t) (sizeof(char *) * - (i + 2))); + (i + 2))); query->ElementSetNames[i] = s_strdup(ptr); query->ElementSetNames[i + 1] = NULL; diff --git a/WWW/Library/Implementation/LYexit.h b/WWW/Library/Implementation/LYexit.h index 09414880..d32e2079 100644 --- a/WWW/Library/Implementation/LYexit.h +++ b/WWW/Library/Implementation/LYexit.h @@ -39,15 +39,23 @@ extern "C" { #define exit(code) LYexit(code) #define atexit LYatexit #define ATEXITSIZE 50 + /* * Data structures - *//* - * Global variable declarations - *//* - * Macros - *//* - * Function declarations - */ extern void outofmem(const char *fname, const char *func); + */ + +/* + * Global variable declarations + */ + +/* + * Macros + */ + +/* + * Function declarations + */ + extern void outofmem(const char *fname, const char *func); extern void reset_signals(void); extern void exit_immediately(int status) GCC_NORETURN; extern void LYexit(int status) GCC_NORETURN; diff --git a/WWW/Library/Implementation/tidy_tls.h b/WWW/Library/Implementation/tidy_tls.h index 04d3f681..771add4a 100644 --- a/WWW/Library/Implementation/tidy_tls.h +++ b/WWW/Library/Implementation/tidy_tls.h @@ -1,5 +1,5 @@ /* - * $LynxId: tidy_tls.h,v 1.1 2008/04/27 22:50:39 tom Exp $ + * $LynxId: tidy_tls.h,v 1.2 2010/10/27 00:07:26 tom Exp $ * Copyright 2008, Thomas E. Dickey */ #ifndef TIDY_TLS_H @@ -103,7 +103,7 @@ struct _SSL { /* use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options * are 'ored' with SSL_VERIFY_PEER if they are desired */ #define SSL_VERIFY_PEER 0x01 - +/* *INDENT-OFF* */ extern SSL *SSL_new(SSL_CTX * ctx); extern SSL_CIPHER *SSL_get_current_cipher(SSL * ssl); extern SSL_CTX *SSL_CTX_new(SSL_METHOD * method); @@ -134,5 +134,6 @@ extern void SSL_CTX_free(SSL_CTX * ctx); extern void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode, int (*verify_callback) (int, X509_STORE_CTX *)); extern void SSL_free(SSL * ssl); extern void SSL_load_error_strings(void); +/* *INDENT-ON* */ #endif /* TIDY_TLS_H */ diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h index 4e47d788..d221f23d 100644 --- a/WWW/Library/Implementation/www_tcp.h +++ b/WWW/Library/Implementation/www_tcp.h @@ -1,5 +1,5 @@ /* System dependencies in the W3 library - * $LynxId: www_tcp.h,v 1.45 2010/09/25 16:24:45 tom Exp $ + * $LynxId: www_tcp.h,v 1.47 2010/10/31 17:56:16 tom Exp $ * SYSTEM DEPENDENCIES @@ -159,7 +159,8 @@ extern const unsigned char IBM1047[]; /* For debugging #include <assert.h> #define TOASCII(c) (assert((c)>=0 && (c)<256), un_IBM1047[c]) -*//* for production */ +*/ +/* for production */ #define TOASCII(c) (un_IBM1047[c]) #define FROMASCII(c) (IBM1047[c]) @@ -746,10 +747,10 @@ typedef unsigned short mode_t; # ifdef HAVE_LIMITS_H # include <limits.h> -# endif /* HAVE_LIMITS_H */ +# endif /* HAVE_LIMITS_H */ # if !defined(MAXINT) && defined(INT_MAX) # define MAXINT INT_MAX -# endif /* !MAXINT && INT_MAX */ +# endif /* !MAXINT && INT_MAX */ #else |