[csw-devel] SF.net SVN: gar:[15511] csw/mgar/pkg/logrotate/trunk

[igalic at users.sourceforge.net]

Revision: 15511
          http://gar.svn.sourceforge.net/gar/?rev=15511&view=rev
Author:   igalic
Date:     2011-09-04 00:06:59 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
Make the diff go in the right direction.

Modified Paths:
--------------
    csw/mgar/pkg/logrotate/trunk/checksums
    csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch

Modified: csw/mgar/pkg/logrotate/trunk/checksums
===================================================================
--- csw/mgar/pkg/logrotate/trunk/checksums	2011-09-04 00:02:27 UTC (rev 15510)
+++ csw/mgar/pkg/logrotate/trunk/checksums	2011-09-04 00:06:59 UTC (rev 15511)
@@ -1,5 +1,4 @@
 bd2e20d8dc644291b08f9215397d28a5  logrotate-3.8.1.tar.gz
 02f36862d4e190a7eb920bd816ca4927  003-test.patch
 d6232a06412a2302a582abdc51607518  005-gzippath.patch
-27ac9259ade93a47f71779d396c6a096  006-mbrtowc_empty.patch
-6089a6cd64ea15350814e2d343bb350e  006-mbrtowc_empty.patch
+4b1205a3056b38d175a5a7cb3ddd27df  006-mbrtowc_empty.patch

Modified: csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch	2011-09-04 00:02:27 UTC (rev 15510)
+++ csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch	2011-09-04 00:06:59 UTC (rev 15511)
@@ -1,11 +1,12 @@
---- logrotate-3.8.1-sol10fix/config.c	2011-09-04 01:56:47.797271345 +0200
-+++ logrotate-3.8.1/config.c	2011-08-31 14:39:04.000000000 +0200
+diff -ur logrotate-3.8.1/config.c logrotate-3.8.1-sol10fix/config.c
+--- logrotate-3.8.1/config.c	2011-08-31 14:39:04.000000000 +0200
++++ logrotate-3.8.1-sol10fix/config.c	2011-09-04 01:56:47.797271345 +0200
 @@ -190,7 +190,7 @@
  
  	chptr = start;
  
--	while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0  && strlen(chptr) != 0) {
-+	while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 ) {
+-	while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 ) {
++	while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0  && strlen(chptr) != 0) {
  		if( len == (size_t)(-1) || len == (size_t)(-2) || !iswprint(pwc) || iswblank(pwc) ) {
  		    message(MESS_ERROR, "%s:%d bad %s path %s\n",
  			    configFile, lineNum, key, start);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.