Commit Graph

8117 Commits

Author SHA1 Message Date
Mikhail S. Pobolovets
8070d8319e lt.po: update by stikonas (#274)
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-02-17 20:05:25 +02: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
Mikhail S. Pobolovets
81c48ced61 backport: nl.po: update by mpol (#271)
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-02-16 21:56:18 +02:00
Mikhail S. Pobolovets
1c977d254a nl.po: update by mpol (#271)
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-02-16 16:10:51 +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
Patrick Winnertz
5bbeba0b8b Revert "mhl: mhl_shell_unescape_buf(): fixed memory array OOB."
This reverts commit 7a51b50d5c.
2009-02-10 13:24:57 +01:00
Patrick Winnertz
1f656eb6be Revert "build fix: added missing declaration of mhl_dir_plus_file (reported by andrew_b)"
This reverts commit c697fb3753.
2009-02-10 13:24:32 +01:00
Patrick Winnertz
d6da1ead5c Revert "cleanup: mhl_str_dir_plus_file(): int -> size_t (suggested by Andrew Borodin)"
This reverts commit 80a6897271.
2009-02-10 13:24:04 +01:00
Patrick Winnertz
b87a08ce1c Revert "fixed #240"
This reverts commit 1d8ef0b089.

Conflicts:

	ChangeLog
2009-02-10 13:23:28 +01:00
Patrick Winnertz
d7fa1ecdb4 Revert "Fixing a theoretical buffer overflow which was reported by Roland Illig"
This reverts commit f148fc29d2.
2009-02-10 13:21:58 +01:00
Patrick Winnertz
6d58336693 Revert "Call va_end after the iteration as we need to free the list again."
This reverts commit 51388bd012.
2009-02-10 13:21:45 +01:00
Patrick Winnertz
dd1b7941d6 Revert "Added enhancements from Sergei which he attached to #241."
This reverts commit 34fe2312b4.
2009-02-10 13:21:34 +01:00
Patrick Winnertz
428e233f37 Revert "Resolve some issues in mhl Rollang Illig pointed us to:"
This reverts commit 60f2d8d3c0.
2009-02-10 13:21:17 +01:00
Patrick Winnertz
8a55cb1e9a Removed three more includes of mhl files in smbfs.c
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-08 12:41:44 +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
Patrick Winnertz
d8aa8a3028 Forgot to remove some more .s strings and do a rename in order to prevent compiler warnings + added include
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-06 00:36:30 +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
281652cc23 Use FALSE/TRUE in favour of false/true (reverts 4fcf4e9685)
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:41:40 +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
3d0f9e419a Reverted some more GString removals. (See f235b1976e)
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:22:08 +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
Patrick Winnertz
76da0dd3e5 Merge branch 'master' of ssh://midnight-commander.org:2222/git/mc 2009-02-05 10:26:53 +01:00
Patrick Winnertz
5a3072e2f8 Merge branch '199_slang_1x' - Merge again as by merge of mc-4.6 this was removed
* 199_slang_1x:
  dropped use of slang-internal stuff and dropped checks for slang-1.x

Conflicts:
	ChangeLog

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 10:22:44 +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
161dc235a6 lib/mc.sh.in: fixes for non-bash shells (fixing #196) 2009-02-04 22:39:27 +01:00
Enrico Weigelt, metux IT service
a6a9c1c147 fixed edit.c 2009-02-04 21:16:01 +01:00