The R Project SVN – R – Diff – /trunk/src/extra/zlib/infcodes.c

 /* infcodes.c -- process literals and length/distance pairs
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 #include "zutil.h"
 #include "inftrees.h"
       c->sub.copy.dist += (uInt)b & inflate_mask[j];
       DUMPBITS(j)
       Tracevv((stderr, "inflate:         distance %u\n", c->sub.copy.dist));
       c->mode = COPY;
     case COPY:          /* o: copying bytes in window, waiting for space */
-#ifndef __TURBOC__ /* Turbo C bug for following expression */
-      f = (uInt)(q - s->window) < c->sub.copy.dist ?
-          s->end - (c->sub.copy.dist - (q - s->window)) :
-          q - c->sub.copy.dist;
-#else
       f = q - c->sub.copy.dist;
-      if ((uInt)(q - s->window) < c->sub.copy.dist)
+      while (f < s->window)             /* modulo window size-"while" instead */
-        f = s->end - (c->sub.copy.dist - (uInt)(q - s->window));
+        f += s->end - s->window;        /* of "if" handles invalid distances */
-#endif
       while (c->len)
+      {
         NEEDOUT
         OUTBYTE(*f++)
         if (f == s->end)

The R Project SVN R