diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-13 22:23:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-13 22:23:07 +0000 |
| commit | 7ca1934641a4a029ff04113b39b5da789f881b4c (patch) | |
| tree | 08e5c907746c062e7ff75c3ad3fabc47c32d685f | |
| parent | 077baaed26a0063c1777eaea9cf0650004eb2ea8 (diff) | |
long botches
| -rw-r--r-- | usr.bin/rdistd/filesys-os.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/rdistd/filesys-os.c b/usr.bin/rdistd/filesys-os.c index 43226af378f..a08fb750c36 100644 --- a/usr.bin/rdistd/filesys-os.c +++ b/usr.bin/rdistd/filesys-os.c @@ -33,7 +33,7 @@ #ifndef lint static char RCSid[] = -"$Id: filesys-os.c,v 1.1 1996/02/03 12:12:55 dm Exp $"; +"$Id: filesys-os.c,v 1.2 1996/06/13 22:23:06 deraadt Exp $"; static char sccsid[] = "@(#)filesys-os.c"; @@ -51,7 +51,6 @@ static char copyright[] = #if FSI_TYPE == FSI_GETFSSTAT static struct statfs *mnt = NULL; -typedef u_long ulong; #if FSTYPENAME #define f_type_eq(a, b) (! strcmp (((struct statfs *) (a))->f_fstypename, (b))) #else /* !FSTYPENAME */ @@ -77,7 +76,7 @@ FILE *setmountent(file, mode) char *file; char *mode; { - ulong size; + u_int size; if (mntbuf) (void) free(mntbuf); @@ -103,12 +102,14 @@ FILE *setmountent(file, mode) char *file; char *mode; { - ulong size; + int size; if (mntbuf) (void) free(mntbuf); size = getfsstat((struct statfs *) NULL, 0, MNT_WAIT); + if (size == -1) + return ((FILE *)NULL); size *= sizeof(struct statfs); mntbuf = (char *) xmalloc(size); @@ -144,7 +145,7 @@ mntent_t *getmountent(fptr) mntstruct.me_flags |= MEFLAG_READONLY; mntstruct.me_path = vmt2dataptr(mnt, VMT_STUB); - switch ((ulong)(struct vmount*)mnt->vmt_gfstype) { + switch ((struct vmount*)mnt->vmt_gfstype) { case MNT_NFS: mntstruct.me_type = METYPE_NFS; break; |