Fixed problem with statfs; do not force compiler optimisations any more

6 files changed, 101 insertions, 4 deletions

diff --git a/misc/vfu/distinfo b/misc/vfu/distinfo
index 9d27be8d584..b193e8c0a70 100644
--- a/misc/vfu/distinfo
+++ b/misc/vfu/distinfo
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.6 2004/01/23 23:22:49 wiz Exp $
+$NetBSD: distinfo,v 1.7 2004/05/24 09:10:06 adam Exp $
 
 SHA1 (vfu-3.04.src.tar.gz) = 75e87d102114dc08136420e7927e687f72a52dfd
 Size (vfu-3.04.src.tar.gz) = 187519 bytes
 SHA1 (patch-aa) = ce204485f8c781a6ffeb25e4de4de21cdf33b473
 SHA1 (patch-ab) = bb935cd9127479517daf36480e2637cd5447b978
-SHA1 (patch-ac) = 429c460766461201ff2f52d2176e38a0bd737e67
+SHA1 (patch-ac) = 72c05012c39bb785b4eea5d41c51bd1787e463f8
 SHA1 (patch-ad) = 1410335b46d58ad9ec973b5a6b9ebe52091c0012
+SHA1 (patch-ae) = a2076bb4754bc433898529734f7b25a5efd2ba57
+SHA1 (patch-af) = 056851af215dbf1195b9e7f00b6b654261473945
+SHA1 (patch-ag) = 3e87916630a0e9628cc28097bf2d011d15fadc42
+SHA1 (patch-ah) = 50b211c8ca93393f38ed7e279795e1df0606884c
diff --git a/misc/vfu/patches/patch-ac b/misc/vfu/patches/patch-ac
index 338af021274..602a454c978 100644
--- a/misc/vfu/patches/patch-ac
+++ b/misc/vfu/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.9 2004/01/23 23:22:41 wiz Exp $
+$NetBSD: patch-ac,v 1.10 2004/05/24 09:10:06 adam Exp $
 
---- vfu/vfu.cpp.orig	2002-05-24 18:55:36.000000000 +0200
+--- vfu/vfu.cpp.orig	2002-05-24 16:55:36.000000000 +0000
 +++ vfu/vfu.cpp
 @@ -9,6 +9,7 @@
   *
@@ -30,3 +30,31 @@ $NetBSD: patch-ac,v 1.9 2004/01/23 23:22:41 wiz Exp $
      /* if we get here then no readable conf file found */   
      }
    
