Module Name: othersrc
Committed By: pooka
Date: Wed Apr 1 16:01:40 UTC 2009
Modified Files:
othersrc/lib/libfsu_mount: Makefile fsu_mount.c
Log Message:
* make option WITH_SYSPUFFS -> FSU_WITH_SYSPUFFS
* fix compilation with said option
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 othersrc/lib/libfsu_mount/Makefile
cvs rdiff -u -r1.4 -r1.5 othersrc/lib/libfsu_mount/fsu_mount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/lib/libfsu_mount/Makefile
diff -u othersrc/lib/libfsu_mount/Makefile:1.2 othersrc/lib/libfsu_mount/Makefile:1.3
--- othersrc/lib/libfsu_mount/Makefile:1.2 Tue Mar 24 15:14:23 2009
+++ othersrc/lib/libfsu_mount/Makefile Wed Apr 1 16:01:40 2009
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/01 16:01:40 pooka Exp $
#
+.include <bsd.own.mk>
+
WARNS?= 4
MKLINT= no
@@ -14,7 +16,7 @@
INCS= fsu_mount.h
MAN= fsu_mount.3
-.ifdef WITH_SYSPUFFS
+.ifdef FSU_WITH_SYSPUFFS
SRCS+= rump_syspuffs.c
CPPFLAGS+= -DWITH_SYSPUFFS
.endif
Index: othersrc/lib/libfsu_mount/fsu_mount.c
diff -u othersrc/lib/libfsu_mount/fsu_mount.c:1.4 othersrc/lib/libfsu_mount/fsu_mount.c:1.5
--- othersrc/lib/libfsu_mount/fsu_mount.c:1.4 Tue Mar 24 16:06:52 2009
+++ othersrc/lib/libfsu_mount/fsu_mount.c Wed Apr 1 16:01:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fsu_mount.c,v 1.4 2009/03/24 16:06:52 pooka Exp $ */
+/* $NetBSD: fsu_mount.c,v 1.5 2009/04/01 16:01:40 pooka Exp $ */
/*
* Copyright (c) 2008 Arnaud Ysmal. All Rights Reserved.
@@ -158,15 +158,13 @@
char *mntopts, afsdev[MAXPATHLEN], *path;
#ifdef WITH_SYSPUFFS
- const char options[] = "f:o:p:t:", *puffsexec;
+ const char options[] = "f:o:p:t:";
+ char *puffsexec = NULL;
#else
const char options[] = "f:o:t:";
#endif
mntopts = fstype = fsdevice = NULL;
-#ifdef WITH_SYSPUFFS
- puffsexec = NULL;
-#endif
fst = NULL;
ukfs = NULL;
