From f2fa11007eb79db6b06099c95c8e696785787d8c Mon Sep 17 00:00:00 2001 From: nishi Date: Fri, 16 Feb 2024 04:33:07 +0000 Subject: [PATCH] made news:// alias of nntp:// git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@231 d27a3e52-49c5-7645-884c-6793ebffc270 --- Example/nntp-list/nntp-list.c | 10 ++++---- Library/Core.c | 10 ++++---- Library/DNS.c | 2 +- Library/FTP.c | 2 +- Library/NNTP.c | 45 ++++++++++++++++------------------- Library/URL.c | 2 +- Library/Util.c | 2 +- W3Version.h.m4 | 2 +- 8 files changed, 35 insertions(+), 40 deletions(-) diff --git a/Example/nntp-list/nntp-list.c b/Example/nntp-list/nntp-list.c index 7d2892f..6c64f0f 100644 --- a/Example/nntp-list/nntp-list.c +++ b/Example/nntp-list/nntp-list.c @@ -24,20 +24,20 @@ void resp_handler(struct W3* w3, int status, char* data) { if(status == 200) { W3_Set_Method(w3, "LIST"); W3_NNTP_Send_Request(w3); - }else if(status == 215){ + } else if(status == 215) { W3_Set_Method(w3, "GROUP"); W3_Set_Path(w3, w3url->path + 1); W3_NNTP_Send_Request(w3); - }else if(status == 211 || status == 223){ + } else if(status == 211 || status == 223) { W3_Set_Method(w3, "HEAD"); W3_NNTP_Send_Request(w3); - }else if(status == 221){ + } else if(status == 221) { W3_Set_Method(w3, "BODY"); W3_NNTP_Send_Request(w3); - }else if(status == 222){ + } else if(status == 222) { W3_Set_Method(w3, "NEXT"); W3_NNTP_Send_Request(w3); - }else{ + } else { W3_NNTP_Disconnect(w3); } } diff --git a/Library/Core.c b/Library/Core.c index d9a9813..2d75e07 100644 --- a/Library/Core.c +++ b/Library/Core.c @@ -138,7 +138,7 @@ struct W3* W3_Create(const char* protocol, const char* hostname, int port) { } else if(strcmp(protocol, "ftp") == 0) { #endif #ifdef NNTP_SUPPORT - } else if(strcmp(protocol, "nntp") == 0) { + } else if(strcmp(protocol, "nntp") == 0 || strcmp(protocol, "news") == 0) { #endif } else { __W3_Debug("Protocol", "Not suppported"); @@ -191,11 +191,11 @@ void W3_Set_Path(struct W3* w3, const char* path) { } void W3_Send_Request(struct W3* w3) { - if(0){ + if(0) { #ifdef HTTP_SUPPORT - }else if(strcmp(w3->protocol, "http") == 0 + } else if(strcmp(w3->protocol, "http") == 0 #ifdef SSL_SUPPORT - || strcmp(w3->protocol, "https") == 0 + || strcmp(w3->protocol, "https") == 0 #endif ) { __W3_HTTP_Request(w3); @@ -235,7 +235,7 @@ void W3_Send_Request(struct W3* w3) { __W3_FTP_Request(w3); #endif #ifdef NNTP_SUPPORT - } else if(strcmp(w3->protocol, "nntp") == 0) { + } else if(strcmp(w3->protocol, "nntp") == 0 || strcmp(w3->protocol, "news") == 0) { __W3_NNTP_Request(w3); #endif #ifdef FILE_SUPPORT diff --git a/Library/DNS.c b/Library/DNS.c index 5812f65..8c24b52 100644 --- a/Library/DNS.c +++ b/Library/DNS.c @@ -7,8 +7,8 @@ #include #ifdef __MINGW32__ -#include #include +#include #include #include #else diff --git a/Library/FTP.c b/Library/FTP.c index 9d01f9b..82163c7 100644 --- a/Library/FTP.c +++ b/Library/FTP.c @@ -9,8 +9,8 @@ #include #ifdef __MINGW32__ -#include #include +#include #else #include #include diff --git a/Library/NNTP.c b/Library/NNTP.c index 5ca216b..7a18dd5 100644 --- a/Library/NNTP.c +++ b/Library/NNTP.c @@ -27,17 +27,17 @@ void __W3_NNTP_Request(struct W3* w3) { int len = __W3_Auto_Read(w3, buf, w3->readsize); if(len <= 0) break; int i; - for(i = 0; i < len; i++){ - if(buf[i] == '\n'){ + for(i = 0; i < len; i++) { + if(buf[i] == '\n') { int sendstatus = -1; char* senddata = NULL; bool freedata = false; - if(flag & 1){ - if(strcmp(line, ".") == 0){ + if(flag & 1) { + if(strcmp(line, ".") == 0) { flag &= ~1; int j; - for(j = 0; data[j] != 0; j++){ - if(data[j] == ' '){ + for(j = 0; data[j] != 0; j++) { + if(data[j] == ' ') { data[j] = 0; sendstatus = atoi(data); senddata = data + j + 1; @@ -45,15 +45,15 @@ void __W3_NNTP_Request(struct W3* w3) { } } freedata = true; - }else{ + } else { char* tmp = data; data = __W3_Concat3(tmp, strlen(data) != 0 ? "\n" : "", line); free(tmp); } - }else{ + } else { int j; - for(j = 0; line[j] != 0; j++){ - if(line[j] == ' '){ + for(j = 0; line[j] != 0; j++) { + if(line[j] == ' ') { line[j] = 0; sendstatus = atoi(line); senddata = line + j + 1; @@ -61,14 +61,14 @@ void __W3_NNTP_Request(struct W3* w3) { } } } - if(sendstatus != -1){ + if(sendstatus != -1) { void* funcptr = __W3_Get_Event(w3, "nntpresp"); if(funcptr != NULL) { void (*func)(struct W3*, int, char*) = (void (*)(struct W3*, int, char*))funcptr; func(w3, sendstatus, senddata); } } - if(freedata){ + if(freedata) { free(data); data = malloc(1); data[0] = 0; @@ -76,7 +76,7 @@ void __W3_NNTP_Request(struct W3* w3) { free(line); line = malloc(1); line[0] = 0; - }else if(buf[i] != '\r'){ + } else if(buf[i] != '\r') { cbuf[0] = buf[i]; char* tmp = line; line = __W3_Concat(tmp, cbuf); @@ -90,28 +90,23 @@ void __W3_NNTP_Request(struct W3* w3) { free(buf); } -void W3_NNTP_Send_Request(struct W3* w3){ - if(strcasecmp(w3->method, "LIST") == 0){ +void W3_NNTP_Send_Request(struct W3* w3) { + if(strcasecmp(w3->method, "LIST") == 0) { (*(int*)w3->generic) |= 1; __W3_Auto_Write(w3, "LIST\r\n", 6); - }else if(strcasecmp(w3->method, "HEAD") == 0){ + } else if(strcasecmp(w3->method, "HEAD") == 0) { (*(int*)w3->generic) |= 1; __W3_Auto_Write(w3, "HEAD\r\n", 6); - }else if(strcasecmp(w3->method, "BODY") == 0){ + } else if(strcasecmp(w3->method, "BODY") == 0) { (*(int*)w3->generic) |= 1; __W3_Auto_Write(w3, "BODY\r\n", 6); - }else if(strcasecmp(w3->method, "NEXT") == 0){ + } else if(strcasecmp(w3->method, "NEXT") == 0) { __W3_Auto_Write(w3, "NEXT\r\n", 6); - }else if(strcasecmp(w3->method, "GROUP") == 0){ + } else if(strcasecmp(w3->method, "GROUP") == 0) { __W3_Auto_Write(w3, "GROUP ", 6); __W3_Auto_Write(w3, w3->path, strlen(w3->path)); __W3_Auto_Write(w3, "\r\n", 2); } - - -} - -void W3_NNTP_Disconnect(struct W3* w3){ - __W3_Auto_Write(w3, "QUIT\r\n", 6); } +void W3_NNTP_Disconnect(struct W3* w3) { __W3_Auto_Write(w3, "QUIT\r\n", 6); } diff --git a/Library/URL.c b/Library/URL.c index 9f31c1a..dcb9298 100644 --- a/Library/URL.c +++ b/Library/URL.c @@ -128,7 +128,7 @@ struct W3URL* W3_Parse_URL(const char* _url) { r->port = 1900; } else if(strcmp(r->protocol, "ftp") == 0) { r->port = 21; - } else if(strcmp(r->protocol, "nntp") == 0) { + } else if(strcmp(r->protocol, "nntp") == 0 || strcmp(r->protocol, "news") == 0) { r->port = 119; } } diff --git a/Library/Util.c b/Library/Util.c index 7cd8c3b..75360e1 100644 --- a/Library/Util.c +++ b/Library/Util.c @@ -9,8 +9,8 @@ #include #ifdef __MINGW32__ -#include #include +#include #else #include #include diff --git a/W3Version.h.m4 b/W3Version.h.m4 index d07388e..9b97c18 100644 --- a/W3Version.h.m4 +++ b/W3Version.h.m4 @@ -6,7 +6,7 @@ extern "C" { #endif -#define LIBW3_VERSION "2.15B" \ +#define LIBW3_VERSION "2.15C" \ SUFFIX ifdef(`HTTP_SUPPORT', `#define LIBW3_HTTP_SUPPORT', `') -- 2.43.0