riscosnet-commits Mailing List for RISC OS s/w - popstar, newshound, webget

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/riscosnet/newshound/!NewsHound/c
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31336/!NewsHound/c

Modified Files:
	config nntp 
Log Message:
Alter NEWGROUPS date format and allow command to be disabled.

Index: config
===================================================================
RCS file: /cvsroot/riscosnet/newshound/!NewsHound/c/config,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config	3 Sep 2005 10:25:12 -0000	1.1
--- config	14 Dec 2010 19:37:12 -0000	1.2
***************
*** 8,11 ****
--- 8,14 ----
   * All rights reserved.
   *
+  * Modified to support switching of NEWGROUPS and date format,
+  * Stephen Fryatt, 2010 (in...@st...)
+  *
   * $Id$
   *
***************
*** 92,95 ****
--- 95,100 ----
    WIN_NNTP,    C_NNTP_NODATE,       &nntp_nodate,       "NoDate",
    WIN_NNTP,    C_NNTP_NOXOVER,      &nntp_noxover,      "NoXover",
+   WIN_NNTP,    C_NNTP_NEWGROUPS,    &nntp_usenewgroups, "UseNewgroups",
+   WIN_NNTP,    C_NNTP_YYMMDD,       &nntp_yymmdd,       "YYMMDDFormat",
  
    WIN_FETCH,   C_FETCH_STARTUP,     &nntp_fetchonload,  "FetchOnLoad",
***************
*** 118,124 ****
  } config_fades[] =
  {
!   WIN_FETCH, C_FETCH_STARTUP,     WIN_FETCH, C_FETCH_QUIT, /* only allow autoquit when set to fetch on startup */
!   WIN_MISC,  C_MISC_ENABLEACTIVE, WIN_MISC,  C_GET_ACTIVE, /* disallow active fetch button when disabled */
!   WIN_MISC,  C_MISC_ENABLEACTIVE, WIN_MISC,  C_GET_DESC,   /* disallow desc fetch button when disabled */
    -1,        -1,                  -1,        -1
  };
--- 123,130 ----
  } config_fades[] =
  {
!   WIN_FETCH, C_FETCH_STARTUP,     WIN_FETCH, C_FETCH_QUIT,  /* only allow autoquit when set to fetch on startup */
!   WIN_MISC,  C_MISC_ENABLEACTIVE, WIN_MISC,  C_GET_ACTIVE,  /* disallow active fetch button when disabled */
!   WIN_MISC,  C_MISC_ENABLEACTIVE, WIN_MISC,  C_GET_DESC,    /* disallow desc fetch button when disabled */
!   WIN_NNTP,  C_NNTP_NEWGROUPS,    WIN_NNTP,  C_NNTP_YYMMDD, /* only set NEWGROUPS format if we're fetching newgroups. */
    -1,        -1,                  -1,        -1
  };
***************
*** 340,344 ****
    }
    /* no action for 'funcs' */
!   
    strcpy(nntp_realservernick, nntp_servernick);
  }
--- 346,350 ----
    }
    /* no action for 'funcs' */
! 
    strcpy(nntp_realservernick, nntp_servernick);
  }

Index: nntp
===================================================================
RCS file: /cvsroot/riscosnet/newshound/!NewsHound/c/nntp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nntp	22 Sep 2005 21:45:04 -0000	1.3
--- nntp	14 Dec 2010 19:37:12 -0000	1.4
***************
*** 5,8 ****
--- 5,11 ----
   * All rights reserved.
   *
+  * Modified to support switching of NEWGROUPS and date format,
+  * Stephen Fryatt, 2010 (in...@st...)
+  *
   * $Id$
   *
***************
*** 52,55 ****
--- 55,60 ----
         int nntp_noxover = 0; /* don't blow up if there's no XOVER command available */
         int nntp_nodate  = 0; /* don't blow up if there's no DATE command available */
+        int nntp_usenewgroups = 1; /* try and fetch new groups with the NEWGROUPS command */
+        int nntp_yymmdd = 1; /* use YYMMDD format dates when talking to the server. */
  // static int nntp_sendarts = 1; /* send articles immediately (catch newsbase update message) */
         int nntp_reporterrors = E_ALL;
***************
*** 85,88 ****
--- 90,167 ----
  static void     nntp_response(serverstruct *newsserver, char *buffer);
  
