GNOME.org
 

updated: [74c5601] Merge commit 'origin/mc-4.6'

The following commit has been merged in the master branch:
commit 74c5601339ac49b1ca6647ffc867c384b1355a14
Merge: 9fd798845ddd37c693a3f20f037711f4a75f24bc c76c6e5ffc6cbb8d62050f836debeccaeec32936
Author: Enrico Weigelt, metux IT service <weigelt metux de>
Date:   Sun Feb 1 22:07:03 2009 +0100

    Merge commit 'origin/mc-4.6'

diff --combined ChangeLog
index a63a22d,2d23d15..c6733e2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,8 +1,8 @@@
+ 2009-02-01 Enrico Weigelt, metux ITS <weigelt metux de>
+ 
+ 	* src/util.c: fixed name_trunc() on NULL or empty parameters
+ 	  (patch from andrew_b)
+ 
  2009-01-31 Enrico Weigelt, metux ITS <weigelt metux de>, Patrick Winnertz <winnie debian org>, Slava Zanko <slavazanko gmail com>, Sergei Trofimovich  <slyfox inbox ru>
  
  	* edit/editcmd.c, mhl/escape.h, mhl/string.h, mhl/types.h, src/Makefile.am,
@@@ -39,11 -44,6 +44,11 @@@
  	* syntax/python.syntax: Added syntax highlighting for
  	pytnoh-2.6+ keywords (patch sent by NNemec)
  
 +2009-01-26 Mikhail S. Pobolovets <styx mp gmail com>
 +
 +	* vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
 +	  0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
 +
  2009-01-25 Ilia Maslakov <il smind gmail com>
  
  	* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -55,10 -55,6 +60,10 @@@
  	* mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish code
  	  so that symlinks and files which special characters works now
  
 +2009-01-25 Mikhail S. Pobolovets <styx mp gmail com>
 +	* 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 metux de>
  
  	* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
@@@ -78,19 -74,10 +83,19 @@@
  	  - 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 metux de>
 +
 +	* syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +	  for Nemerle source files
 +
 +2009-01-19 Patrick Winnertz <winnie debian org>
 +
 +	* edit/edit.h: Add two more ints
 +	* src/setup.c: Add keybinding to disable tab highlighting
 +
  2009-01-18 Patrick Winnertz <winnie debian org>
  
 -	* edit/editdraw.c: Moved var into if clause as it's only used
 -	there
 +	* edit/editdraw.c: Moved var into if clause as it's only used there
  	* edit/editlock.c: Removed unnecessary arguement to if condition
  	* src/cmd.c: Removed unused pointer
  	* src/hotlist.c: Removed unused function save_group
@@@ -128,29 -115,7 +133,29 @@@
  2009-01-11 Patrick Winnertz <winnie debian org>
  
  	* syntax/pascal.syntax: Added syntax highlighting for 
 -	some delphi keywords
 +	  some delphi keywords
 +
 +2009-01-10  Enrico Weigelt, metux ITS <weigelt metux de>
 +
 +	* 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 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:
 +	* src/ext.c src/file.c src/filegui.c src/find.c src/help.c:
 +	* src/learn.c src/main.c src/panelize.c src/screen.c:
 +	* src/selcodepage.c src/subshell.c src/tree.c src/user.c:
 +	* src/utilunix.c src/view.c:
 +	* vfs/cpio.c vfs/direntry.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c:
 +	* vfs/mcfs.c vfs/sfs.c vfs/smbfs.c vfs/tar.c vfs/undelfs.c:
 +	* vfs/utilvfs.c vfs/vfs.c:
 +	
 +	Changed message type codes on calls to message(), query_dialog(),
 +	close_error_pipe() from numeric IDs to symbols D_ERROR, D_NORMAL
  
  2008-12-18  Roland Illig  <roland illig gmx de>
  
