Rerun configure when you have problems with missing slang.h.

Sun Jan 31 20:04:13 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>

* vfs/vfs.c (vfs_strip_suffix_from_filename): Whoever replaces every
occurance of 0 with NULL should stop this stupidy. And replacing '\0'
with NULL is plain wrong!!. Reverted this replacement.

* vfs/ftpfs.c (load_no_proxy_list): ditto


Fri Jan 29 22:55:56 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>

* slang/slang.h: renamed to slang-mc.h

* slang/Makefile.in: delete slang.h on "make clean"

* configure.in: link slang/slang-mc.h to slang/slang.h when the
included slang is used. Problem was that MC's slang.h was used
when we compiled with an already installed SLang and the systems
header file were included with <slang/slang.h>.
Unfortunatly I can't use AC_LINK_FILES to make the links because
if we needn't make any links AC_LINK_FILES makes a link from
srcdir to top_builddir (builddir != srcdir).

Temporary add $LGPM to $LIBS when checking for the resizeterm
and keyok functions (ncurses might be linked against GPM).

Substitude PACKAGE (intl/Makefile makes use of it)


Sun Jan 31 19:42:47 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>

* gnome/Makefile.in (install_mx): make it work with srcdir != builddir
(gmc.gnorba is located in $srcdir)

* src/hotlist.c (add_new_entry_input, add_new_group_input): Make the
quick_widget arrays static and various changes needed because they
are now static. add_widgets_i18n recalculates button positions
which get lost when the quick_widget arrays are non static.

* src/screen.c (to_buffer): nul terminate string when using strncpy

* src/setup.c: Save and restore new option ftpfs_first_cd_then_ls.


Sun Jan 31 19:57:24 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>

* vfs/ftpfs.c (insert_dot): New function. Insert a "." into the linked
list. Stat'ing the root directory of a ftpfs fails if the dot is
missing.

(retrieve_dir): insert "." into the linked list if the ftp server
haven't send it.

Sun Jan 31 19:50:24 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>

* The following changes make ftpfs work with a remote AmiTCP
server are the result of somehow longish EMail debugging session. I
don't know any public server of this kind but I was told the
combination Unix/Amiga boxes are often used in intranets.

* vfs/ftpfs.c (translate_path): New function. Translate a Unix path,
i.e. MC's internal path representation (e.g. /somedir/somefile) to
a path valid for the remote server. Every path transfered to the
remote server has to be mangled by this function right prior to
sending it. Currently only Amiga ftp servers are handled in a
special manner.

* vfs/ftpfs.c (various places): use translate_path

* vfs/ftpfs.c (login_server): Assume we have to mangle pathnames if
the greatings string from the server contains the word Amiga. If
this assumption is wrong I have to find another way to turn on
path translation.

* vfs/ftpfs.c (ftpfs_get_current_directory): Prepend a leading slash
if it is missing. MC needs it as seperator between hostname and
path in its internal url representation.

ChangeLog

@@ -1,3 +1,22 @@
+Fri Jan 29 22:55:56 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* slang/slang.h: renamed to slang-mc.h
+
+	* slang/Makefile.in: delete slang.h on "make clean"
+
+	* configure.in: link slang/slang-mc.h to slang/slang.h when the 
+	included slang is used. Problem was that MC's slang.h was used
+	when we compiled with an already installed SLang and the systems
+	header file were included with <slang/slang.h>.
+	Unfortunatly I can't use AC_LINK_FILES to make the links because
+	if we needn't make any links AC_LINK_FILES makes a link from 
+	srcdir to top_builddir (builddir != srcdir).
+
+	Temporary add $LGPM to $LIBS when checking for the resizeterm
+	and keyok functions (ncurses might be linked against GPM).
+
+	Substitude PACKAGE (intl/Makefile makes use of it)
+
 Wed Jan 27 03:34:44 1999  Timur Bakeyev  <mc@bat.ru>
 
 	* gtkedit/edit.h: including of <malloc.h> and <stdlib.h> swaped by

configure.in

@@ -9,6 +9,7 @@ VERSION=4.5.9
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)
+AC_SUBST(PACKAGE)
 
 dnl This is path where we're looking for headers in addition to /usr/include
 dnl and whatever cpp defaults to.
