updated: [bbf507b] Merge branch '161_drop_bundled_slang'

Patrick Winnertz winnie at debian.org
Thu Feb 5 09:41:35 UTC 2009


The following commit has been merged in the master branch:
commit bbf507b237bfbbfb3280bdbff6c10eaf9726e78d
Merge: 76da0dd3e59e8d0a0746bec8eeed3eb172da6bf5 4f9185a3eedb0258628970bdaf5e5f88fdde7237
Author: Patrick Winnertz <winnie at debian.org>
Date:   Thu Feb 5 10:40:34 2009 +0100

    Merge branch '161_drop_bundled_slang'
    
    * 161_drop_bundled_slang:
      Removed bundled slang
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --combined ChangeLog
index 82eca35,297889a..e395d88
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,8 +1,20 @@@
 +2009-02-04 Enrico Weigelt, metux ITS <weigelt at metux.de>
 +
 +	* mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing #239, #240)
 +	* lib/mc.sh.in: fixes for non-bash shells (fixing #196)
 +
 +2009-02-03 Enrico Weigelt, metux ITS <weigelt at metux.de>
 +
 +	* lib/mc.lib: added patch on #219 by angel_il
 +	* edit/editcmd.c, configure.ac: removed obsolete own implementation of memove (#242)
 +	* vfs/extfs/u7z: patch from mandriva (#194)
 +
  2009-02-01 Enrico Weigelt, metux ITS <weigelt at metux.de>
  
  	* src/util.c: fixed name_trunc() on NULL or empty parameters
  	* src/achown.c: fixed unitialized var in init_chown_advanced()
  	  (patch from andrew_b)
 +	* replaced gboolean by bool (from mhl/types.h)
  
  2009-01-31 Enrico Weigelt, metux ITS <weigelt at metux.de>, Patrick Winnertz <winnie at debian.org>, Slava Zanko <slavazanko at gmail.com>, Sergei Trofimovich  <slyfox at inbox.ru>
  
@@@ -23,23 -11,17 +23,23 @@@
  	* src/find.c, src/main.c, src/panelize.c, src/util.c, src/utilunix.c,
  	* src/widget.c, src/widget.h, src/wtools.c, vfs/fish.c:
  	  fixed shell escaping issues in commandline completion engine
 -
 -2009-01-31 Enrico Weigelt, metux ITS <weigelt at metux.de>
 -
  	* replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in mhl/string.h)
 +	* replaced g_snprintf() by snprintf()
 +	* replaced GString stuff by static buffers
  
  2009-01-30 Enrico Weigelt, metux ITS <weigelt at metux.de>
  
  	* src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
  	  (out-of-tree builds)
 +	* syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL syntax (#193)
 +	* replaced calls to g_strdup() by mhl_str_dup()
 +
 +2009-01-30 Enrico Weigelt, metux ITS <weigelt at metux.de>
 +
 +	* replaced calls to g_free() by mhl_mem_free()
  
  2009-01-29 Mikhail S. Pobolovets <styx.mp at gmail.com>
 +
  	* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
  	  odt2txt is now used
  
@@@ -53,6 -35,9 +53,6 @@@
  
  	* mhl/escape.h, src/complete.c, vfs/fish.c: introduced new type 
  	  SHELL_ESCAPED_STR for more type safety
 -
 -2009-01-27 Enrico Weigelt, metux IT service <weigelt at metux.de>
 -
  	* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
  
  2009-01-27 Sergei Trofimovich  <slyfox at inbox.ru>
@@@ -80,7 -65,7 +80,7 @@@
  	* src/cmd.c src/option.c src/setup.c src/main.h: Automatic new directory(Mkdir, F7)
  	  name filling. Can be configured (on|off) in 'Configure options'
  
 -2009-01-25 Enrico Weigelt <weigelt at metux.de>
 +2009-01-25 Enrico Weigelt, metux ITS <weigelt at metux.de>
  
  	* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
  	* src/hotlist.c, src/panelize.c, src/tree.c, src/user.c: 
@@@ -89,12 -74,9 +89,12 @@@
  	  translated strings. This breaks now once every history file
  	  but afterwards this will be stable
  
 -2009-01-24 Enrico Weigelt <weigelt at metux.de>
 +2009-01-24 Enrico Weigelt, metux ITS <weigelt at metux.de>
  
 +	* vfs/extfs/rpm, vfs/extfs/trpm: removed obsolete rpm tags
  	* src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 +	* syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +	  for Nemerle source files
  
  2009-01-24 Patrick Winnertz <winnie at debian.org>
  
@@@ -102,16 -84,10 +102,16 @@@
  	  - prevent . to match a newline (\n)
  	  - match from start of line and not from cursor position
  
 -2009-01-24  Enrico Weigelt, metux IT service <weigelt at metux.de>
 +2009-01-24 Enrico Weigelt, metux IT service <weigelt at metux.de>
  
 -	* syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 -	  for Nemerle source files
 +	* configure.ac:
 +	* lib/mc.ext.in:
 +	* vfs/extfs/Makefile.am:
 +	* vfs/extfs/extfs.ini: 
 +	* vfs/extfs/uace.in:
 +	* vfs/extfs/uarc.in:
 +	* vfs/extfs/uc1541.in: added support for historic archive formats
 +	  (patch provided by jpelletier)
  
  2009-01-19 Patrick Winnertz <winnie at debian.org>
  
@@@ -127,7 -103,7 +127,7 @@@
  	* src/main.c: Removed unused function do_mc_filename_rename
  	* src/util.c: Removed unused struct whentm
  
 -2009-01-16 Enrico Weigelt, metux IT service <weigelt at metux.de>
 +2009-01-16 Enrico Weigelt, metux ITS <weigelt at metux.de>
  
  	* src/subshell: setting subshell pty to close-on-exec 
  	  (taken from mandriva patches)
@@@ -165,6 -141,9 +165,6 @@@
  	* syntax/Makefile.am syntax/Syntax syntax/haskell.syntax:
  	added syntax definition for Haskell (taken from rhclub-tree)
  	* syntax: added ebuild Syntax defition (taken from rhclub-tree)
 -
 -2009-01-10  Enrico Weigelt, metux ITS <weigelt at metux.de>
 -
  	* edit/editcmd.c:
  	* src/achown.c src/background.c src/boxes.c src/chmod.c:
  	* src/chown.c src/cmd.c src/command.c src/dir.c src/execute.c:
@@@ -179,6 -158,10 +179,10 @@@
  	Changed message type codes on calls to message(), query_dialog(),
  	close_error_pipe() from numeric IDs to symbols D_ERROR, D_NORMAL
  
+ 2009-01-07  Enrico Weigelt, metux ITS <weigelt at metux.de>
+ 
+ 	* removed bundled slang
+ 
  2008-12-18  Roland Illig  <roland.illig at gmx.de>
  
  	* doc/mcedit.1: Documented the newly added filename:lineno
diff --combined configure.ac
index 791a4d8,88e72b2..6bc9664
--- a/configure.ac
+++ b/configure.ac
@@@ -176,18 -176,12 +176,12 @@@ AC_CHECK_FUNCS([
  	cfgetospeed \
  	getegid geteuid getgid getsid getuid \
  	initgroups isascii \
 -	memcpy memmove memset \
 +	memcpy memset \
  	putenv \
  	setreuid setuid statfs strerror strftime sysconf \
  	tcgetattr tcsetattr truncate \
  ])
  
- dnl S-Lang needs all four functions to be defined to use POSIX signal API
- AC_CHECK_FUNCS([sigaction sigemptyset sigprocmask sigaddset], , [slang_signals=no])
- if test x$slang_signals != xno; then
-     AC_DEFINE(SLANG_POSIX_SIGNALS, 1, [Define to use POSIX signal API in S-Lang])
- fi
- 
  dnl
  dnl getpt is a GNU Extension (glibc 2.1.x)
  dnl
@@@ -452,19 -446,16 +446,16 @@@ subshell="$result
  
  
  dnl
- dnl Select the screen library.  mcslang is the included S-Lang library.
+ dnl Select the screen library.
  dnl
  AC_ARG_WITH(screen,
- 	[  --with-screen=LIB        Compile with screen library: slang, mcslang or
-                            ncurses [[slang if found, else mcslang]]])
+ 	[  --with-screen=LIB        Compile with screen library: slang or
+                            ncurses [[slang if found]]])
  
  case x$with_screen in
  xslang)
  	MC_WITH_SLANG(strict)
  	;;
- xmcslang)
- 	MC_WITH_MCSLANG
- 	;;
  xncurses)
  	MC_WITH_NCURSES
  	;;
