Module Name: src
Committed By: christos
Date: Sat Jan 26 16:51:51 UTC 2013
Modified Files:
src/sys/fs/msdosfs: denode.h msdosfs_conv.c msdosfs_fat.c
msdosfs_lookup.c msdosfsmount.h
Log Message:
more cross-compile friendly.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/fs/msdosfs/denode.h
cvs rdiff -u -r1.8 -r1.9 src/sys/fs/msdosfs/msdosfs_conv.c
cvs rdiff -u -r1.24 -r1.25 src/sys/fs/msdosfs/msdosfs_fat.c
cvs rdiff -u -r1.28 -r1.29 src/sys/fs/msdosfs/msdosfs_lookup.c
cvs rdiff -u -r1.18 -r1.19 src/sys/fs/msdosfs/msdosfsmount.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/denode.h
diff -u src/sys/fs/msdosfs/denode.h:1.21 src/sys/fs/msdosfs/denode.h:1.22
--- src/sys/fs/msdosfs/denode.h:1.21 Fri Jan 25 19:21:49 2013
+++ src/sys/fs/msdosfs/denode.h Sat Jan 26 11:51:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: denode.h,v 1.21 2013/01/26 00:21:49 christos Exp $ */
+/* $NetBSD: denode.h,v 1.22 2013/01/26 16:51:51 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -49,7 +49,15 @@
#ifndef _MSDOSFS_DENODE_H_
#define _MSDOSFS_DENODE_H_
+#ifdef _KERNEL
#include <miscfs/genfs/genfs_node.h>
+#else
+struct genfs_node {
+};
+struct vnode;
+struct msdosfsmount;
+struct buf;
+#endif
/*
* This is the pc filesystem specific portion of the vnode structure.
@@ -289,13 +297,14 @@ int msdosfs_pathconf (void *);
*/
struct componentname;
struct direntry;
+struct kauth_cred;
int msdosfs_update(struct vnode *, const struct timespec *,
const struct timespec *, int);
int createde(struct denode *, struct denode *,
struct denode **, struct componentname *);
-int deextend(struct denode *, u_long, kauth_cred_t);
+int deextend(struct denode *, u_long, struct kauth_cred *);
int deget(struct msdosfsmount *, u_long, u_long, struct denode **);
-int detrunc(struct denode *, u_long, int, kauth_cred_t);
+int detrunc(struct denode *, u_long, int, struct kauth_cred *);
int deupdat(struct denode *, int);
int doscheckpath(struct denode *, struct denode *);
int dosdirempty(struct denode *);
@@ -306,7 +315,7 @@ void reinsert(struct denode *);
int removede(struct denode *, struct denode *);
int uniqdosname(struct denode *, struct componentname *, u_char *);
int findwin95(struct denode *);
-int msdosfs_gop_alloc(struct vnode *, off_t, off_t, int, kauth_cred_t);
+int msdosfs_gop_alloc(struct vnode *, off_t, off_t, int, struct kauth_cred *);
void msdosfs_gop_markupdate(struct vnode *, int);
void msdosfs_detimes(struct denode *, const struct timespec *,
const struct timespec *, const struct timespec *, int);
Index: src/sys/fs/msdosfs/msdosfs_conv.c
diff -u src/sys/fs/msdosfs/msdosfs_conv.c:1.8 src/sys/fs/msdosfs/msdosfs_conv.c:1.9
--- src/sys/fs/msdosfs/msdosfs_conv.c:1.8 Fri Jan 25 19:21:49 2013
+++ src/sys/fs/msdosfs/msdosfs_conv.c Sat Jan 26 11:51:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_conv.c,v 1.8 2013/01/26 00:21:49 christos Exp $ */
+/* $NetBSD: msdosfs_conv.c,v 1.9 2013/01/26 16:51:51 christos Exp $ */
/*-
* Copyright (C) 1995, 1997 Wolfgang Solfrank.
@@ -52,19 +52,22 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_conv.c,v 1.8 2013/01/26 00:21:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_conv.c,v 1.9 2013/01/26 16:51:51 christos Exp $");
/*
* System include files.
*/
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/time.h>
-#include <sys/kernel.h>
+#ifdef _KERNEL
#include <sys/dirent.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
#include <sys/vnode.h>
-#ifndef _KERNEL
+#else
#include <stdio.h>
+#include <dirent.h>
+#include <sys/queue.h>
#endif
/*
@@ -722,7 +725,9 @@ win2unixfn(struct winentry *wep, struct
/*
* This works even though d_namlen is one byte!
*/
+#ifdef __NetBSD__
dp->d_namlen = (wep->weCnt&WIN_CNT) * WIN_CHARS;
+#endif
} else if (chksum != wep->weChksum)
chksum = -1;
if (chksum == -1)
@@ -740,8 +745,10 @@ win2unixfn(struct winentry *wep, struct
for (cp = wep->wePart1, i = sizeof(wep->wePart1)/2; --i >= 0;) {
switch (*np++ = *cp++) {
case 0:
+#ifdef __NetBSD__
dp->d_namlen -= sizeof(wep->wePart2)/2
+ sizeof(wep->wePart3)/2 + i + 1;
+#endif
return chksum;
case '/':
np[-1] = 0;
@@ -762,7 +769,9 @@ win2unixfn(struct winentry *wep, struct
for (cp = wep->wePart2, i = sizeof(wep->wePart2)/2; --i >= 0;) {
switch (*np++ = *cp++) {
case 0:
+#ifdef __NetBSD__
dp->d_namlen -= sizeof(wep->wePart3)/2 + i + 1;
+#endif
return chksum;
case '/':
np[-1] = 0;
@@ -783,7 +792,9 @@ win2unixfn(struct winentry *wep, struct
for (cp = wep->wePart3, i = sizeof(wep->wePart3)/2; --i >= 0;) {
switch (*np++ = *cp++) {
case 0:
+#ifdef __NetBSD__
dp->d_namlen -= i + 1;
+#endif
return chksum;
case '/':
np[-1] = 0;
Index: src/sys/fs/msdosfs/msdosfs_fat.c
diff -u src/sys/fs/msdosfs/msdosfs_fat.c:1.24 src/sys/fs/msdosfs/msdosfs_fat.c:1.25
--- src/sys/fs/msdosfs/msdosfs_fat.c:1.24 Fri Jan 25 19:21:49 2013
+++ src/sys/fs/msdosfs/msdosfs_fat.c Sat Jan 26 11:51:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_fat.c,v 1.24 2013/01/26 00:21:49 christos Exp $ */
+/* $NetBSD: msdosfs_fat.c,v 1.25 2013/01/26 16:51:51 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -52,19 +52,19 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.24 2013/01/26 00:21:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.25 2013/01/26 16:51:51 christos Exp $");
/*
* kernel include files.
*/
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/file.h>
#include <sys/mount.h> /* to define statvfs structure */
+#ifdef _KERNEL
#include <sys/errno.h>
-#include <sys/dirent.h>
+#include <sys/systm.h>
#include <sys/kauth.h>
-#ifdef _KERNEL
+#include <sys/dirent.h>
#include <sys/namei.h>
#include <sys/buf.h>
#include <sys/vnode.h> /* to define vattr structure */
Index: src/sys/fs/msdosfs/msdosfs_lookup.c
diff -u src/sys/fs/msdosfs/msdosfs_lookup.c:1.28 src/sys/fs/msdosfs/msdosfs_lookup.c:1.29
--- src/sys/fs/msdosfs/msdosfs_lookup.c:1.28 Fri Jan 25 19:21:49 2013
+++ src/sys/fs/msdosfs/msdosfs_lookup.c Sat Jan 26 11:51:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_lookup.c,v 1.28 2013/01/26 00:21:49 christos Exp $ */
+/* $NetBSD: msdosfs_lookup.c,v 1.29 2013/01/26 16:51:51 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -52,16 +52,16 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.28 2013/01/26 00:21:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.29 2013/01/26 16:51:51 christos Exp $");
#include <sys/param.h>
+
+#ifdef _KERNEL
#include <sys/systm.h>
#include <sys/mount.h>
#include <sys/kauth.h>
#include <sys/namei.h>
#include <sys/dirent.h>
-
-#ifdef _KERNEL
#include <sys/buf.h>
#include <sys/vnode.h>
#else
Index: src/sys/fs/msdosfs/msdosfsmount.h
diff -u src/sys/fs/msdosfs/msdosfsmount.h:1.18 src/sys/fs/msdosfs/msdosfsmount.h:1.19
--- src/sys/fs/msdosfs/msdosfsmount.h:1.18 Fri Jan 25 19:21:49 2013
+++ src/sys/fs/msdosfs/msdosfsmount.h Sat Jan 26 11:51:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfsmount.h,v 1.18 2013/01/26 00:21:49 christos Exp $ */
+/* $NetBSD: msdosfsmount.h,v 1.19 2013/01/26 16:51:51 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -50,6 +50,7 @@
#ifndef _MSDOSFS_MSDOSFSMOUNT_H_
#define _MSDOSFS_MSDOSFSMOUNT_H_
+#ifndef MAKEFS
/*
* Arguments to mount MSDOS filesystems.
*/
@@ -67,6 +68,7 @@ struct msdosfs_args {
mode_t dirmask; /* v2: mask to be applied for msdosfs perms */
int gmtoff; /* v3: offset from UTC in seconds */
};
+#endif
/*
* Msdosfs mount options:
