nntp-list

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@223 d27a3e52-49c5-7645-884c-6793ebffc270

diff --git a/Example/nntp-list/nntp-list.c b/Example/nntp-list/nntp-list.c
index dbb7c0a5d6ad8f82b60787703564e271f5520053..9bcc035611a003f425312abf1cdbea9293478dc2 100644 (file)
--- a/Example/nntp-list/nntp-list.c
+++ b/Example/nntp-list/nntp-list.c
@@ -24,6 +24,18 @@ 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){
+               W3_Set_Method(w3, "GROUP");
+               W3_Set_Path(w3, w3url->path + 1);
+               W3_NNTP_Send_Request(w3);
+       }else if(status == 211){
+               W3_Set_Method(w3, "HEAD");
+               W3_NNTP_Send_Request(w3);
+       }else if(status == 221){
+               W3_Set_Method(w3, "BODY");
+               W3_NNTP_Send_Request(w3);
+       }else if(status == 222){
+               W3_NNTP_Disconnect(w3);
        }
 }
 

diff --git a/Library/NNTP.c b/Library/NNTP.c
index 1468861ccade97830d971ee4ed81be954006648d..e5a6b689f761297a4246b31a02b4e64177963305 100644 (file)
--- a/Library/NNTP.c
+++ b/Library/NNTP.c
@@ -92,9 +92,22 @@ 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){
+               (*(int*)w3->generic) |= 1;
+               __W3_Auto_Write(w3, "HEAD\r\n", 6);
+       }else if(strcasecmp(w3->method, "BODY") == 0){
+               (*(int*)w3->generic) |= 1;
+               __W3_Auto_Write(w3, "BODY\r\n", 6);
+       }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); 
 }
 

diff --git a/Makefile b/Makefile
index d1c0e5bd599f038e2b2bdf0f3f2044cbf98e4cdf..9775f47ab14ed3faa6c66d9d8590760431083bf7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -146,6 +146,7 @@ ifeq ($(TCL),YES)
        mkdir -p w3-$(VERSION)/Example/tclw3/bin
        mkdir -p w3-$(VERSION)/Example/tclw3/lib
 endif
+       mkdir -p w3-$(VERSION)/Example/nntp-list
        mkdir -p w3-$(VERSION)/Example/ftp-list
        mkdir -p w3-$(VERSION)/Example/pop3-list
        mkdir -p w3-$(VERSION)/Example/interactive
@@ -159,6 +160,7 @@ ifeq ($(WINDOWS),YES)
        cp ./Example/pop3-list/pop3-list.exe w3-$(VERSION)/Example/pop3-list/
        cp ./Example/w3b/w3b.exe w3-$(VERSION)/Example/w3b/
        cp ./Example/ftp-list/ftp-list.exe w3-$(VERSION)/Example/ftp-list/
+       cp ./Example/nntp-list/nntp-list.exe w3-$(VERSION)/Example/nntp-list/
 ifeq ($(TCL),YES)
        cp ./Example/tclw3/tclw3.exe w3-$(VERSION)/Example/tclw3/bin/
        cp /usr/$(MINGW)/sys-root/mingw/bin/tcl86.dll w3-$(VERSION)/Example/tclw3/bin/
@@ -174,6 +176,7 @@ else
        cp ./Example/pop3-list/pop3-list w3-$(VERSION)/Example/pop3-list/
        cp ./Example/w3b/w3b w3-$(VERSION)/Example/w3b/
        cp ./Example/ftp-list/ftp-list w3-$(VERSION)/Example/ftp-list/
+       cp ./Example/nntp-list/nntp-list w3-$(VERSION)/Example/nntp-list/
 ifeq ($(TCL),YES)
        cp ./Example/tclw3/tclw3 w3-$(VERSION)/Example/tclw3/bin/
 endif

diff --git a/W3Version.h.p b/W3Version.h.p
index 339234884a4e688e324326172fc8349cbabc27eb..28621789433cf4f86941c9bc516202cf0adc3fdd 100644 (file)
--- a/W3Version.h.p
+++ b/W3Version.h.p
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-#define LIBW3_VERSION "2.12F" \
+#define LIBW3_VERSION "2.12G" \
 SUFFIX
 
 #ifdef __cplusplus