sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mkfs.mfs fixup

Browse source 
For the special case of crossbuilding minix on minix.
This commit is contained in:
Lionel Sambuc 2013-02-26 15:18:28 +00:00
parent aafef7f9ff
commit b622d2b795
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
usr.sbin/mkfs.mfs/mkfs.c
View file

@ -35,6 +35,7 @@
#include <minix/u64.h> #include <minix/u64.h>
#include <minix/minlib.h> #include <minix/minlib.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <strings.h>
#endif #endif
#include <dirent.h> #include <dirent.h>
@ -64,10 +65,9 @@
#endif #endif
#endif #endif
#if !defined(__minix)
typedef uint32_t block_t; typedef uint32_t block_t;
typedef uint32_t zone_t; typedef uint32_t zone_t;
#endif typedef uint32_t bitchunk_t;
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
@ -1014,26 +1014,13 @@ int bit;
{ {
/* Insert 'count' bits in the bitmap */ /* Insert 'count' bits in the bitmap */
int w, s; int w, s;
#if defined(__minix)
bitchunk_t *buf; bitchunk_t *buf;
#else
uint32_t *buf;
#endif
#if defined(__minix)
buf = (bitchunk_t *) alloc_block(); buf = (bitchunk_t *) alloc_block();
#else
buf = (uint32_t *) alloc_block();
#endif
get_block(block, (char *) buf); get_block(block, (char *) buf);
#if defined(__minix)
w = bit / (8 * sizeof(bitchunk_t)); w = bit / (8 * sizeof(bitchunk_t));
s = bit % (8 * sizeof(bitchunk_t)); s = bit % (8 * sizeof(bitchunk_t));
#else
w = bit / (8 * sizeof(uint32_t));
s = bit % (8 * sizeof(uint32_t));
#endif
buf[w] |= (1 << s); buf[w] |= (1 << s);
put_block(block, (char *) buf); put_block(block, (char *) buf);