Commit Graph

2580 Commits

Author SHA1 Message Date
Mikhail S. Pobolovets
97a7b214ac Merge branch '132_search_skip_hidden' 2009-02-21 17:53:26 +02:00
Mikhail S. Pobolovets
6e81dab573 src/find.c: 'Skip .hidden files and dirs' renamed to 'Skip hidden'
Check box position has been changed.

po/ru.po: translation update for 'Skip hidden'.

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-02-21 16:48:00 +02:00
Mikhail S. Pobolovets
da3b76b8d7 Merge branch '176_lzma' 2009-02-21 12:23:50 +02:00
Mikhail S. Pobolovets
dbba22eae3 src/find.c: 'Skip .hidden files and dirs' has been introduced.
An option to toggle on|off searching for|in hidden directories
and files. (#132)

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-02-21 11:53:38 +02:00
Andrew Borodin
c7987f0b1d Reimplemented displaying size of total marked files. 2009-02-20 17:21:04 +03:00
Mikhail S. Pobolovets
3dad27bfe5 Fix compilation error
screen.o: In function `show_free_space':
/home/dsterba/_dev/mc-build/src/screen.c:783: undefined reference to
`mhl_mem_free'
/home/dsterba/_dev/mc-build/src/screen.c:784: undefined reference to
`mhl_str_dup'

Signed-off-by: David Sterba <dave@jikos.cz>
2009-02-17 19:41:02 +02:00
Mikhail S. Pobolovets
cc69f5d278 Subject: [PATCH] Some constants has been introduced.
*_OPTIONS_COUNT should be used from now to controll
 widgets drawing.

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-02-17 09:22:24 +02:00
Mikhail S. Pobolovets
ae07a0260e Fixed memory leak in init_my_statfs() function.
By andrew_b.

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-02-17 09:22:24 +02:00
Enrico Weigelt, metux IT service
4333bc4b60 fix for #188 2009-02-17 09:22:24 +02:00
Sergei Trofimovich
c26e289b9f panel: fixed crash when rename/copy (introduced by revert of mhl_strmove)
g_strconcat expects 0 as last argument, but mhl_strmove is not.
When reverting this detail was overlooked. Returning 0 as last argument.

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-02-07 16:20:03 +02:00
Sergei Trofimovich
97bdf084f8 shell_unescape: fix recently added breakage of decoding escapy strings
This pach fixes two issues (both appear only in escapy strings):
  * tail cut of escapy string when '\\' is met
  * head cut of escapy string when '\\' is met :]

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-02-07 16:15:41 +02:00
Sergei Trofimovich
96fc77bc3e fixed canonicalize_pathname() breakage: fixed str_move() function (memmove semantics) again
This patch reintroduces fix firstly appeared in (and recently broken by mhl revert)
>   commit e48cb7c89f
>   Author: Sergei Trofimovich <st@anti-virus.by>
>   Date:   Fri Jan 30 09:31:28 2009 +0200
>
>        mhl: added mhl_strmove() function (memmove semantics)
...
>            Snippet of man strcpy:
>       DESCRIPTION
>               The  strcpy()  function copies the string pointed to by src, including the terminating
>               null byte ('\0'), to the buffer pointed to by dest.  ___The strings may not overlap___,
>               and the destination string dest must be  large enough to receive the copy.
>       We used strcpy to move data chunk in memory: "./foo" -> "foo", etc.
>
>       This patch introduces mhl_strmove and fixed canonicalize_pathname.

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-02-07 16:10:33 +02:00
Sergei Trofimovich
e0aba5d588 completion: do not complete dead/broken files as dirs
When we try to complete something what can't be stat()'ed,
we treated it like dir. Now we do not consider such candidates
for completion.

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-02-07 16:04:36 +02:00
Patrick Winnertz
8bd883085f Removed TODO Marker in util.c as the functions are fully ported to use glib now
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-06 15:01:34 +01:00
Patrick Winnertz
161164c556 Reworked shell_unescape function in order to make use of glib.
This commit will replace some *ptr = c; stuff with g_string_append_c(str,c);
in order to use glib here.

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-06 14:50:22 +01:00
Patrick Winnertz
fe95221f05 Rewrote the shell_escape function in order to make us of GString and g_string_append_c
As we decided to fully switch back to glb we needed to rewrite this function in order to use
glib functions. This means in this case mostly that *ptr = c; ptr++; is replaced by something
like this: g_string_append(str,c); with str a GString*.

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-06 14:32:09 +01:00
Slava Zanko
e54f318cef Completely removed MHL stuff
Changed all source files relative to remove MHL

Some string-related functions moved into src/util.c

This stable fix.
2009-02-06 14:01:28 +02:00
Patrick Winnertz
3b8f37b99e Moved some functions out of mhl into src/util.c
This commit moves the mhl_str_concat_dir_and_file back into src/util.c whitout changing atm the functionality.

Please note that this is an incomplete fix and needs to be partially enhanced in order to keep the full functionality with glib.

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-06 11:17:03 +01:00
Patrick Winnertz
0450daf566 Removed type SHELL_ESCAPED_STR in favour of plain char*
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-06 00:20:19 +01:00
Patrick Winnertz
589ffd0b10 Use g_snprintf instead of snprintf as we switch back to glib
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:49:00 +01:00
Patrick Winnertz
ae987b923e Reverted the use of bool in favour of gboolean
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:46:07 +01:00
Patrick Winnertz
d84586ba82 Reverted the use of mhl_str_dup and use g_strdup instead.
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:40:32 +01:00
Patrick Winnertz
1c287d798d First bunch of mhl_mem_free removal patches
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:36:58 +01:00
Patrick Winnertz
155fd328a4 Revert second bunch of mhl patches (see 9b9cab5874)
This reintroduce GString again and drop the use of mhl_mem_free in some files

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:18:38 +01:00
Patrick Winnertz
5920d13810 First bunch of reverting stuff from mhl to switch back to glib
This removes the usage of stdbool.h in favour of mhl/tyes.h as we have to revert everything one by one

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:09:37 +01:00
Patrick Winnertz
bbf507b237 Merge branch '161_drop_bundled_slang'
* 161_drop_bundled_slang:
  Removed bundled slang

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 10:40:59 +01:00
Enrico Weigelt, metux IT service
220f4f4caf manually merged mc-4.6 2009-02-05 07:25:47 +01:00
Enrico Weigelt, metux IT service
a5ba278729 merged in lzma patch from mandriva 2009-02-04 21:16:00 +01:00
Patrick Winnertz
0c7d399300 Reverted Enricos backport from master which removes accidentially slang1.x support
Enrico has accidentially removed the slang1.x support in mc-4.6 branch as
this is a structural change which clearly doesn't belong into mc-4.6.

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-04 20:37:00 +01:00
Enrico Weigelt, metux IT service
0c97636212 fixed #240 2009-02-04 01:11:56 +01:00
Enrico Weigelt, metux IT service
be982505cc Merge commit 'origin/mc-4.6' 2009-02-04 00:30:57 +01:00
Enrico Weigelt, metux IT service
03ec5ef574 backported #199 branch 2009-02-04 00:29:28 +01:00
Enrico Weigelt, metux IT service
9b9cab5874 manually merged 234_remove_g_string 2009-02-02 22:39:12 +01:00
Enrico Weigelt, metux IT service
8b38cf44da manully merged 227_replace_g_free 2009-02-02 22:34:05 +01:00
Enrico Weigelt, metux IT service
035fa47c06 manually merged 228_replace_g_strdup 2009-02-02 21:28:01 +01:00
Enrico Weigelt, metux IT service
7015de5db5 Merge commit 'origin/236_replace_gboolean' 2009-02-02 21:16:39 +01:00
Enrico Weigelt, metux IT service
0434e3de5d manually merged 235_remove_g_snprintf 2009-02-02 20:53:03 +01:00
Enrico Weigelt, metux IT service
45964f373b replaced gboolean by bool (from mhl/types.h) 2009-02-02 05:07:56 +01:00
Enrico Weigelt, metux IT service
4f9185a3ee Removed bundled slang 2009-02-02 04:23:06 +01:00
Enrico Weigelt, metux IT service
3410eb3229 Merge commit 'origin/mc-4.6' 2009-02-01 22:38:48 +01:00
Enrico Weigelt, metux IT service
48a85a7b97 manually merged 232_fix_init_chown_advanced 2009-02-01 22:37:57 +01:00
Enrico Weigelt, metux IT service
74c5601339 Merge commit 'origin/mc-4.6' 2009-02-01 22:07:03 +01:00
Sergei Trofimovich
6b6d4a222d cleanup: moved int to size_t
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-02-01 22:44:44 +02:00
Enrico Weigelt, metux IT service
6f9ef0b7be fixed unitialized var in init_chown_advanced() - patch from andrew_b 2009-02-01 20:32:11 +01:00
Enrico Weigelt, metux IT service
6c016bc781 fixed name_trunc() on NULL or empty strings - patch from andrew_b 2009-02-01 20:26:27 +01:00
Enrico Weigelt, metux IT service
e4a4f77ac2 replaced g_snprintf() by snprintf() 2009-02-01 20:03:28 +01:00
Sergei Trofimovich
5ee6f43796 build fix: added missing declaration of mhl_dir_plus_file
./configure --enable-charset && make
    charsets.c: In function 'load_codepages_list':
    charsets.c:51: warning: implicit declaration of function 'mhl_str_dir_plus_file'
    charsets.c:51: warning: assignment makes pointer from integer without a cast

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-02-01 20:46:18 +02:00
Sergei Trofimovich
df4129517b Merge branch 'mc-4.6'
* mc-4.6: (38 commits)
  mhl: mhl_shell_unescape_buf(): fixed memory array OOB.
  completion: fixed complete already escaped secuences.
  completion: added changelog entry for solved #147
  completion: fixed completion of escaped commands in commandline
  Removed unused char*.
  mhl: added mhl_strmove() function (memmove semantics)
  completion: added escapes in command line on completion
  complete: cleanup: #define to enum INPUT_COMPLETION_FLAGS
  added a new parameter for completion flags to input_new
  fish: cleanup: unboxed quoted strings when generate shell commands
  introduced new type SHELL_ESCAPED_STR for more type safety
  added mhl/types.h which defines bool enum, escape.h now using this type
  Removed unused variable
  Changes for use MHL.
  Fixed bug with renamig/copying files with backshashes in names
  Remove some testing stuff
  Temporarry commit. Fixed completion in browse by directoryes.
  Fixed some memory leaks.
  Add $ and ` for escaping and reorder it according to the ascii values
  Rewrite it to use g_string_append_c instead of some homebrew stuff
  ...
2009-02-01 14:26:54 +02:00
Sergei Trofimovich
ad1abaebfb completion: fixed complete already escaped secuences.
<winnie> ls -lQ /tmp/test
-rw-r--r-- 1 winnie winnie 0 30. Jan 13:05 "a"
-rw-r--r-- 1 winnie winnie 0 30. Jan 13:04 " test\"hallo"
-rw-r--r-- 1 winnie winnie 0 30. Jan 13:04 " test$hallo"
<winnie> and then cat /tmp/test/\ and ESC-tab in subshell...

unescape/escape sequences in command completion (it also solves
completiont of weirdweird escapy commands like ./<escapy-cmd><complete>, like:
$ ls -lQ
-rwxr-xr-x 1 slyfox slyfox 2037 Jan 15 21:18 "  'asd&&\"->build-glib1.sh"

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-02-01 13:28:31 +02:00
Sergei Trofimovich
ff4de3d66f Merge branch 'mc-4.6' into 147_escaping
* mc-4.6:
  replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file()
  fixed out-of-tree-builds
  Updated the NEWS file for 4.6.2 and added the bugnumbers behind the items in the list.
  Update for OpenOffice and StarOffice viewer.
  changelog: added entry for python syntax
  syntax: python: keywords update (patch by NNemec) fixes #216
  AC_USE_SYSTEM_EXTENSIONS macro requires autoconf >= 2.60
  po/ru.po: In russian translation, there are some hotkey conficts in menu.
  ChangeLog/NEWS: added entry for #181 ticket (copy to deleted dir)
  Now a trailing slash will only be added in copy & move dialogs if the path itselfs
  copy/move dialog: add trailing '/' to default destination path (fix #181)
  fixed comments to /* ... */
  Not only comment it out but removing it
  Removed unneeded var to make build process a bit cleaner
  Add code snipplet by il.smind which should fix issues with putty and

Conflicts:
	ChangeLog
	mhl/string.h
	src/command.c
	src/complete.c
	src/file.c
	src/util.c
2009-01-31 22:18:19 +02:00