@@@ -328,7 -293,7 +333,7 @@@
  
  	* doc/mc.1.in: Document `fish_directory_timeout'.
  
 -2006-02-18  David Martin  <<dmartina excite com>
 +2006-02-18  David Martin  <dmartina excite com>
  
  	* doc/es/mc.1.in: Cleanup. Fix key naming.
  
diff --combined vfs/smbfs.c
index bb82bc2,e027da8..b15952c
--- a/vfs/smbfs.c
+++ b/vfs/smbfs.c
@@@ -49,6 -49,8 +49,8 @@@
  
  #include <string.h>
  
+ #include <mhl/string.h>
+ 
  #include "vfs.h"
  #include "vfs-impl.h"
  #include "smbfs.h"
@@@ -366,7 -368,7 +368,7 @@@ smbfs_fill_names (struct vfs_class *me
  #define GNAL_VNC(s) unix_to_dos(s,False)
  /* does same as do_get() in client.c */
  /* called from vfs.c:1080, count = buffer size */
 -static int
 +static ssize_t
  smbfs_read (void *data, char *buffer, int count)
  {
      smbfs_handle *info = (smbfs_handle *) data;
@@@ -380,7 -382,7 +382,7 @@@
  	return n;
  }
  
 -static int
 +static ssize_t
  smbfs_write (void *data, const char *buf, int nbyte)
  {
      smbfs_handle *info = (smbfs_handle *) data;
@@@ -604,7 -606,7 +606,7 @@@ smbfs_reconnect(smbfs_connection *conn
  	cli_shutdown(conn->cli);
  
     	if (!(conn->cli = smbfs_do_connect(host, conn->service))) {
 -		message (1, MSG_ERROR,
 +		message (D_ERROR, MSG_ERROR,
  			_(" reconnect to %s failed\n "), conn->host);
  		g_free(host);
  		return False;
@@@ -1162,7 -1164,7 +1164,7 @@@ smbfs_open_link (char *host, char *path
  
  	if (my_errno != EPERM)
  	    return 0;
 -	message (1, MSG_ERROR, _(" Authentication failed "));
 +	message (D_ERROR, MSG_ERROR, _(" Authentication failed "));
  
  	/* authentication failed, try again */
  	smbfs_auth_remove (bucket->host, bucket->service);
@@@ -1625,7 -1627,7 +1627,7 @@@ smbfs_stat (struct vfs_class * me, cons
  
  #define smbfs_lstat smbfs_stat	/* no symlinks on smb filesystem? */
  
 -static int
 +static off_t
  smbfs_lseek (void *data, off_t offset, int whence)
  {
      smbfs_handle *info = (smbfs_handle *) data;
@@@ -1685,7 -1687,7 +1687,7 @@@ smbfs_mkdir (struct vfs_class * me, con
  
      if (!cli_mkdir (sc->cli, cpath)) {
  	my_errno = cli_error (sc->cli, NULL, &err, NULL);
 -	message (1, MSG_ERROR, _(" Error %s creating directory %s "),
 +	message (D_ERROR, MSG_ERROR, _(" Error %s creating directory %s "),
  		    cli_errstr (sc->cli), CNV_LANG (cpath));
  	g_free (cpath);
  	return -1;
@@@ -1711,7 -1713,7 +1713,7 @@@ smbfs_rmdir (struct vfs_class *me, cons
  
  	if (!cli_rmdir(sc->cli, cpath)) {
  		my_errno = cli_error(sc->cli, NULL, &err, NULL);
 -		message (1, MSG_ERROR, _(" Error %s removing directory %s "), 
 +		message (D_ERROR, MSG_ERROR, _(" Error %s removing directory %s "), 
  			cli_errstr(sc->cli), CNV_LANG(cpath));
  		g_free (cpath);
  		return -1;
@@@ -1813,7 -1815,7 +1815,7 @@@ smbfs_open_readwrite (smbfs_handle *rem
  		  flags : O_RDONLY, DENY_NONE);
  #endif
      if (remote_handle->fnum == -1) {
 -	message (1, MSG_ERROR, _(" %s opening remote file %s "),
 +	message (D_ERROR, MSG_ERROR, _(" %s opening remote file %s "),
  		    cli_errstr (remote_handle->cli), CNV_LANG (rname));
  	DEBUG (1, ("smbfs_open(rname:%s) error:%s\n",
  		   rname, cli_errstr (remote_handle->cli)));
@@@ -1829,7 -1831,7 +1831,7 @@@
  			NULL)
  	&& !cli_getattrE (remote_handle->cli, remote_handle->fnum,
  			  &remote_handle->attr, &size, NULL, NULL, NULL)) {
 -	message (1, MSG_ERROR, " getattrib: %s ",
 +	message (D_ERROR, MSG_ERROR, " getattrib: %s ",
  		    cli_errstr (remote_handle->cli));
  	DEBUG (1,
  	       ("smbfs_open(rname:%s) getattrib:%s\n", rname,
@@@ -1892,7 -1894,7 +1894,7 @@@ smbfs_unlink (struct vfs_class *me, con
      remote_file = free_after(smbfs_convert_path (remote_file, FALSE), remote_file);
  
      if (!cli_unlink(sc->cli, remote_file)) {
 -	message (1, MSG_ERROR, _(" %s removing remote file %s "), 
 +	message (D_ERROR, MSG_ERROR, _(" %s removing remote file %s "), 
  			cli_errstr(sc->cli), CNV_LANG(remote_file));
  	g_free (remote_file);
  	return -1;
@@@ -1927,7 -1929,7 +1929,7 @@@ smbfs_rename (struct vfs_class *me, con
      g_free (rb);
  
      if (!retval) {
 -	message (1, MSG_ERROR, _(" %s renaming files\n"), 
 +	message (D_ERROR, MSG_ERROR, _(" %s renaming files\n"), 
  			cli_errstr(sc->cli));
  	return -1;
      }   

-- 
Midnight Commander Development
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]