+@@ -1157,8 +1152,13 @@ void update_status()
+     files_size += s;  
+     }  
+   /* current fs statistics */  
++#ifdef _SYS_STATVFS_H_
++  struct statvfs stafs;
++  statvfs( ".", &stafs );
++#else
+   struct statfs stafs;
+   statfs( ".", &stafs );
++#endif
+   fs_free  = (fsize_t)(stafs.f_bsize) * (opt.show_user_free?stafs.f_bavail:stafs.f_bfree);
+   fs_total = (fsize_t)(stafs.f_bsize) * stafs.f_blocks;
+   fs_block_size = (fsize_t)(stafs.f_bsize);
+@@ -2391,8 +2391,13 @@ void vfu_jump_to_mountpoint( int all )
+     str_word( str, " \t", t ); /* get mount point */
+     va.set( z, t ); /* replace line with mount point only */
+ 
++#ifdef _SYS_STATVFS_H_
++    struct statvfs stafs;
++    statvfs( t, &stafs );
++#else
+     struct statfs stafs;
+     statfs( t, &stafs );
++#endif
+     int hk = ('A'+ z); /* hot key */
+     #ifdef _TARGET_GO32_
+     if (toupper(t[0]) >= 'A' && toupper(t[0]) <= 'Z' && toupper(t[1]) == ':')
diff --git a/misc/vfu/patches/patch-ae b/misc/vfu/patches/patch-ae
new file mode 100644
index 00000000000..736c18c53e1
--- /dev/null
+++ b/misc/vfu/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.5 2004/05/24 09:10:06 adam Exp $
+
+--- vslib/makefile.orig	2002-04-26 07:24:06.000000000 +0000
++++ vslib/makefile
+@@ -29,8 +29,8 @@ RMFILE     = rm -f
+ CC_0      = g++
+ LD_0      = g++
+ AR_0      = ar rvs
+-CFLAGS_0  = 
+-CCFLAGS_0 = -I. -O2 $(CCDEF)
++CFLAGS_0  = ${CFLAGS}
++CCFLAGS_0 = -I. $(CCDEF)
+ LDFLAGS_0 = $(LDDEF)
+ ARFLAGS_0 = 
+ TARGET_0  = libvslib.a
diff --git a/misc/vfu/patches/patch-af b/misc/vfu/patches/patch-af
new file mode 100644
index 00000000000..9eae6ea3063
--- /dev/null
+++ b/misc/vfu/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.3 2004/05/24 09:10:06 adam Exp $
+
+--- vfu/makefile.orig	2001-10-28 13:42:13.000000000 +0000
++++ vfu/makefile
+@@ -24,8 +24,8 @@ link: link-vfu 
+ CC_0      = g++
+ LD_0      = g++
+ AR_0      = ar rvs
+-CFLAGS_0  = 
+-CCFLAGS_0 = -I../vslib -I/usr/include/ncurses -O2 $(CCDEF)
++CFLAGS_0  = ${CFLAGS}
++CCFLAGS_0 = -I../vslib -I/usr/include/ncurses $(CCDEF)
+ LDFLAGS_0 = -L../vslib -lvslib -lvscon -lncurses $(LDDEF)
+ ARFLAGS_0 = 
+ TARGET_0  = vfu
diff --git a/misc/vfu/patches/patch-ag b/misc/vfu/patches/patch-ag
new file mode 100644
index 00000000000..add901496d2
--- /dev/null
+++ b/misc/vfu/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.3 2004/05/24 09:10:06 adam Exp $
+
+--- ftparc/makefile.orig	2001-10-28 14:05:00.000000000 +0000
++++ ftparc/makefile
+@@ -21,8 +21,8 @@ link: link-ftparc 
+ CC_0      = g++
+ LD_0      = g++
+ AR_0      = ar rvs
+-CFLAGS_0  = 
+-CCFLAGS_0 = -I../vslib -O2     $(CCDEF)
++CFLAGS_0  = ${CFLAGS}
++CCFLAGS_0 = -I../vslib $(CCDEF)
+ LDFLAGS_0 = -L../vslib -lvslib $(LDDEF)
+ ARFLAGS_0 = 
+ TARGET_0  = ftparc
diff --git a/misc/vfu/patches/patch-ah b/misc/vfu/patches/patch-ah
new file mode 100644
index 00000000000..b7255bed2e0
--- /dev/null
+++ b/misc/vfu/patches/patch-ah
@@ -0,0 +1,20 @@
+$NetBSD: patch-ah,v 1.3 2004/05/24 09:10:06 adam Exp $
+
+--- vfu/vfucopy.cpp.orig	2004-05-24 10:52:29.000000000 +0000
++++ vfu/vfucopy.cpp
+@@ -30,9 +30,15 @@ int ignore_copy_errors = 0; /* actually 
+ fsize_t device_free_space( const char *target ) /* user free space, NOT real! */
+ {
+   char t[MAX_PATH];
++#ifdef _SYS_STATVFS_H_
++  struct statvfs stafs;
++  str_file_path( target, t );
++  statvfs( t, &stafs );
++#else
+   struct statfs stafs;
+   str_file_path( target, t );
+   statfs( t, &stafs );
++#endif
+   return ((fsize_t)(stafs.f_bsize)) * stafs.f_bfree;
+ };
+