+ 
+ /* Transform a server-supplied date field in the form "YYYYMMDD HHMMSS" or
+  * "YYMMDD HHMMSS" to conform to the global setting for nntp_yymmdd.
+  */
+ 
+ static void nntp_transformdate(char* date)
+ {
+   char *p, buf[5];
+   int  len, year, century;
+   struct tm tm;
+   time_t localtime;
+ 
+   p = date;
+ 
+   while (*p != '\0' && !isspace(*p))
+     p++;
+ 
+   len = p - date;
+   if (!(len == 6 || len == 8))
+     return;
+ 
+   /* The first part of date is either YYYYMMDD or YYMMDD. */
+ 
+   if (len == 6 && !nntp_yymmdd) {
+     /* Expand to YYYYMMDD by adding in the current century. */
+ 
+     xsyslogf(TASK_LOGNAME,220,"Expand date from '%s'",date);
+ 
+     /* Shift the existing date up two places in the buffer. */
+ 
+     p = date + strlen(date);
+     while (p >= date) {
+       *(p+2) = *p;
+       p--;
+     }
+ 
+     /* Find the current century, and then get the date's century
+      * based on the rules from RFC3977.
+      */
+ 
+     localtime = time(NULL);
+     tm = *gmtime(&localtime);
+     century = (1900 + tm.tm_year) / 100;
+ 
+     buf[0] = date[0];
+     buf[1] = date[1];
+     buf[2] = '\0';
+     year = atoi(buf);
+ 
+     if (year > (tm.tm_year % 100))
+       century--;
+ 
+     /* Take care not to NUL terminate the century in the date buffer. */
+     sprintf(buf,"%.2d", century);
+     date[0] = buf[0];
+     date[1] = buf[1];
+ 
+     xsyslogf(TASK_LOGNAME,200,"Expanded date '%s'",date);
+   } else if (len == 8 && nntp_yymmdd) {
+     /* Contract to YYMMDD by deleting the century. */
+ 
+     xsyslogf(TASK_LOGNAME,220,"Contract date from '%s'",date);
+ 
+     p = date;
+     do {
+       *p = *(p+2);
+     } while (*p++ != '\0');
+ 
+     xsyslogf(TASK_LOGNAME,200,"Contracted date '%s'",date);
+   }
+ }
+ 
+ 
+ 
  static int nntp_fclose(FILE **stream)
  {
***************
*** 141,144 ****
--- 220,224 ----
    char timeout[40]={0},fetchonload[40]={0},newsfetch[40]={0},postcheck[40]={0};
    char noxover[40]={0},nodate[40]={0},dnsfail[40]={0},fetchactive[40]={0};
+   char usenewgroups[40]={0}, yymmdd[40]={0};
  //  sendarts[40]={0}
    char runfetchend[40]={0}, reporterrors[40]={0}, nobounce[40]={0}, checkvar[40]={0};
***************
*** 180,183 ****
--- 260,265 ----
        CHECKTAG("noxover",noxover);
        CHECKTAG("nodate",nodate);
+       CHECKTAG("usenewgroups",usenewgroups);
+       CHECKTAG("yymmddformat",yymmdd);
        CHECKTAG("reportdnsfail",dnsfail); /* deprecated */
        CHECKTAG( "reporterrors", reporterrors );
***************
*** 314,317 ****
--- 396,403 ----
    if (*nodate)
      nntp_nodate = strchr(nodate,'Y') || strchr(nodate,'y');
+   if (*usenewgroups)
+     nntp_usenewgroups = strchr(usenewgroups,'Y') || strchr(usenewgroups,'y');
+   if (*yymmdd)
+     nntp_yymmdd = strchr(yymmdd,'Y') || strchr(yymmdd,'y');
    if (*dnsfail)
      nntp_reporterrors = ( strchr(dnsfail,'Y') || strchr(dnsfail,'y') ) ? E_ALL : E_NODNS; /* deprecated */
***************
*** 933,936 ****
--- 1019,1023 ----
  
        nntp_loadgroupfile(newsserver,nntp_openstatus,nntp_retry);
+       nntp_transformdate(newsserver->last_date);
        nntp_art = nntp_xover = nntp_head = nntp_kills = 0;
        break;
***************
*** 988,992 ****
    	    dns_dispose(newsserver->dns);
            }
!           
            default:
              /* still resolving */
--- 1075,1079 ----
    	    dns_dispose(newsserver->dns);
            }
! 
            default:
              /* still resolving */
***************
*** 1056,1060 ****
          /* force fetch if 'fetch every' timer has expired */
          int timerexpired = difftime(time(NULL),newsserver->last_fetch) > nntp_refetchtime;
