Send inn-committers mailing list submissions to
inn-committers@lists.isc.org
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.isc.org/mailman/listinfo/inn-committers
or, via email, send a message with subject or body 'help' to
inn-committers-requ...@lists.isc.org
You can reach the person managing the list at
inn-committers-ow...@lists.isc.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of inn-committers digest..."
Today's Topics:
1. INN commit: trunk/tests/util (inndf.t) (INN Commit)
2. INN commit: trunk/tests/overview (api-t.c) (INN Commit)
3. INN commit: trunk/innd (art.c) (INN Commit)
4. INN commit: trunk (frontends/inews.c innd/art.c nnrpd/post.c)
(INN Commit)
5. INN commit: trunk (doc/pod/news.pod innfeed/configfile.l)
(INN Commit)
6. INN commit: branches (3 files) (INN Commit)
7. INN commit: branches/2.5 (frontends/inews.c innd/art.c
nnrpd/post.c) (INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Wed, 31 Jul 2013 10:10:11 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/tests/util (inndf.t)
Message-ID: <20130731171012.0950c67...@hope.eyrie.org>
Date: Wednesday, July 31, 2013 @ 10:10:11
Author: iulius
Revision: 9515
consider that NetBSD behaves like FreeBSD for "df -i"
Fix the test suite for inndf on NetBSD systems.
Modified:
trunk/tests/util/inndf.t
---------+
inndf.t | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: inndf.t
===================================================================
--- inndf.t 2013-07-30 20:13:01 UTC (rev 9514)
+++ inndf.t 2013-07-31 17:10:11 UTC (rev 9515)
@@ -56,7 +56,8 @@
if df -i . > /dev/null 2>&1 ; then
if [ -z "${UNAME_SYSTEM##IRIX[[:alnum:]]*}" ] ; then
real=`df -i . | sed 1d | awk '{ print $8 }'`
- elif [ "${UNAME_SYSTEM}" = "FreeBSD" ] ; then
+ elif [ "${UNAME_SYSTEM}" = "FreeBSD" ] \
+ || [ "${UNAME_SYSTEM}" = "NetBSD" ] ; then
real=`df -i . | sed 1d | awk '{ print $7 }'`
else
real=`df -i . | sed 1d | awk '{ print $4 }'`
------------------------------
Message: 2
Date: Wed, 31 Jul 2013 10:11:28 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/tests/overview (api-t.c)
Message-ID: <20130731171128.6fbb167...@hope.eyrie.org>
Date: Wednesday, July 31, 2013 @ 10:11:28
Author: iulius
Revision: 9516
fix two casts to unsigned long
Modified:
trunk/tests/overview/api-t.c
---------+
api-t.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: api-t.c
===================================================================
--- api-t.c 2013-07-31 17:10:11 UTC (rev 9515)
+++ api-t.c 2013-07-31 17:11:28 UTC (rev 9516)
@@ -294,7 +294,7 @@
}
if (data->arrived != (time_t) artnum * 10) {
warn("Arrival time wrong for %s:%lu: %lu != %lu", group, artnum,
- data->arrived, artnum * 10);
+ (unsigned long) data->arrived, artnum * 10);
status = false;
}
@@ -304,7 +304,7 @@
expires = (artnum % 5 == 0) ? artnum * 100 : artnum;
if (data->expires != 0) {
warn("Expires time wrong for %s:%lu: %lu != %lu", group, artnum,
- data->expires, 0UL);
+ (unsigned long) data->expires, 0UL);
status = false;
}
return status;
------------------------------
Message: 3
Date: Wed, 31 Jul 2013 10:12:56 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/innd (art.c)
Message-ID: <20130731171256.6301567...@hope.eyrie.org>
Date: Wednesday, July 31, 2013 @ 10:12:56
Author: iulius
Revision: 9517
fix two casts to const time_t * when using ctime()
Modified:
trunk/innd/art.c
-------+
art.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: art.c
===================================================================
--- art.c 2013-07-31 17:11:28 UTC (rev 9516)
+++ art.c 2013-07-31 17:12:56 UTC (rev 9517)
@@ -308,13 +308,13 @@
Done = code == ART_ACCEPT || code == ART_JUNK;
if (text)
i = fprintf(Log, "%.15s.%03d %c %s %s %s%s",
- ctime(&Now.tv_sec) + 4, (int)(Now.tv_usec / 1000), code,
+ ctime((const time_t *) &Now.tv_sec) + 4, (int)(Now.tv_usec / 1000), code,
data->Feedsite != NULL ? data->Feedsite : "(null)",
HDR_FOUND(HDR__MESSAGE_ID) ? HDR(HDR__MESSAGE_ID) : "(null)",
text, Done ? "" : "\n");
else
i = fprintf(Log, "%.15s.%03d %c %s %s%s",
- ctime(&Now.tv_sec) + 4, (int)(Now.tv_usec / 1000), code,
+ ctime((const time_t *) &Now.tv_sec) + 4, (int)(Now.tv_usec / 1000), code,
data->Feedsite != NULL ? data->Feedsite : "(null)",
HDR_FOUND(HDR__MESSAGE_ID) ? HDR(HDR__MESSAGE_ID) : "(null)",
Done ? "" : "\n");
------------------------------
Message: 4
Date: Wed, 31 Jul 2013 10:14:37 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (frontends/inews.c innd/art.c nnrpd/post.c)
Message-ID: <20130731171437.bb6c367...@hope.eyrie.org>
Date: Wednesday, July 31, 2013 @ 10:14:37
Author: iulius
Revision: 9518
fix three casts to unsigned char when using toupper()
GCC complains because of char-subscripts warnings.
Modified:
trunk/frontends/inews.c
trunk/innd/art.c
trunk/nnrpd/post.c
-------------------+
frontends/inews.c | 2 +-
innd/art.c | 2 +-
nnrpd/post.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Modified: frontends/inews.c
===================================================================
--- frontends/inews.c 2013-07-31 17:12:56 UTC (rev 9517)
+++ frontends/inews.c 2013-07-31 17:14:37 UTC (rev 9518)
@@ -459,7 +459,7 @@
strncpy(out, pwp->pw_name, left);
if (islower((unsigned char) *out)
&& (out == outbuff || !isalpha((unsigned char) out[-1])))
- *out = toupper(*out);
+ *out = toupper((unsigned char) *out);
while (*out) {
out++;
left--;
Modified: innd/art.c
===================================================================
--- innd/art.c 2013-07-31 17:12:56 UTC (rev 9517)
+++ innd/art.c 2013-07-31 17:14:37 UTC (rev 9518)
@@ -649,7 +649,7 @@
}
/* See if this is a system header. A fairly tightly-coded binary search. */
- c = islower((unsigned char) *header) ? toupper(*header) : *header;
+ c = islower((unsigned char) *header) ? toupper((unsigned char) *header) :
*header;
for (*colon = '\0', tp = ARTheadertree; tp; ) {
if ((i = c - tp->Name[0]) == 0 && (i = strcasecmp(header, tp->Name)) == 0)
break;
Modified: nnrpd/post.c
===================================================================
--- nnrpd/post.c 2013-07-31 17:12:56 UTC (rev 9517)
+++ nnrpd/post.c 2013-07-31 17:14:37 UTC (rev 9518)
@@ -208,7 +208,7 @@
for (p = article; ; ) {
/* See if it's a known header. */
- c = islower((unsigned char) *p) ? toupper(*p) : *p;
+ c = islower((unsigned char) *p) ? toupper((unsigned char) *p) : *p;
for (hp = Table; hp < ARRAY_END(Table); hp++) {
if (c == hp->Name[0]
&& p[hp->Size] == ':'
------------------------------
Message: 5
Date: Wed, 31 Jul 2013 10:24:21 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (doc/pod/news.pod innfeed/configfile.l)
Message-ID: <20130731172421.5a25867...@hope.eyrie.org>
Date: Wednesday, July 31, 2013 @ 10:24:20
Author: iulius
Revision: 9519
fix build with flex 2.5.36+
Cast yyget_leng() to size_t because it used to be an int
in flex versions anterior to 2.5.35 (not included).
Modified:
trunk/doc/pod/news.pod
trunk/innfeed/configfile.l
----------------------+
doc/pod/news.pod | 5 +++++
innfeed/configfile.l | 21 ++++-----------------
2 files changed, 9 insertions(+), 17 deletions(-)
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2013-07-31 17:14:37 UTC (rev 9518)
+++ doc/pod/news.pod 2013-07-31 17:24:20 UTC (rev 9519)
@@ -147,6 +147,11 @@
=item *
+INN now properly builds fine with S<< B<flex> 2.5.36 >> (this version
+introduced a change of type for a variable used by INN).
+
+=item *
+
When using funnel feeds, B<innfeed> log files were open forever, which
resulted in empty log files, once rotated by B<scanlogs>. B<innfeed>
now reopens its log files upon receiving a HUP signal; this signal
Modified: innfeed/configfile.l
===================================================================
--- innfeed/configfile.l 2013-07-31 17:14:37 UTC (rev 9518)
+++ innfeed/configfile.l 2013-07-31 17:24:20 UTC (rev 9519)
@@ -31,20 +31,6 @@
warnings about it. */
static void yyunput(int, char *) UNUSED;
-/* Prototype the various accessor functions generated by flex to avoid
- missing prototype warnings. */
-int yyget_lineno(void);
-FILE *yyget_in(void);
-FILE *yyget_out(void);
-int yyget_leng(void);
-char *yyget_text(void);
-int yyget_debug(void);
-void yyset_lineno(int);
-void yyset_in(FILE *);
-void yyset_out(FILE *);
-void yyset_debug(int);
-int yylex_destroy(void);
-
char *strPtr = 0 ;
int strPtrLen = 0 ;
int strIdx = 0 ;
@@ -52,7 +38,6 @@
int lineCount = 0 ;
int current ;
-static void strAppend (int ch);
static void strAppend (int ch)
{
if (strIdx == strPtrLen)
@@ -162,11 +147,13 @@
return (CHAR) ;}
\"[^\"]* {{
- int i ;
+ size_t i ;
for (i = 1, strIdx = 0, sawBsl = 0 ; ; i++)
{
- if (i < yyleng)
+ /* Cast yyget_leng() to size_t because it used to be an int
+ * in flex versions anterior to 2.5.35 (not included). */
+ if (i < (size_t) yyget_leng())
current = yytext [i] ;
else
current = input() ;
------------------------------
Message: 6
Date: Wed, 31 Jul 2013 10:25:39 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches (3 files)
Message-ID: <20130731172539.2601d67...@hope.eyrie.org>
Date: Wednesday, July 31, 2013 @ 10:25:38
Author: iulius
Revision: 9520
fix build with flex 2.5.36+
Cast yyget_leng() to size_t because it used to be an int
in flex versions anterior to 2.5.35 (not included).
Modified:
branches/2.5/ (properties)
branches/2.5/doc/pod/news.pod
branches/2.5/innfeed/configfile.l
----------------------+
doc/pod/news.pod | 5 +++++
innfeed/configfile.l | 21 ++++-----------------
2 files changed, 9 insertions(+), 17 deletions(-)
Property changes on: branches/2.5
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk:9501
Modified: 2.5/doc/pod/news.pod
===================================================================
--- 2.5/doc/pod/news.pod 2013-07-31 17:24:20 UTC (rev 9519)
+++ 2.5/doc/pod/news.pod 2013-07-31 17:25:38 UTC (rev 9520)
@@ -18,6 +18,11 @@
=item *
+INN now properly builds fine with S<< B<flex> 2.5.36 >> (this version
+introduced a change of type for a variable used by INN).
+
+=item *
+
When using funnel feeds, B<innfeed> log files were open forever, which
resulted in empty log files, once rotated by B<scanlogs>. B<innfeed>
now reopens its log files upon receiving a HUP signal; this signal
Modified: 2.5/innfeed/configfile.l
===================================================================
--- 2.5/innfeed/configfile.l 2013-07-31 17:24:20 UTC (rev 9519)
+++ 2.5/innfeed/configfile.l 2013-07-31 17:25:38 UTC (rev 9520)
@@ -31,20 +31,6 @@
warnings about it. */
static void yyunput(int, char *) UNUSED;
-/* Prototype the various accessor functions generated by flex to avoid
- missing prototype warnings. */
-int yyget_lineno(void);
-FILE *yyget_in(void);
-FILE *yyget_out(void);
-int yyget_leng(void);
-char *yyget_text(void);
-int yyget_debug(void);
-void yyset_lineno(int);
-void yyset_in(FILE *);
-void yyset_out(FILE *);
-void yyset_debug(int);
-int yylex_destroy(void);
-
char *strPtr = 0 ;
int strPtrLen = 0 ;
int strIdx = 0 ;
@@ -52,7 +38,6 @@
int lineCount = 0 ;
int current ;
-static void strAppend (int ch);
static void strAppend (int ch)
{
if (strIdx == strPtrLen)
@@ -162,11 +147,13 @@
return (CHAR) ;}
\"[^\"]* {{
- int i ;
+ size_t i ;
for (i = 1, strIdx = 0, sawBsl = 0 ; ; i++)
{
- if (i < yyleng)
+ /* Cast yyget_leng() to size_t because it used to be an int
+ * in flex versions anterior to 2.5.35 (not included). */
+ if (i < (size_t) yyget_leng())
current = yytext [i] ;
else
current = input() ;
------------------------------
Message: 7
Date: Wed, 31 Jul 2013 10:27:33 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5 (frontends/inews.c innd/art.c
nnrpd/post.c)
Message-ID: <20130731172733.6d98f67...@hope.eyrie.org>
Date: Wednesday, July 31, 2013 @ 10:27:33
Author: iulius
Revision: 9521
fix three casts to unsigned char when using toupper()
GCC complains because of char-subscripts warnings.
Modified:
branches/2.5/frontends/inews.c
branches/2.5/innd/art.c
branches/2.5/nnrpd/post.c
-------------------+
frontends/inews.c | 2 +-
innd/art.c | 2 +-
nnrpd/post.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Modified: frontends/inews.c
===================================================================
--- frontends/inews.c 2013-07-31 17:25:38 UTC (rev 9520)
+++ frontends/inews.c 2013-07-31 17:27:33 UTC (rev 9521)
@@ -462,7 +462,7 @@
strncpy(out, pwp->pw_name, left);
if (islower((unsigned char) *out)
&& (out == outbuff || !isalpha((unsigned char) out[-1])))
- *out = toupper(*out);
+ *out = toupper((unsigned char) *out);
while (*out) {
out++;
left--;
Modified: innd/art.c
===================================================================
--- innd/art.c 2013-07-31 17:25:38 UTC (rev 9520)
+++ innd/art.c 2013-07-31 17:27:33 UTC (rev 9521)
@@ -649,7 +649,7 @@
}
/* See if this is a system header. A fairly tightly-coded binary search. */
- c = islower((unsigned char) *header) ? toupper(*header) : *header;
+ c = islower((unsigned char) *header) ? toupper((unsigned char) *header) :
*header;
for (*colon = '\0', tp = ARTheadertree; tp; ) {
if ((i = c - tp->Name[0]) == 0 && (i = strcasecmp(header, tp->Name)) == 0)
break;
Modified: nnrpd/post.c
===================================================================
--- nnrpd/post.c 2013-07-31 17:25:38 UTC (rev 9520)
+++ nnrpd/post.c 2013-07-31 17:27:33 UTC (rev 9521)
@@ -204,7 +204,7 @@
for (p = article; ; ) {
/* See if it's a known header. */
- c = islower((unsigned char) *p) ? toupper(*p) : *p;
+ c = islower((unsigned char) *p) ? toupper((unsigned char) *p) : *p;
for (hp = Table; hp < ARRAY_END(Table); hp++) {
if (c == hp->Name[0]
&& p[hp->Size] == ':'
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 54, Issue 1
*********************************************