@@ -819,12 +820,16 @@ AC_DEFUN(AC_WITH_SLANG,
 	    LSLANG="-lslang"
 	    screen_manager="SLang (using system-installed library)"
 	    AC_MSG_RESULT(Using system installed SLang library)
+	    rm slang/slang.h
 	else
 	    MCCPPFLAGS="$MCCPPFLAGS -I\$(slangdir)"
     	    LIBSLANG="libmcslang.a"
 	    screen_manager="SLang"
 	    LSLANG="-lmcslang"
+	    CPPFLAGS="$CPPFLAGS -I../slang"
 	    fastdepslang=fastdepslang
+	    rm slang/slang.h
+	    ln -s ../$srcdir/slang/slang-mc.h slang/slang.h
 	fi
 	if $slang_check_lib
 	then
@@ -1071,7 +1076,14 @@ changequote([,])dnl
 	esac
     fi
 fi
+
+dnl Ncurses may be linked against libgpm. Change LIBS temporary for
+dnl check for resizeterm and keyok.
+dnl
+SAVED_LIBS="$LIBS"
+LIBS="$LIBS $LGPM"
 AC_CHECK_FUNCS(resizeterm keyok)
+LIBS="$SAVED_LIBS"
 
 if test "x$screen_manager" = "xunknown"; then
     AC_WITH_SLANG

gnome/ChangeLog

@@ -1,3 +1,8 @@
+Sun Jan 31 19:42:47 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* Makefile.in (install_mx): make it work with srcdir != builddir
+	(gmc.gnorba is located in $srcdir)
+
 1999-01-29  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* gdesktop.c (reload_desktop_icons): Move metadata_unlock after

gnome/Makefile.in

@@ -284,7 +284,7 @@ install_mx: all
 	$(mcsrcdir)/xmkdir $(DESTDIR)$(datadir)/mime-info
 	$(INSTALL_DATA) mc.keys $(DESTDIR)$(datadir)/mime-info
 	$(mcsrcdir)/xmkdir $(DESTDIR)$(corbadir)
-	$(INSTALL_DATA) gmc.gnorba $(DESTDIR)$(corbadir)
+	$(INSTALL_DATA) $(srcdir)/gmc.gnorba $(DESTDIR)$(corbadir)
 
 uninstall: 
 	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)gmc

slang/.cvsignore

@@ -1 +1,2 @@
 Makefile
+slang.h

slang/Makefile.in

@@ -51,7 +51,7 @@ TAGS: $(SLANGSRCS)
 	etags $(SLANGSRCS)
 
 clean:
-	$(RMF) *.o core a.out libmcslang.a
+	$(RMF) *.o core a.out libmcslang.a slang.h
 
 realclean: clean
 	$(RMF) .depend

src/ChangeLog

@@ -1,3 +1,14 @@
+Sun Jan 31 19:49:00 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* hotlist.c (add_new_entry_input, add_new_group_input): Make the
+	quick_widget arrays static and various changes needed because they
+	are now static. add_widgets_i18n recalculates button positions 
+	which get lost when the quick_widget arrays are non static.
+
+	* screen.c (to_buffer): nul terminate string when using strncpy
+
+	* setup.c: Save and restore new option ftpfs_first_cd_then_ls.
+
 1999-01-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* file.c (panel_operate_generate_prompt): Removed the cmd_buf

src/hotlist.c

