Double // in codepages list error

[David Martin <dmartina excite es>]

The error message about the codepages list missing
shows a double slash before the file name. Just in
case, I have a K6-400 PC with a freshly installed 
Mandrake 8.0, gcc 2.96 and kernel 2.4.7 and I'm
compiling yesterday's snapshot.

Here's the quick fix using concat_dir_and_file.

The same thing happens in the called function
(load_codepages_list() in charsets.c) hidden and
hopefully harmless...

I hope I'm doing better with Changelogs this time.
I've already updated Spanish translations, but I'll
wait a couple of days for this one.

*8-) David

-----------------------------------

diff -upr mc-4.5.54a-proski/src/ChangeLog mc-4.5.54a/src/ChangeLog
--- mc-4.5.54a-proski/src/ChangeLog	Wed Aug  8 04:19:14 2001
+++ mc-4.5.54a/src/ChangeLog	Sat Aug 11 18:40:58 2001
@@ -1,3 +1,8 @@
+2001-08-11  David Martin  <dmartina excite es>
+
+	* setup.c (load_setup): Use concat_dir_and_file() to avoid
+	the double '//' in path to file in error message.
+
 2001-08-07  Pavel Roskin  <proski gnu org>
 
 	* view.c: Warning fixes. Include "cmd.h". Rename help_cmd()
diff -upr mc-4.5.54a-proski/src/setup.c mc-4.5.54a/src/setup.c
--- mc-4.5.54a-proski/src/setup.c	Tue Jul 24 02:22:05 2001
+++ mc-4.5.54a/src/setup.c	Sat Aug 11 18:30:35 2001
@@ -651,7 +651,9 @@ load_setup (void)
 
 #ifdef HAVE_CHARSET
     if ( load_codepages_list() <= 0 ) {
-	message( 1, MSG_ERROR, _("Can't load %s/%s"), mc_home, CHARSETS_INDEX );
+	char *tmpbuf = concat_dir_and_file ( mc_home, CHARSETS_INDEX );
+	message( 1, MSG_ERROR, _("Can't load %s"), tmpbuf );
+	g_free ( tmpbuf );
     } else {
 	char cpname[128];
 	load_string( "Misc", "display_codepage", "",






_______________________________________________________
¡Tienes cuentas de e-mail GRATIS en Excite España!
A tu disposición en http://correo.excite.es 

diff -upr mc-4.5.54a-proski/src/ChangeLog mc-4.5.54a/src/ChangeLog
--- mc-4.5.54a-proski/src/ChangeLog	Wed Aug  8 04:19:14 2001
+++ mc-4.5.54a/src/ChangeLog	Sat Aug 11 18:40:58 2001
@@ -1,3 +1,8 @@
+2001-08-11  David Martin  <dmartina excite es>
+
+	* setup.c (load_setup): Use concat_dir_and_file() to avoid
+	the double '//' in path to file in error message.
+
 2001-08-07  Pavel Roskin  <proski gnu org>
 
 	* view.c: Warning fixes. Include "cmd.h". Rename help_cmd()
diff -upr mc-4.5.54a-proski/src/setup.c mc-4.5.54a/src/setup.c
--- mc-4.5.54a-proski/src/setup.c	Tue Jul 24 02:22:05 2001
+++ mc-4.5.54a/src/setup.c	Sat Aug 11 18:30:35 2001
@@ -651,7 +651,9 @@ load_setup (void)
 
 #ifdef HAVE_CHARSET
     if ( load_codepages_list() <= 0 ) {
-	message( 1, MSG_ERROR, _("Can't load %s/%s"), mc_home, CHARSETS_INDEX );
+	char *tmpbuf = concat_dir_and_file ( mc_home, CHARSETS_INDEX );
+	message( 1, MSG_ERROR, _("Can't load %s"), tmpbuf );
+	g_free ( tmpbuf );
     } else {
 	char cpname[128];
 	load_string( "Misc", "display_codepage", "",