. add all sys/sys headers not already present to help compiling . take netbsd dirent.h and struct dirent; main result is introducing d_type and d_namlen that have to be set by getdents() in all FS code implementing it . d_off is gone . alignment of the struct has become 8 bytes instead of 4 . remove _MAX_BLOCK_SIZE, _MIN_BLOCK_SIZE, _STATIC_BLOCK_SIZE . libminlib: cleanup unused yet duplicate code . mfs: throw out the long-broken v1, v2 support . new test for dirent contents filled by getdents() Change-Id: I1459755c7ba5e5d1c9396d3a587ce6e63ddc283e
		
			
				
	
	
		
			98 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			98 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "fs.h"
 | 
						|
#include "buf.h"
 | 
						|
#include "inode.h"
 | 
						|
#include "super.h"
 | 
						|
 | 
						|
 | 
						|
/*===========================================================================*
 | 
						|
 *				no_sys					     *
 | 
						|
 *===========================================================================*/
 | 
						|
int no_sys()
 | 
						|
{
 | 
						|
/* Somebody has used an illegal system call number */
 | 
						|
  printf("no_sys: invalid call %d\n", req_nr);
 | 
						|
  return(EINVAL);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*===========================================================================*
 | 
						|
 *				conv2					     *
 | 
						|
 *===========================================================================*/
 | 
						|
unsigned conv2(norm, w)
 | 
						|
int norm;			/* TRUE if no swap, FALSE for byte swap */
 | 
						|
int w;				/* promotion of 16-bit word to be swapped */
 | 
						|
{
 | 
						|
/* Possibly swap a 16-bit word between 8086 and 68000 byte order. */
 | 
						|
  if (norm) return( (unsigned) w & 0xFFFF);
 | 
						|
  return( ((w&BYTE) << 8) | ( (w>>8) & BYTE));
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*===========================================================================*
 | 
						|
 *				conv4					     *
 | 
						|
 *===========================================================================*/
 | 
						|
long conv4(norm, x)
 | 
						|
int norm;			/* TRUE if no swap, FALSE for byte swap */
 | 
						|
long x;				/* 32-bit long to be byte swapped */
 | 
						|
{
 | 
						|
/* Possibly swap a 32-bit long between 8086 and 68000 byte order. */
 | 
						|
  unsigned lo, hi;
 | 
						|
  long l;
 | 
						|
  
 | 
						|
  if (norm) return(x);			/* byte order was already ok */
 | 
						|
  lo = conv2(FALSE, (int) x & 0xFFFF);	/* low-order half, byte swapped */
 | 
						|
  hi = conv2(FALSE, (int) (x>>16) & 0xFFFF);	/* high-order half, swapped */
 | 
						|
  l = ( (long) lo <<16) | hi;
 | 
						|
  return(l);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*===========================================================================*
 | 
						|
 *				clock_time				     *
 | 
						|
 *===========================================================================*/
 | 
						|
time_t clock_time()
 | 
						|
{
 | 
						|
/* This routine returns the time in seconds since 1.1.1970.  MINIX is an
 | 
						|
 * astrophysically naive system that assumes the earth rotates at a constant
 | 
						|
 * rate and that such things as leap seconds do not exist.
 | 
						|
 */
 | 
						|
 | 
						|
  register int k;
 | 
						|
  clock_t uptime;
 | 
						|
  clock_t realtime;
 | 
						|
  time_t boottime;
 | 
						|
 | 
						|
  if ( (k=getuptime(&uptime, &realtime, &boottime)) != OK)
 | 
						|
		panic("clock_time: getuptme2 failed: %d", k);
 | 
						|
  
 | 
						|
  return( (time_t) (boottime + (realtime/sys_hz())));
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*===========================================================================*
 | 
						|
 *				mfs_min					     *
 | 
						|
 *===========================================================================*/
 | 
						|
int min(unsigned int l, unsigned int r)
 | 
						|
{
 | 
						|
	if(r >= l) return(l);
 | 
						|
 | 
						|
	return(r);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*===========================================================================*
 | 
						|
 *				mfs_nul					     *
 | 
						|
 *===========================================================================*/
 | 
						|
void mfs_nul_f(char *file, int line, char *str, unsigned int len,
 | 
						|
unsigned int maxlen)
 | 
						|
{
 | 
						|
  if(len < maxlen && str[len-1] != '\0') {
 | 
						|
	printf("MFS %s:%d string (length %d, maxlen %d) not null-terminated\n",
 | 
						|
		file, line, len, maxlen);
 | 
						|
  }
 | 
						|
}
 | 
						|
 | 
						|
#define MYASSERT(c) if(!(c)) { printf("MFS:%s:%d: sanity check: %s failed\n", \
 | 
						|
  file, line, #c); panic("sanity check " #c " failed: %d", __LINE__); }
 | 
						|
 |