The only thing in the our standard source tree that uses this is cron,

vi seems to have it's own private copy (that appears to be broken in
the same way this one was!)

>From: mrm@optigfx.com (Mike Murphy)
Date: Fri, 11 Feb 94 16:48:15 PST
This shar is a test program for the currently broken /usr/include/bitstring.h,
the broken /usr/include/bitstring.h (named bitstring.h.v) and a corrected
bitstring.h. I leave cdiffs and such to you. This makes the bitstring macros
work correctly; finding what may have depended upon incorrect behavior is an
exercise left for the reader;-)

diff --git a/include/bitstring.h b/include/bitstring.h
index 21f10f6..5c4b1b7 100644 (file)
--- a/include/bitstring.h
+++ b/include/bitstring.h
@@ -33,12 +33,20 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)bitstring.h 5.5 (Berkeley) 4/3/91
+ *     from: @(#)bitstring.h   5.5 (Berkeley) 4/3/91
+ *     $Id$

  */
 
 #ifndef _BITSTRING_H_
  */
 
 #ifndef _BITSTRING_H_

-#define        _BITSTRING_H_
+#define _BITSTRING_H_

 
 

+/* modified for SV/AT and bitstring bugfix by M.R.Murphy, 11oct91
+ * bitstr_size changed gratuitously, but shorter
+ * bit_alloc   spelling error fixed
+ * the following were efficient, but didn't work, they've been made to
+ * work, but are no longer as efficient :-)
+ * bit_nclear, bit_nset, bit_ffc, bit_ffs
+ */

 typedef        unsigned char bitstr_t;
 
 /* internal macros */
 typedef        unsigned char bitstr_t;
 
 /* internal macros */


@@ -53,12 +61,11 @@ typedef     unsigned char bitstr_t;
 /* external macros */
                                /* bytes in a bitstring of nbits bits */
 #define        bitstr_size(nbits) \
 /* external macros */
                                /* bytes in a bitstring of nbits bits */
 #define        bitstr_size(nbits) \

-       ((((nbits) - 1) >> 3) + 1)
+       (((nbits) + 7) >> 3)

 
                                /* allocate a bitstring */
 #define        bit_alloc(nbits) \
 
                                /* allocate a bitstring */
 #define        bit_alloc(nbits) \

-       (bitstr_t *)calloc(1, \
-           (unsigned int)_bitstr_size(nbits) * sizeof(bitstr_t))
+       (bitstr_t *)calloc((size_t)bitstr_size(nbits), sizeof(bitstr_t))

 
                                /* allocate a bitstring on the stack */
 #define        bit_decl(name, nbits) \
 
                                /* allocate a bitstring on the stack */
 #define        bit_decl(name, nbits) \


@@ -80,36 +87,29 @@ typedef     unsigned char bitstr_t;
 #define        bit_nclear(name, start, stop) { \
        register bitstr_t *_name = name; \
        register int _start = start, _stop = stop; \
 #define        bit_nclear(name, start, stop) { \
        register bitstr_t *_name = name; \
        register int _start = start, _stop = stop; \

-       register int _startbyte = _bit_byte(_start); \
-       register int _stopbyte = _bit_byte(_stop); \
-       _name[_startbyte] &= 0xff >> (8 - (_start&0x7)); \
-       while (++_startbyte < _stopbyte) \
-               _name[_startbyte] = 0; \
-       _name[_stopbyte] &= 0xff << ((_stop&0x7) + 1); \
+       while (_start <= _stop) { \
+               bit_clear(_name, _start); \
+               _start++; \
+               } \

 }
 
                                /* set bits start ... stop in bitstring */
 #define        bit_nset(name, start, stop) { \
        register bitstr_t *_name = name; \
        register int _start = start, _stop = stop; \
 }
 
                                /* set bits start ... stop in bitstring */
 #define        bit_nset(name, start, stop) { \
        register bitstr_t *_name = name; \
        register int _start = start, _stop = stop; \

-       register int _startbyte = _bit_byte(_start); \
-       register int _stopbyte = _bit_byte(_stop); \
-       _name[_startbyte] |= 0xff << ((start)&0x7); \
-       while (++_startbyte < _stopbyte) \
-           _name[_startbyte] = 0xff; \
-       _name[_stopbyte] |= 0xff >> (7 - (_stop&0x7)); \
+       while (_start <= _stop) { \
+               bit_set(_name, _start); \
+               _start++; \
+               } \

 }
 
                                /* find first bit clear in name */
 #define        bit_ffc(name, nbits, value) { \
        register bitstr_t *_name = name; \
 }
 
                                /* find first bit clear in name */
 #define        bit_ffc(name, nbits, value) { \
        register bitstr_t *_name = name; \

-       register int _byte, _nbits = nbits; \
-       register int _stopbyte = _bit_byte(_nbits), _value = -1; \
-       for (_byte = 0; _byte <= _stopbyte; ++_byte) \
-               if (_name[_byte] != 0xff) { \
-                       _value = _byte << 3; \
-                       for (_stopbyte = _name[_byte]; (_stopbyte&0x1); \
-                           ++_value, _stopbyte >>= 1); \
+       register int _bit, _nbits = nbits, _value = -1; \
+       for (_bit = 0; _bit < _nbits; ++_bit) \
+               if (!bit_test(_name, _bit)) { \
+                       _value = _bit; \

                        break; \
                } \
        *(value) = _value; \
                        break; \
                } \
        *(value) = _value; \


@@ -118,13 +118,10 @@ typedef   unsigned char bitstr_t;
                                /* find first bit set in name */
 #define        bit_ffs(name, nbits, value) { \
        register bitstr_t *_name = name; \
                                /* find first bit set in name */
 #define        bit_ffs(name, nbits, value) { \
        register bitstr_t *_name = name; \

-       register int _byte, _nbits = nbits; \
-       register int _stopbyte = _bit_byte(_nbits), _value = -1; \
-       for (_byte = 0; _byte <= _stopbyte; ++_byte) \
-               if (_name[_byte]) { \
-                       _value = _byte << 3; \
-                       for (_stopbyte = _name[_byte]; !(_stopbyte&0x1); \
-                           ++_value, _stopbyte >>= 1); \
+       register int _bit, _nbits = nbits, _value = -1; \
+       for (_bit = 0; _bit < _nbits; ++_bit) \
+               if (bit_test(_name, _bit)) { \
+                       _value = _bit; \

                        break; \
                } \
        *(value) = _value; \
                        break; \
                } \
        *(value) = _value; \