@@@ -478,18 -469,6 +469,6 @@@ esa
  
  
  dnl
- dnl Force using termcap.  This option is processed in MC_WITH_MCSLANG.
- dnl Report an error if this option is not applicable.
- dnl
- AC_ARG_WITH(termcap,
- 	[  --with-termcap           Try using termcap database [[only if no terminfo]]],
- 	[if test x$with_screen != xmcslang; then
- 		AC_MSG_ERROR([Option `--with-termcap' only works with `--with-screen=mcslang'])
- 	fi
- ])
- 
- 
- dnl
  dnl Internal editor support.
  dnl
  AC_ARG_WITH(edit,
@@@ -572,7 -551,6 +551,6 @@@ AM_CONDITIONAL(USE_VFS_NET, [test x"$us
  AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$use_undelfs"])
  AM_CONDITIONAL(USE_SAMBA_FS, [test -n "$use_smbfs"])
  AM_CONDITIONAL(USE_MCFS, [test -n "$use_mcfs"])
- AM_CONDITIONAL(INCLUDED_SLANG, [test "x$with_screen" = xmcslang])
  AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])
  AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"])
  
@@@ -587,7 -565,6 +565,6 @@@ vfs/Makefil
  vfs/extfs/Makefile
  lib/Makefile
  src/Makefile
- slang/Makefile 
  edit/Makefile 
  syntax/Makefile
  m4/Makefile
@@@ -605,12 -582,9 +582,12 @@@ vfs/extfs/lsl
  vfs/extfs/mailfs
  vfs/extfs/patchfs
  vfs/extfs/rpms
 +vfs/extfs/uace
  vfs/extfs/ualz
  vfs/extfs/uar
 +vfs/extfs/uarc
  vfs/extfs/uarj
 +vfs/extfs/uc1541
  vfs/extfs/uha
  vfs/extfs/ulha 
  vfs/extfs/urar
diff --combined src/main.c
index 6a8376a,023ec7c..a04d291
--- a/src/main.c
+++ b/src/main.c
@@@ -33,7 -33,6 +33,7 @@@
  #include <sys/stat.h>
  #include <unistd.h>
  
 +#include <mhl/memory.h>
  #include <mhl/string.h>
  
  #include "global.h"
@@@ -302,7 -301,7 +302,7 @@@ reload_panelized (WPanel *panel
  	    do_file_mark (panel, i, 0);
  	}
  	if (mc_lstat (list->list[i].fname, &list->list[i].st)) {
 -	    g_free (list->list[i].fname);
 +	    mhl_mem_free (list->list[i].fname);
  	    continue;
  	}
  	if (list->list[i].f.marked)
@@@ -336,7 -335,7 +336,7 @@@ update_one_panel_widget (WPanel *panel
      /* If current_file == -1 (an invalid pointer) then preserve selection */
      if (current_file == UP_KEEPSEL) {
  	free_pointer = 1;
 -	my_current_file = g_strdup (panel->dir.list[panel->selected].fname);
 +	my_current_file = mhl_str_dup (panel->dir.list[panel->selected].fname);
  	current_file = my_current_file;
      } else
  	free_pointer = 0;
@@@ -350,7 -349,7 +350,7 @@@
      panel->dirty = 1;
  
      if (free_pointer)
 -	g_free (my_current_file);
 +	mhl_mem_free (my_current_file);
  }
  
  void
@@@ -533,7 -532,7 +533,7 @@@ directory_history_add (struct WPanel *p
  {
      char *tmp;
  
 -    tmp = g_strdup (dir);
 +    tmp = mhl_str_dup (dir);
      strip_password (tmp, 1);
  
      panel->dir_history = list_append_unique (panel->dir_history, tmp);
@@@ -575,7 -574,7 +575,7 @@@ _do_panel_cd (WPanel *panel, const cha
  	    new_dir++;
      }
  
 -    olddir = g_strdup (panel->cwd);
 +    olddir = mhl_str_dup (panel->cwd);
      new_dir = translated_url = vfs_translate_url (new_dir);
  
      /* Convert *new_path to a suitable pathname, handle ~user */
@@@ -590,11 -589,11 +590,11 @@@
  
      if (mc_chdir (directory) == -1) {
  	strcpy (panel->cwd, olddir);
 -	g_free (olddir);
 -	g_free (translated_url);
 +	mhl_mem_free (olddir);
 +	mhl_mem_free (translated_url);
  	return 0;
      }
 -    g_free (translated_url);
 +    mhl_mem_free (translated_url);
  
      /* Success: save previous directory, shutdown status of previous dir */
      strcpy (panel->lwd, olddir);
@@@ -617,7 -616,7 +617,7 @@@
      panel->dirty = 1;
      update_xterm_title_path ();
  
 -    g_free (olddir);
 +    mhl_mem_free (olddir);
  
      return 1;
  }
@@@ -688,7 -687,7 +688,7 @@@ directory_history_list (WPanel *panel
  	directory_history_add (panel, panel->cwd);
      else
  	message (D_ERROR, MSG_ERROR, _("Cannot change directory"));
 -    g_free (s);
 +    mhl_mem_free (s);
  }
  
  #ifdef HAVE_SUBSHELL_SUPPORT
@@@ -777,7 -776,7 +777,7 @@@ treebox_cmd (void
      sel_dir = tree_box (selection (current_panel)->fname);
      if (sel_dir) {
  	do_cd (sel_dir, cd_exact);
 -	g_free (sel_dir);
 +	mhl_mem_free (sel_dir);
      }
  }
  
@@@ -794,7 -793,7 +794,7 @@@ listmode_cmd (void
      if (!newmode)
  	return;
  
 -    g_free (current_panel->user_format);
 +    mhl_mem_free (current_panel->user_format);
      current_panel->list_type = list_user;
      current_panel->user_format = newmode;
      set_panel_formats (current_panel);
@@@ -1036,7 -1035,7 +1036,7 @@@ translated_mc_chdir (char *dir
  
      newdir = vfs_translate_url (dir);
      mc_chdir (newdir);
 -    g_free (newdir);
 +    mhl_mem_free (newdir);
  }
  
  static void
@@@ -1142,7 -1141,7 +1142,7 @@@ copy_readlink (WPanel *panel
  	int i;
  
  	i = mc_readlink (p, buffer, MC_MAXPATHLEN - 1);
 -	g_free (p);
 +	mhl_mem_free (p);
  	if (i > 0) {
  	    buffer[i] = 0;
  	    command_insert (cmdline, buffer, 1);
@@@ -1613,7 -1612,7 +1613,7 @@@ update_xterm_title_path (void
      char *p, *s;
  
      if (xterm_flag && xterm_title) {
 -	p = s = g_strdup (strip_home_and_password (current_panel->cwd));
 +	p = s = mhl_str_dup (strip_home_and_password (current_panel->cwd));
  	do {
  	    if (!is_printable ((unsigned char) *s))
  		*s = '?';
@@@ -1622,7 -1621,7 +1622,7 @@@
  	    numeric_keypad_mode ();
  	fprintf (stdout, "\33]0;mc - %s\7", p);
  	fflush (stdout);
 -	g_free (p);
 +	mhl_mem_free (p);
      }
  }
  
@@@ -1646,11 -1645,11 +1646,11 @@@ load_hint (int force
      if ((hint = get_random_hint (force))) {
  	if (*hint)
  	    set_hintbar (hint);
 -	g_free (hint);
 +	mhl_mem_free (hint);
      } else {
  	char text[BUF_SMALL];
  
 -	g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s\n"),
 +	snprintf (text, sizeof (text), _("GNU Midnight Commander %s\n"),
  		    VERSION);
  	set_hintbar (text);
      }
@@@ -1687,7 -1686,7 +1687,7 @@@ prepend_cwd_on_local (const char *filen
  
      if (vfs_file_is_local (filename)) {
  	if (*filename == PATH_SEP)	/* an absolute pathname */
 -	    return g_strdup (filename);
 +	    return mhl_str_dup (filename);
  	d = g_malloc (MC_MAXPATHLEN + strlen (filename) + 2);
  	mc_get_current_wd (d, MC_MAXPATHLEN);
  	l = strlen (d);
@@@ -1696,7 -1695,7 +1696,7 @@@
  	canonicalize_pathname (d);
  	return d;
      } else
 -	return g_strdup (filename);
 +	return mhl_str_dup (filename);
  }
  
  static int
@@@ -1714,7 -1713,7 +1714,7 @@@ mc_maybe_editor_or_viewer (void
  	char *path = NULL;
  	path = prepend_cwd_on_local (view_one_file);
  	view_file (path, 0, 1);
 -	g_free (path);
 +	mhl_mem_free (path);
      }
  #ifdef USE_INTERNAL_EDIT
      else {
@@@ -1754,7 -1753,7 +1754,7 @@@ do_nc (void
  
      /* destroy_dlg destroys even current_panel->cwd, so we have to save a copy :) */
      if (last_wd_file && vfs_current_is_local ()) {
 -	last_wd_string = g_strdup (current_panel->cwd);
 +	last_wd_string = mhl_str_dup (current_panel->cwd);
      }
      done_mc ();
  
@@@ -1773,7 -1772,7 +1773,7 @@@ OS_Setup (void
          struct passwd *pwd;
          pwd = getpwuid (geteuid ());
          if (pwd != NULL)
 -           shell = g_strdup (pwd->pw_shell);
 +           shell = mhl_str_dup (pwd->pw_shell);
      }
      if (!shell || !*shell)
  	shell = "/bin/sh";
@@@ -1781,9 -1780,9 +1781,9 @@@
      /* This is the directory, where MC was installed, on Unix this is DATADIR */
      /* and can be overriden by the MC_DATADIR environment variable */
      if ((mc_libdir = getenv ("MC_DATADIR")) != NULL) {
 -	mc_home = g_strdup (mc_libdir);
 +	mc_home = mhl_str_dup (mc_libdir);
      } else {
 -	mc_home = g_strdup (DATADIR);
 +	mc_home = mhl_str_dup (DATADIR);
      }
  }
  
@@@ -2034,10 -2033,6 +2034,6 @@@ handle_args (int argc, char *argv[]
  	poptGetContext ("mc", argc, argv, argument_table,
  			POPT_CONTEXT_NO_EXEC);
  
- #ifdef USE_TERMCAP
-     SLtt_Try_Termcap = 1;
- #endif
- 
      while ((c = poptGetNextOpt (ctx)) > 0) {
  	process_args (ctx, c, poptGetOptArg (ctx));
      }
@@@ -2083,7 -2078,7 +2079,7 @@@
  		    edit_one_file = fname;
  		    edit_one_file_start_line = atoi (p);
  		} else {
 -		    g_free (fname);
 +		    mhl_mem_free (fname);
  		    goto try_plus_filename;
  		}
  	    } else {
@@@ -2098,12 -2093,12 +2094,12 @@@
  			}
  		    }
  		}
 -		edit_one_file = g_strdup (tmp);
 +		edit_one_file = mhl_str_dup (tmp);
  	    }
  	}
      } else if (!STRNCOMP (base, "mcv", 3) || !STRCOMP (base, "view")) {
  	if (tmp)
 -	    view_one_file = g_strdup (tmp);
 +	    view_one_file = mhl_str_dup (tmp);
  	else {
  	    fputs ("No arguments given to the viewer\n", stderr);
  	    exit (1);
@@@ -2111,9 -2106,9 +2107,9 @@@
      } else {
  	/* sets the current dir and the other dir */
  	if (tmp) {
 -	    this_dir = g_strdup (tmp);
 +	    this_dir = mhl_str_dup (tmp);
  	    if ((tmp = poptGetArg (ctx)))
 -		other_dir = g_strdup (tmp);
 +		other_dir = mhl_str_dup (tmp);
  	}
      }
  
@@@ -2252,15 -2247,15 +2248,15 @@@ main (int argc, char *argv[]
  	    close (last_wd_fd);
  	}
      }
 -    g_free (last_wd_string);
 +    mhl_mem_free (last_wd_string);
  
 -    g_free (mc_home);
 +    mhl_mem_free (mc_home);
      done_key ();
  #ifdef HAVE_CHARSET
      free_codepages_list ();
  #endif
 -    g_free (this_dir);
 -    g_free (other_dir);
 +    mhl_mem_free (this_dir);
 +    mhl_mem_free (other_dir);
  
      return 0;
  }
diff --combined src/slint.c
index 16fc3d2,5945b42..a3b63eb
--- a/src/slint.c
+++ b/src/slint.c
@@@ -56,13 -56,6 +56,6 @@@
  # endif
  #endif
  
- /* Taken from S-Lang's sldisply.c file */
- #ifndef USE_TERMCAP
- #   define tgetstr(a,b) SLtt_tgetstr (a)
- #else
-     extern char *tgetstr(char *, char **);
- #endif
- 
  #ifndef SA_RESTART
  #    define SA_RESTART 0
  #endif
@@@ -253,10 -246,10 +246,10 @@@ slang_reset_softkeys (void
      char tmp[BUF_SMALL];
  
      for (key = 1; key < 9; key++) {
 -	g_snprintf (tmp, sizeof (tmp), "k%d", key);
 +	snprintf (tmp, sizeof (tmp), "k%d", key);
  	send = (char *) SLtt_tgetstr (tmp);
  	if (send) {
 -	    g_snprintf (tmp, sizeof (tmp), "\033&f%dk%dd%dL%s%s", key,
 +	    snprintf (tmp, sizeof (tmp), "\033&f%dk%dd%dL%s%s", key,
  			(int) (sizeof (display) - 1), (int) strlen (send),
  			display, send);
  	    SLtt_write_string (tmp);

-- 
Midnight Commander Development



More information about the mc-devel mailing list