@@ -805,18 +805,26 @@ static void add_widgets_i18n(QuickWidget* qw, int len)
 
 static int add_new_entry_input (char *header, char *text1, char *text2, char *help, char **r1, char **r2)
 {
+#define RELATIVE_Y_BUTTONS	4
+#define RELATIVE_Y_LABEL_PTH	3
+#define RELATIVE_Y_INPUT_PTH	4
+
     QuickDialog Quick_input;
-    QuickWidget quick_widgets [] = {
-    { quick_button, 55, 80, 4, 0, N_("&Cancel"), 0, B_CANCEL, 0, 0,
-	  XV_WLAY_DONTCARE, "button-cancel" },
-    { quick_button, 30, 80, 4, 0, N_("&Insert"), 0, B_INSERT, 0, 0,
-	  XV_WLAY_DONTCARE, "button-insert" },
-    { quick_button, 10, 80, 4, 0, N_("&Append"), 0, B_APPEND, 0, 0,
-	  XV_WLAY_DONTCARE, "button-append" },
-    { quick_input,  4, 80, 4, 0, "",58, 0, 0, 0, XV_WLAY_BELOWCLOSE, "input-pth" },
-    { quick_label,  3, 80, 3, 0, 0, 0, 0, 0, 0, XV_WLAY_DONTCARE, "label-pth" },
-    { quick_input,  4, 80, 3, 0, "", 58, 0, 0, 0, XV_WLAY_BELOWCLOSE, "input-lbl" },
-    { quick_label,  3, 80, 2, 0, 0, 0, 0, 0, 0, XV_WLAY_DONTCARE, "label-lbl" },
+    static QuickWidget quick_widgets [] = {
+    { quick_button, 55, 80, RELATIVE_Y_BUTTONS, 0, N_("&Cancel"), 0, B_CANCEL, 
+	  0, 0, XV_WLAY_DONTCARE, "button-cancel" },
+    { quick_button, 30, 80, RELATIVE_Y_BUTTONS, 0, N_("&Insert"), 0, B_INSERT, 
+	  0, 0, XV_WLAY_DONTCARE, "button-insert" },
+    { quick_button, 10, 80, RELATIVE_Y_BUTTONS, 0, N_("&Append"), 0, B_APPEND, 
+	  0, 0, XV_WLAY_DONTCARE, "button-append" },
+    { quick_input,  4, 80, RELATIVE_Y_INPUT_PTH, 0, "",58, 0, 
+	  0, 0, XV_WLAY_BELOWCLOSE, "input-pth" },
+    { quick_label, RELATIVE_Y_LABEL_PTH, 80, 3, 0, 0, 0, 0, 
+	  0, 0, XV_WLAY_DONTCARE, "label-pth" },
+    { quick_input,  4, 80, 3, 0, "", 58, 0, 
+	  0, 0, XV_WLAY_BELOWCLOSE, "input-lbl" },
+    { quick_label,  3, 80, 2, 0, 0, 0, 0, 
+	  0, 0, XV_WLAY_DONTCARE, "label-lbl" },
     { 0 } };
     
     int len;
@@ -855,11 +863,11 @@ static int add_new_entry_input (char *header, char *text1, char *text2, char *he
 	quick_widgets [i].y_divisions = lines1+lines2+7;
     Quick_input.ylen  = lines1 + lines2 + 7;
 
-    quick_widgets [0].relative_y += (lines1 + lines2);
-    quick_widgets [1].relative_y += (lines1 + lines2);
-    quick_widgets [2].relative_y += (lines1 + lines2);
-    quick_widgets [3].relative_y += (lines1);
-    quick_widgets [4].relative_y += (lines1);
+    quick_widgets [0].relative_y = RELATIVE_Y_BUTTONS + (lines1 + lines2);
+    quick_widgets [1].relative_y = RELATIVE_Y_BUTTONS + (lines1 + lines2);
+    quick_widgets [2].relative_y = RELATIVE_Y_BUTTONS + (lines1 + lines2);
+    quick_widgets [3].relative_y = RELATIVE_Y_INPUT_PTH + (lines1);
+    quick_widgets [4].relative_y = RELATIVE_Y_LABEL_PTH + (lines1);
 
     quick_widgets [5].str_result = &my_str1;
     quick_widgets [3].str_result = &my_str2;
@@ -899,7 +907,7 @@ static int add_new_group_input (char *header, char *label, char **result)
 {
     int		ret;
     QuickDialog Quick_input;
-    QuickWidget quick_widgets [] = {
+    static QuickWidget quick_widgets [] = {
     { quick_button, 55, 80, 1, 0, N_("&Cancel"), 0, B_CANCEL, 0, 0,
 	  XV_WLAY_DONTCARE, "button-cancel" },
     { quick_button, 30, 80, 1, 0, N_("&Insert"), 0, B_INSERT, 0, 0,
@@ -909,7 +917,8 @@ static int add_new_group_input (char *header, char *label, char **result)
     { quick_input,  4, 80,  0, 0, "", 58, 0, 0, 0, XV_WLAY_BELOWCLOSE, "input" },
     { quick_label,  3, 80,  2, 0,  0,  0, 0, 0, 0, XV_WLAY_DONTCARE, "label" },
     { 0 } };
-    
+    int relative_y[] = {1, 1, 1, 0, 2}; /* the relative_x component from the
+                                           quick_widgets variable above */
     int len;
     int i;
     int lines;
@@ -943,7 +952,7 @@ static int add_new_group_input (char *header, char *label, char **result)
     Quick_input.ylen  = lines + 6;
 
     for (i = 0; i < 4; i++)
-	quick_widgets [i].relative_y += 2 + lines;
+	quick_widgets [i].relative_y = relative_y[i] + 2 + lines;
 
     quick_widgets [3].str_result = &my_str;
     quick_widgets [3].text       = "";

src/screen.c

@@ -477,6 +477,7 @@ to_buffer (char *dest, int just_mode, int len, char *txt)
 	    *dest++ = ' ';
 	strncpy (dest, txt, len);
 	dest += txtlen;
+	*dest = 0;
     }
     return dest;
 }