Commit Graph

2612 Commits

Author SHA1 Message Date
Andrew Borodin
72d0a117b6 src/screen.c (display_mini_info): don't display incorrect info about ".." directory. 2009-03-23 19:58:35 +03:00
Sergei Trofimovich
5eb39e7d9a Merge branch 'mc-4.6'
* mc-4.6:
  src/file.c: move_dir_dir():
  fileopctx.h: set definitely values for FileProgressStatus enum type.
  src/file.c: modified error messages fro warn_same_file() function.
  non-relevant comment removed
  little fix for show message
  Denis Vlasenko posted a patch which would fix issue when no dialog for break operation. Trouble: recently i accidentally entered '.' instead of '..' in the file copy dialog on a relatively big tree ... for every file in the tree i got the <foo> and <bar> are the same file message box, without any way to escape except killing mc from the outside. Rework warn_same_file for more usage glib. ... msg = g_strdup_printf() ...
  po/sk.po: translation update by Ivan Masár <helix84@centrum.sk>
  mountlist: use fsblkcnt_t when available (fixes #179)
  Fixed menu painting for NCurses screen library.
  Backport: syntax/spec.syntax: .spec syntax update by adamw (#189)
  lib/mc.ext.in: command line options fix by adamw (#183)

Conflicts:
	ChangeLog
	po/az.po
	po/be.po
	po/bg.po
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/el.po
	po/es.po
	po/eu.po
	po/fi.po
	po/fr.po
	po/hu.po
	po/it.po
	po/ja.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mn.po
	po/nl.po
	po/no.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/sk.po
	po/sl.po
	po/sr.po
	po/sv.po
	po/ta.po
	po/tr.po
	po/uk.po
	po/vi.po
	po/wa.po
	po/zh_CN.po
	po/zh_TW.po
	src/file.c
2009-03-19 21:35:03 +02:00
Sergei Trofimovich
97496014aa Merge commit 'origin/179_fsblkcnt_t' into mc-4.6
* commit 'origin/179_fsblkcnt_t':
  mountlist: use fsblkcnt_t when available (fixes #179)
2009-03-18 22:04:48 +02:00
Andrew Borodin
8353da9e8f src/file.c: move_dir_dir():
* changed type of move_over variable from int to gboolean;
    * fixed memory leak: destdir is not free'd when the same directory is copied;
    * don't use the non-valid dbuf variable if mc_stat(d, &dbuf) returns non-zero.
2009-03-17 19:45:00 +00:00
Andrew Borodin
5df2f5aa22 fileopctx.h: set definitely values for FileProgressStatus enum type.
file.c file.h: fixed types for file/dir operation functions.
2009-03-17 19:41:29 +00:00
Andrew Borodin
68009d016f src/file.c: modified error messages fro warn_same_file() function.
po/*.po: updated to sync with modified src/file.c file.
2009-03-17 19:40:41 +00:00
Ilia Maslakov
0ffd71949f non-relevant comment removed 2009-03-17 16:57:22 +00:00
Ilia Maslakov
d60f4957de little fix for show message 2009-03-17 16:56:49 +00:00
Ilia Maslakov
a079bd950c Denis Vlasenko posted a patch which would fix issue when no dialog for break operation. Trouble: recently i accidentally entered '.' instead of '..' in the file copy dialog on a relatively big tree ... for every file in the tree i got the <foo> and <bar> are the same file message box, without any way to escape except killing mc from the outside. Rework warn_same_file for more usage glib. ... msg = g_strdup_printf() ... 2009-03-17 16:53:37 +00:00
Andrew Borodin
d2eec23c1e ChangeLog src/screen.c: fixed typo in function name. 2009-03-15 10:36:28 +03:00
Ilia Maslakov
badad58101 Merge branch '19_show_abort_skip_for_copy_error' 2009-03-14 18:46:43 +00:00
Ilia Maslakov
dc80d6821f Merge branch '267_code_navigation_via_etags' 2009-03-11 18:25:45 +00:00
Enrico Weigelt, metux IT service
6de4c5aafc mountlist: use fsblkcnt_t when available (fixes #179)
When defined 64bit interface to filesystem we do not get overflow
when detect FS size.
2009-03-08 15:57:43 +02:00
Andrew Borodin
bf8ac0594e src/file.c: move_dir_dir():
* changed type of move_over variable from int to gboolean;
    * fixed memory leak: destdir is not free'd when the same directory is copied;
    * don't use the non-valid dbuf variable if mc_stat(d, &dbuf) returns non-zero.
2009-03-08 13:22:10 +03:00
Andrew Borodin
5d50f64a2b fileopctx.h: set definitely values for FileProgressStatus enum type.
file.c file.h: fixed types for file/dir operation functions.
2009-03-08 12:49:28 +03:00
Andrew Borodin
82242cbbd4 src/file.c: modified error messages fro warn_same_file() function.
po/*.po: updated to sync with modified src/file.c file.
2009-03-08 12:38:35 +03:00
Ilia Maslakov
1e59c411b5 non-relevant comment removed 2009-03-05 11:10:03 +00:00
Ilia Maslakov
43918cc4ba little fix for show message 2009-03-05 10:41:41 +00:00
Ilia Maslakov
7c79cfe10c Denis Vlasenko posted a patch which would fix issue when no dialog for break operation. Trouble: recently i accidentally entered '.' instead of '..' in the file copy dialog on a relatively big tree ... for every file in the tree i got the <foo> and <bar> are the same file message box, without any way to escape except killing mc from the outside. Rework warn_same_file for more usage glib. ... msg = g_strdup_printf() ... 2009-03-05 09:59:50 +00:00
Mikhail S. Pobolovets
ec8883dac1 src/find.c: Micro fix for 'Skip hidden' shortcut
It's now Alt+k instead of Alt+p

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-03-02 08:55:27 +02:00
Andrew Borodin
a9d59f9afc Fixed menu painting for NCurses screen library. 2009-02-26 19:55:10 +03:00
Ilia Maslakov
20c769b063 Add stack navigation structure. Add hotkeys A-'-' backward A-'=' forward navigation to files.
add edit/etags.c edit/etags.h
2009-02-25 21:55:35 +00:00
Andrew Borodin
210ffed4fd Fixed menu painting for NCurses screen library. 2009-02-24 22:20:21 +03:00
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
d8d26d42fd fixed mismerge: completion stuff
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-02-15 11:57:26 +02:00
Sergei Trofimovich
5454c05b38 mismerge fix: g_concat -> g_strconcat
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-02-15 11:53:49 +02:00
Sergei Trofimovich
ec3d3cf913 header guard fix
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-02-15 11:52:56 +02:00
Patrick Winnertz
b10bfccfc0 Remove some of the SHELL_ESCAPE_STR Stuff...
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-13 17:57:01 +01:00
Patrick Winnertz
0b0f8e6128 Revert "introduced new type SHELL_ESCAPED_STR for more type safety"
This reverts commit 90763ba82f.

Conflicts:

	ChangeLog
	mhl/escape.h
	src/complete.c
	vfs/fish.c

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-10 15:08:01 +01:00
Patrick Winnertz
8b7e47d9cc Last bunch of reverts and removal of mhl/*
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-10 14:11:41 +01:00
Patrick Winnertz
7d0fa9afce fixed canonicalize_pathname() breakage: fixed str_move() function (memmove semantics) again
and add shell_(un)escape 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.

Conflicts:

	src/util.h

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-10 14:02:20 +01:00
Patrick Winnertz
f237a14635 Revert some functions (mhl_mem_free to g_free, etc)
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-10 13:52:53 +01:00
Patrick Winnertz
e4e135399f Revert "replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file()"
This reverts commit 54d6ec88dc.

Conflicts:

	ChangeLog
	mhl/string.h
	src/command.c
	src/complete.c
	src/util.c
2009-02-10 13:29:18 +01: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