2004-01-24 00:22:41 +01:00
|
|
|
$NetBSD: patch-ac,v 1.9 2004/01/23 23:22:41 wiz Exp $
|
2003-07-14 12:07:10 +02:00
|
|
|
|
|
|
|
|
--- vfu/vfu.cpp.orig 2002-05-24 18:55:36.000000000 +0200
|
|
|
|
|
+++ vfu/vfu.cpp
|
2004-01-24 00:22:41 +01:00
|
|
|
@@ -9,6 +9,7 @@
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
+#include <stdarg.h>
|
|
|
|
|
#include "vfu.h"
|
|
|
|
|
#include "vfuopt.h"
|
|
|
|
|
#include "vfufiles.h"
|
|
|
|
|
@@ -485,8 +486,6 @@ void vfu_help()
|
2003-07-14 12:07:10 +02:00
|
|
|
mb.push( " 1. $HOME/$RC_PREFIX/vfu/vfu.conf");
|
|
|
|
|
mb.push( " 2. $HOME/.vfu/vfu.conf");
|
|
|
|
|
mb.push( " 3. " FILENAME_CONF_GLOBAL0 );
|
|
|
|
|
- mb.push( " 4. " FILENAME_CONF_GLOBAL1 );
|
|
|
|
|
- mb.push( " 5. " FILENAME_CONF_GLOBAL2 );
|
|
|
|
|
mb.push( "" );
|
|
|
|
|
vfu_menu_box( 1, 4, "VFU Help ( PageUp/PageDown to scroll )" );
|
|
|
|
|
mb.zap();
|
2004-01-24 00:22:41 +01:00
|
|
|
@@ -604,10 +603,6 @@ void vfu_init()
|
2003-07-14 12:07:10 +02:00
|
|
|
{ /* cannot find local/user conf file, try globals */
|
|
|
|
|
if ( access( FILENAME_CONF_GLOBAL0, R_OK ) == 0 )
|
|
|
|
|
filename_conf = FILENAME_CONF_GLOBAL0;
|
|
|
|
|
- if ( access( FILENAME_CONF_GLOBAL1, R_OK ) == 0 )
|
|
|
|
|
- filename_conf = FILENAME_CONF_GLOBAL1;
|
|
|
|
|
- if ( access( FILENAME_CONF_GLOBAL2, R_OK ) == 0 )
|
|
|
|
|
- filename_conf = FILENAME_CONF_GLOBAL2;
|
|
|
|
|
/* if we get here then no readable conf file found */
|
|
|
|
|
}
|
|
|
|
|
|
