CVS commit by ossi: 

another attempt at working around glibc breakage.


  M +4 -5      drv_maildir.c   1.8.2.2


--- isync/src/drv_maildir.c  #1.8.2.1:1.8.2.2
@@ -638,9 +638,8 @@ maildir_scan( maildir_store_t *ctx, msgl
                                else
                                        u = ru = strchr( entry->base, ':' );
-                               if (u)
-                                       ml = u - entry->base;
-                               else
-                                       ru = "", ml = sizeof(buf);
-                               fnl = nfsnprintf( buf + bl, sizeof(buf) - bl, 
"%s/%.*s,U=%d%s", subdirs[entry->recent], ml, entry->base, uid, ru ) + 1 - 4;
+                               fnl = (u ?
+                                       nfsnprintf( buf + bl, sizeof(buf) - bl, 
"%s/%.*s,U=%d%s", subdirs[entry->recent], u - entry->base, entry->base, uid, ru 
) :
+                                       nfsnprintf( buf + bl, sizeof(buf) - bl, 
"%s/%s,U=%d", subdirs[entry->recent], entry->base, uid ))
+                                       + 1 - 4;
                                memcpy( nbuf, buf, bl + 4 );
                                nfsnprintf( nbuf + bl + 4, sizeof(nbuf) - bl - 
4, "%s", entry->base );



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel

Reply via email to