===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdistd/filesys-os.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/rdistd/filesys-os.c	1997/06/17 20:37:53	1.4
--- src/usr.bin/rdistd/filesys-os.c	1998/06/26 21:20:47	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: filesys-os.c,v 1.4 1997/06/17 20:37:53 kstailey Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: filesys-os.c,v 1.5 1998/06/26 21:20:47 millert Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 34,41 ****
   */
  
  #ifndef lint
  static char RCSid[] = 
! "$OpenBSD: filesys-os.c,v 1.4 1997/06/17 20:37:53 kstailey Exp $";
  
  static char sccsid[] = "@(#)filesys-os.c";
  
--- 34,46 ----
   */
  
  #ifndef lint
+ #if 0
  static char RCSid[] = 
! "$From: filesys-os.c,v 6.17 1996/01/17 21:02:45 mcooper Exp mcooper $";
! #else
! static char RCSid[] = 
! "$OpenBSD: filesys-os.c,v 1.5 1998/06/26 21:20:47 millert Exp $";
! #endif
  
  static char sccsid[] = "@(#)filesys-os.c";
  
***************
*** 54,63 ****
  #if 	FSI_TYPE == FSI_GETFSSTAT
  static struct statfs   *mnt = NULL;
  #if	FSTYPENAME
! #define f_type_eq(a, b) (! strcmp (((struct statfs *) (a))->f_fstypename, (b)))
  #else	/* !FSTYPENAME */
  #define	f_type_eq(a, b) (((struct statfs *) a)->f_type == (b))
! #endif /* !FSTYPENAME */
  #endif	/* FSI_GETFSSTAT */
  
  #if	FSI_TYPE == FSI_MNTCTL
--- 59,68 ----
  #if 	FSI_TYPE == FSI_GETFSSTAT
  static struct statfs   *mnt = NULL;
  #if	FSTYPENAME
! #define	f_type_eq(a, b) (! strcmp (((struct statfs *) (a))->f_fstypename, (b)))
  #else	/* !FSTYPENAME */
  #define	f_type_eq(a, b) (((struct statfs *) a)->f_type == (b))
! #endif	/* !FSTYPENAME */
  #endif	/* FSI_GETFSSTAT */
  
  #if	FSI_TYPE == FSI_MNTCTL
***************
*** 78,84 ****
  	char *file;
  	char *mode;
  {
! 	u_int size;
  
  	if (mntbuf)
  		(void) free(mntbuf);
--- 83,89 ----
  	char *file;
  	char *mode;
  {
! 	ulong size;
  
  	if (mntbuf)
  		(void) free(mntbuf);
***************
*** 104,110 ****
  	char *file;
  	char *mode;
  {
! 	int size;
  
  	if (mntbuf)
  		(void) free(mntbuf);
--- 109,115 ----
  	char *file;
  	char *mode;
  {
! 	long size;
  
  	if (mntbuf)
  		(void) free(mntbuf);
***************
*** 147,153 ****
  		mntstruct.me_flags |= MEFLAG_READONLY;
  
  	mntstruct.me_path = vmt2dataptr(mnt, VMT_STUB);
! 	switch ((struct vmount*)mnt->vmt_gfstype) {
  	      case MNT_NFS:
  		mntstruct.me_type = METYPE_NFS;
  		break;
--- 152,158 ----
  		mntstruct.me_flags |= MEFLAG_READONLY;
  
  	mntstruct.me_path = vmt2dataptr(mnt, VMT_STUB);
! 	switch ((ulong)(struct vmount*)mnt->vmt_gfstype) {
  	      case MNT_NFS:
  		mntstruct.me_type = METYPE_NFS;
  		break;
***************
*** 187,198 ****
  	if (mnt->f_flags & M_RDONLY)
  		mntstruct.me_flags |= MEFLAG_READONLY;
  #endif
! 	if (f_type_eq (mnt, MOUNT_NFS)) {
  		(void) sprintf(remote_dev, "%s", mnt->f_mntfromname);
  		mntstruct.me_path = remote_dev;
  		mntstruct.me_type = METYPE_NFS;
! 	}
! 	else {
  		mntstruct.me_path = mnt->f_mntonname;
  		mntstruct.me_type = METYPE_OTHER;
  	}
--- 192,202 ----
  	if (mnt->f_flags & M_RDONLY)
  		mntstruct.me_flags |= MEFLAG_READONLY;
  #endif
! 	if (f_type_eq(mnt, MOUNT_NFS)) {
  		(void) sprintf(remote_dev, "%s", mnt->f_mntfromname);
  		mntstruct.me_path = remote_dev;
  		mntstruct.me_type = METYPE_NFS;
! 	} else {
  		mntstruct.me_path = mnt->f_mntonname;
  		mntstruct.me_type = METYPE_OTHER;
  	}
***************
*** 348,353 ****
--- 352,358 ----
  	char *mode;
  {
  	startmounts = 0;
+ 	return(stdin);		/* XXX - need to return something! */
  }
  
  void endmountent(fptr)