toLoongarch/udevil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Communicate SYSCONFDIR to udevil and have it look up the config there, along with referencing the correct path in text

Browse Source
This commit is contained in:
Omega Weapon 2013-11-10 19:55:33 +00:00
parent e357f6cc02
commit 04ab5b682a
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -1,4 +1,5 @@
INCLUDES = -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" INCLUDES = -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\"
noinst_PROGRAMS = udevil noinst_PROGRAMS = udevil

4
src/Makefile.in
View File

@ -346,7 +346,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
INCLUDES = -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" INCLUDES = -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\"
udevil_SOURCES = udevil.c device-info.c canonicalize.c udevil_SOURCES = udevil.c device-info.c canonicalize.c
bin_SCRIPTS = devmon bin_SCRIPTS = devmon
INSTALL_DIR = $(DESTDIR)/$(prefix)/bin INSTALL_DIR = $(DESTDIR)/$(prefix)/bin

13
src/udevil.c
View File

@ -784,12 +784,12 @@ static char* parse_config()
char* str; char* str;
char* msg = NULL; char* msg = NULL;
conf_path = g_strdup_printf( "/etc/udevil/udevil-user-%s.conf", g_get_user_name() ); conf_path = g_strdup_printf( "%s/udevil/udevil-user-%s.conf", SYSCONFDIR, g_get_user_name() );
file = fopen( conf_path, "r" ); file = fopen( conf_path, "r" );
if ( !file ) if ( !file )
{ {
g_free( conf_path ); g_free( conf_path );
conf_path = g_strdup_printf( "/etc/udevil/udevil.conf" ); conf_path = g_strdup_printf( SYSCONFDIR "/udevil/udevil.conf" );
file = fopen( conf_path, "r" ); file = fopen( conf_path, "r" );
} }
drop_privileges( 0 ); // file is open now so drop priv drop_privileges( 0 ); // file is open now so drop priv
@ -900,7 +900,7 @@ static char* parse_config()
} }
else else
{ {
msg = g_strdup_printf( _("udevil: warning 7: /etc/udevil/udevil.conf could not be read\n") ); msg = g_strdup_printf( _("udevil: warning 7: %s/udevil/udevil.conf could not be read\n"), SYSCONFDIR );
g_free( conf_path ); g_free( conf_path );
conf_path = NULL; conf_path = NULL;
} }
@ -4900,7 +4900,8 @@ static void show_help()
printf( _("HELP - Show this help\n") ); printf( _("HELP - Show this help\n") );
printf( " udevil help|--help|-h\n" ); printf( " udevil help|--help|-h\n" );
printf( "\n" ); printf( "\n" );
printf( "http://ignorantguru.github.com/udevil/ %s\n", _("See /etc/udevil/udevil.conf for config.") ); printf( "http://ignorantguru.github.com/udevil/ " );
printf( _("See %s/udevil/udevil.conf for config.\n"), SYSCONFDIR );
printf( _("For automounting with udevil run 'devmon --help'\n") ); printf( _("For automounting with udevil run 'devmon --help'\n") );
printf( "\n" ); printf( "\n" );
@ -4997,8 +4998,10 @@ printf("\n-----------------------\n");
wlog( str, NULL, 0 ); wlog( str, NULL, 0 );
g_free( str ); g_free( str );
} }
// Configuration file path left out as it is dependent on SYSCONFDIR
if ( config_msg && strcmp( config_msg, if ( config_msg && strcmp( config_msg,
_("udevil: read config /etc/udevil/udevil.conf\n") ) ) _("udevil: read config ") ) )
// this only works for english // this only works for english
wlog( config_msg, NULL, strstr( config_msg, "warning:" ) ? 1 : 0 ); wlog( config_msg, NULL, strstr( config_msg, "warning:" ) ? 1 : 0 );
g_free( config_msg ); g_free( config_msg );