empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(io_select, io_init, io_open, io_close, io_output, io_flush, io_write,

Browse source 
io_puts, iom_create, iom_getmask, iom_set, iom_clear, iom_zero):
Portability bug: io_select() passed bit_fdmask to select().  This
breaks the fd_set abstraction, and works only with the traditional
Unix implementation of fd_set.  Use fd_set and its operations instead.
Remove unused source files.  Note: the offending code is currently
unsued.  But it's a time bomb, and fixing it also replaces a bunch of
code by standard library services.
This commit is contained in:
Markus Armbruster 2004-01-15 14:32:00 +00:00
parent 5f4503a3a1
commit 422a8cea73
7 changed files with 49 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

71
include/bit.h
View file

@ -1,71 +0,0 @@
/*
* Empire - A multi-player, client/server Internet based war game.
* Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* ---
*
* See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
* related information and legal notices. It is expected that any future
* projects/authors will amend these files as needed.
*
* ---
*
* bit.h: Definitions for variable sized bitfields
*
* Known contributors to this file:
*
*/
#ifndef _BIT_H_
#define _BIT_H_
typedef unsigned int bit_mask;
typedef bit_mask *bit_fdmask;
#ifndef bit
#define bit(x) (1 << (x))
#endif
/*
* File descriptor bit manipulation macros for use with select(2)
*/
#define BIT_NBBY 8
#define BIT_BITSPERMASK (sizeof(bit_mask) * BIT_NBBY)
#define BIT_SETB(a,b) \
((b)[(a)/BIT_BITSPERMASK] |= 1 << ((a) % BIT_BITSPERMASK))
#define BIT_CLRB(a,b) \
((b)[(a)/BIT_BITSPERMASK] &= ~(1<< ((a) % BIT_BITSPERMASK)))
#define BIT_ISSETB(a,b) \
((b)[(a)/BIT_BITSPERMASK] & (1<< ((a) % BIT_BITSPERMASK)))
#define BIT_ISCLRB(a,b) \
(((b)[(a)/BIT_BITSPERMASK] & (1<<((a) % BIT_BITSPERMASK))) == 0)
extern bit_fdmask bit_newfdmask();
extern bit_fdmask bit_newfdmask(void);
extern void bit_zero(bit_fdmask);
extern void bit_not(bit_fdmask);
extern void bit_copy(bit_fdmask, bit_fdmask);
extern void bit_or(bit_fdmask, bit_fdmask);
extern void bit_or3(bit_fdmask, bit_fdmask, bit_fdmask);
extern void bit_and(bit_fdmask, bit_fdmask);
extern void bit_and3(bit_fdmask, bit_fdmask, bit_fdmask);
extern int bit_fd(bit_fdmask);
#endif /* _BIT_H_ */

11
include/io_mask.h
View file

@ -37,15 +37,14 @@
struct io_mask {
int what;
int maxfd;
bit_fdmask readmask;
bit_fdmask user_readmask;
bit_fdmask writemask;
bit_fdmask user_writemask;
fd_set *readmask;
fd_set *user_readmask;
fd_set *writemask;
fd_set *user_writemask;
};
extern struct io_mask *iom_create(int);
extern void iom_getmask(struct io_mask *, int *, bit_fdmask *,
bit_fdmask *);
extern void iom_getmask(struct io_mask *, int *, fd_set **, fd_set **);
extern void iom_set(struct io_mask *, int, int);
extern void iom_clear(struct io_mask *, int, int);
extern void iom_zero(struct io_mask *, int);