!         
          if (timerexpired || forced)
          {
--- 1143,1147 ----
          /* force fetch if 'fetch every' timer has expired */
          int timerexpired = difftime(time(NULL),newsserver->last_fetch) > nntp_refetchtime;
! 
          if (timerexpired || forced)
          {
***************
*** 1071,1075 ****
        nntp_online(quit, newsserver);
        break;
!     
      case NNTP_QUIT_WAIT:
        /* we enter this state if we intended to quit, but didn't because there's an error window open */
--- 1158,1162 ----
        nntp_online(quit, newsserver);
        break;
! 
      case NNTP_QUIT_WAIT:
        /* we enter this state if we intended to quit, but didn't because there's an error window open */
***************
*** 1080,1084 ****
          break;
        }
!       
        /* otherwise, check the timeout */
        if (difftime(time(NULL),newsserver->start_time) > 30)
--- 1167,1171 ----
          break;
        }
! 
        /* otherwise, check the timeout */
        if (difftime(time(NULL),newsserver->start_time) > 30)
***************
*** 1213,1217 ****
  #ifdef FEATURE_NOSTATUS
              frontend_setgroup("");
! #else            
              if (postonly)
                frontend_setgroup( "Postings sent" );
--- 1300,1304 ----
  #ifdef FEATURE_NOSTATUS
              frontend_setgroup("");
! #else
              if (postonly)
                frontend_setgroup( "Postings sent" );
***************
*** 1233,1237 ****
  #ifdef FEATURE_NOSTATUS
              frontend_setgroup("");
! #else            
            if (postonly)
              frontend_setgroup( "Postings sent" );
--- 1320,1324 ----
  #ifdef FEATURE_NOSTATUS
              frontend_setgroup("");
! #else
            if (postonly)
              frontend_setgroup( "Postings sent" );
***************
*** 1589,1599 ****
      char buffer[80];
  
!     if (!*newsserver->last_date)
      {
!       xsyslogf(TASK_LOGNAME,0,"Skipped newgroups (no date)");
        newsserver->state=NNTP_GROUP;
        newsserver->stage=NNTP_NEXT;
        return;
      }
      strcpy( buffer, "NEWGROUPS " );
      strncat( buffer, newsserver->last_date, sizeof(buffer) - strlen(buffer) - 4 );
--- 1676,1688 ----
      char buffer[80];
  
!     if (!*newsserver->last_date || !nntp_usenewgroups) /* Skip if there's no date or if NEWGROUPS command is disabled */
      {
!       if (nntp_usenewgroups)
!         xsyslogf(TASK_LOGNAME,0,"Skipped newgroups (no date)");
        newsserver->state=NNTP_GROUP;
        newsserver->stage=NNTP_NEXT;
        return;
      }
+     nntp_transformdate(newsserver->last_date);
      strcpy( buffer, "NEWGROUPS " );
      strncat( buffer, newsserver->last_date, sizeof(buffer) - strlen(buffer) - 4 );
***************
*** 1867,1870 ****
--- 1956,1960 ----
      sprintf(newsserver->date,"%.2d%.2d%.2d %.2d%.2d%.2d",
              tm.tm_year % 100, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
+     /* nntp_transformdate(newsserver->date); */
      xsyslogf(TASK_LOGNAME,140,"Madeup date: %s",newsserver->date);
      return;
***************
*** 1996,1999 ****
--- 2086,2090 ----
          *ptr2=0;
          xsyslogf(TASK_LOGNAME,140,"Date: %s",newsserver->date);
+         /* nntp_transformdate(newsserver->date); */
          newsserver->stage=NNTP_NEXT;
        }
***************
*** 2360,2363 ****
--- 2451,2455 ----
            break;
          case NNTP_NEWGROUPS:
+           nntp_transformdate(newsserver->last_date);
       	  net_printf(newsserver,"NEWGROUPS %s\r\n",newsserver->last_date);
            xsyslogf(TASK_LOGNAME,140, ">>> NEWGROUPS %s",newsserver->last_date);

2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (12)
2005	Jan (2)	Feb	Mar	Apr	May	Jun	Jul (4)	Aug	Sep (139)	Oct (62)	Nov	Dec
2006	Jan	Feb (2)	Mar	Apr	May (7)	Jun	Jul	Aug (2)	Sep	Oct	Nov	Dec
2007	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (5)

riscosnet-commits Mailing List for RISC OS s/w - popstar, newshound, webget

riscosnet-commits — CVS commit messages for the RISC OS networking project