[VAC] now - 2009-08-29
Hey, I'll be in the alps without net access at all. If there are critical issues in my packages feel free to NMU, but please contact for mc please beforehand Denis Briand (de...@narcan.fr), my Co-Maint, he is no DD yet, but his sponsor, which is cced, can upload for him. For issues in lustre contact please Noel Koethe (n...@debian.org). Greetings Winnie ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Flickering appeared in recent git
Am Wed, 19 Aug 2009 19:37:49 +0200 schrieb Denys Vlasenko vda.li...@googlemail.com: Hi, I rebuilt mc from newer git (two days ago) and I see a somewhat subtle effect. On screen updates, mc now flickers. The simplest way to see it is to open a large xterm window with mc file view (it is less noticeable on text consoles), press and hold Ctrl-R (refresh). In mc built from git a month ago or so, or in some old releases, nothing noticeable happens. In new mc, I see cursor appearing randomly in the panel, with the rest of line after cursor cleared and painted black. It happens on random lines and quickly disappears and reappears. It happens so often and takes so much time that Ctrl-R redraw cannot keep up with keyboard repeat - I release the keys but redraws continue for several seconds. This effect is not limited to Ctrl-R, it's just the easiest way to see it. I see it all the time when screen is updated. For example, if I stand on a text file and press F4, Esc, F4, Esc repeatedly. And I do not see it with old mc in this case too. Does anybody else see this? Jepp I can reproduce this. Can you please open a ticket on m-c.o? Greetings Winnie ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Two new mailinglists
Hey, Ad discussed with Pavel and Miguel we've created two new mailinglists so that people can better decide which mails the would like to get and which mails they didn't want to read: The first mailinglist is about everything which goes into the ticket system, so if a bug is discussed there these emails will show up on this mailingliist: http://groups.google.com/group/mc-bugs You can post to this list at mc-b...@googlegroups.com but In my eyes this should be a pure recieving mailinglist. If there is a problem with a ticket this should be discussed on this list here (mc-devel@gnome.org) and not on the other one. The second is about git commits into certain branches. Currently commits into mc-4.6 and master are send as emails to this list: http://groups.google.com/group/mc-commits You can also post to this list at mc-comm...@googlegroups.com, but I would prefer posts about commits which needs discussion to be on the mc- de...@gnome.org list. This should give everybody the possibility to opt-in as much as he wants in order to track changes. Please note that these messages are from now on not longer send throug this list but through the lists mentioned above, so please subscribe if you want to get these changes. Greetings Winnie ps: First exam is in two days.. after the 06-03-2009 I'll be back online. -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Disable cvs/savannah
Hey, So, could you please explain why it was necessary to move from savannah in the first place ? I don't see how this would help the project ? Well... 1.) as you already stated in your mail is the savannah bugtracker flooded by much more spam messages than normal ones. 2.) cvs is in my eyes not very optimal for working together. git is better for such an task in my eyes. The same applies to the savannah bugtracker.. could please someone who has the power disable it (or prevent it from spamming this list? ;)) What for ? Why is that so funny ? Nothing is funny here. The spam was annoying, (This was the reason you stated that you'll unsubscribe from the list). As I wanted everybody to stay on this list I thought that disabling a huge spamsource would help and I think this was the correct. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Further Midnight Commander development
Hey, to the new ones: get the trac vs. the mailinglist thing sorted. the current situation practically excludes everyone who cannot be bothered to poll your trac often enough, which basically is everyone who has some real experience (and thus has a day job, etc.). The plan is to move the trac mails together with git commit messages to an own mailinglist. Greetings Winnie ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Further Midnight Commander development
Am Samstag 14 Februar 2009 17:21:22 schrieb Oswald Buddenhagen: On Sat, Feb 14, 2009 at 04:38:31PM +0100, Patrick Winnertz wrote: to the new ones: get the trac vs. the mailinglist thing sorted. The plan is to move the trac mails together with git commit messages to an own mailinglist. but you want to continue using mc-devel as well? i don't think the size of the mc project justifies this in any way. Well.. I would like to have some place to discuss everything. Furthermore it should be possible to get notified about important new commits without looking into the git (therefore commit messages when commiting to certain branches). At last it should be possible to track the status of tickets via email as it was on savannah. There was in the first time very much activity therefore very much mails from trac. If this is too much it would be worth to move this to a separate mailinglist. even more so that after this initial flurry of activity things will most probably quiet down again (even if this team proves to have a longer half-life period than previous initiatives). I hope so too. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
[VAC]ish: learning for exams until 6.3
Hey, I'll will be very busy the next 2 weeks with learning for my exams. If there is anything which needs a fast fix please feel free to NMU my packages. I'll be online once a day to read mails and to know what is happening ;-) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [155fd32] Revert second bunch of mhl patches (see 9b9cab58749217101ab16504a77efb301812cfbf)
The following commit has been merged in the master branch:
commit 155fd328a4b9f085d1f44ea710a5dee4a7d67f3e
Author: Patrick Winnertz win...@debian.org
Date: Thu Feb 5 23:18:38 2009 +0100
Revert second bunch of mhl patches (see
9b9cab58749217101ab16504a77efb301812cfbf)
This reintroduce GString again and drop the use of mhl_mem_free in some
files
Signed-off-by: Patrick Winnertz win...@debian.org
diff --git a/edit/edit.c b/edit/edit.c
index 36284df..e853a96 100644
--- a/edit/edit.c
+++ b/edit/edit.c
@@ -274,20 +274,22 @@ edit_insert_file (WEdit *edit, const char *filename)
edit_insert_stream (edit, f);
edit_cursor_move (edit, current - edit-curs1);
if (pclose (f) 0) {
- char errmsg[8192];
- snprintf(errmsg, sizeof(errmsg), _( Error reading from pipe:
%s ), p);
- edit_error_dialog (_(Error), errmsg);
- mhl_mem_free (p);
+ GString *errmsg = g_string_new (NULL);
+ g_string_sprintf (errmsg, _( Error reading from pipe: %s ),
p);
+ edit_error_dialog (_(Error), errmsg-str);
+ g_string_free (errmsg, TRUE);
+ g_free (p);
return 0;
}
} else {
- char errmsg[8192];
- snprintf(errmsg, sizeof(errmsg), _( Cannot open pipe for reading:
%s ), p);
- edit_error_dialog (_(Error), errmsg);
- mhl_mem_free (p);
+ GString *errmsg = g_string_new (NULL);
+ g_string_sprintf (errmsg, _( Cannot open pipe for reading: %s ),
p);
+ edit_error_dialog (_(Error), errmsg-str);
+ g_string_free (errmsg, TRUE);
+ g_free (p);
return 0;
}
- mhl_mem_free (p);
+ g_free (p);
} else {
int i, file, blocklen;
long current = edit-curs1;
diff --git a/src/utilunix.c b/src/utilunix.c
index 4cf70dc..5dfa18e 100644
--- a/src/utilunix.c
+++ b/src/utilunix.c
@@ -590,7 +590,7 @@ putenv (char *string)
size * sizeof (char *));
new_environ[size] = (char *) string;
new_environ[size + 1] = NULL;
- mhl_mem_free ((void *) last_environ);
+ g_free ((void *) last_environ);
last_environ = new_environ;
__environ = new_environ;
}
--
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [281652c] Use FALSE/TRUE in favour of false/true (reverts 4fcf4e9685d9b2e4b49bfa3f7d3709dbe48073b6)
The following commit has been merged in the master branch:
commit 281652cc23a4733b23e8fd5b779e1522913bbc78
Author: Patrick Winnertz win...@debian.org
Date: Thu Feb 5 23:41:40 2009 +0100
Use FALSE/TRUE in favour of false/true (reverts
4fcf4e9685d9b2e4b49bfa3f7d3709dbe48073b6)
Signed-off-by: Patrick Winnertz win...@debian.org
diff --git a/edit/usermap.c b/edit/usermap.c
index fb06124..bbc0dd7 100644
--- a/edit/usermap.c
+++ b/edit/usermap.c
@@ -255,7 +255,7 @@ cfg_free_maps(config_t *cfg)
static GPtrArray *
split_line(char *str)
{
-bool inside_quote = false;
+bool inside_quote = FALSE;
int move = 0;
GPtrArray *args;
@@ -356,7 +356,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
if (argc != 3) {
snprintf(error_msg, sizeof(error_msg),
_(bind: Wrong argument number, bind key command));
- return false;
+ return FALSE;
}
keyname = argv[1];
@@ -378,7 +378,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
if (!m) { /* incorrect key */
snprintf(error_msg, sizeof(error_msg),
_(bind: Bad key value `%s'), keyname);
- return false;
+ return FALSE;
}
mod |= m;
m = 0;
@@ -391,7 +391,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
/* no key */
if (keyname[0] == '\0') {
snprintf(error_msg, sizeof(error_msg), _(bind: Ehh...no key?));
- return false;
+ return FALSE;
}
/* ordinary key */
@@ -405,7 +405,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
if (k 0 !key-name) {
snprintf(error_msg, sizeof(error_msg),
_(bind: Unknown key: `%s'), keyname);
- return false;
+ return FALSE;
}
while (cmd-name strcasecmp(cmd-name, command) != 0)
@@ -414,7 +414,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
if (!cmd-name) {
snprintf(error_msg, sizeof(error_msg),
_(bind: Unknown command: `%s'), command);
- return false;
+ return FALSE;
}
if (mod KEY_M_CTRL) {
@@ -435,7 +435,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
else
keymap_add(cfg-keymap, k, cmd-val);
-return true;
+return TRUE;
}
#if 0
@@ -482,7 +482,7 @@ cmd_label(config_t *cfg, int argc, char *argv[])
snprintf(error_msg, sizeof(error_msg),
_(%s: Syntax: %s n command label),
argv[0], argv[0]);
- return false;
+ return FALSE;
}
fn = strtol(argv[1], NULL, 0);
@@ -495,19 +495,19 @@ cmd_label(config_t *cfg, int argc, char *argv[])
if (!cmd-name) {
snprintf(error_msg, sizeof(error_msg),
_(%s: Unknown command: `%s'), argv[0], command);
- return false;
+ return FALSE;
}
if (fn 1 || fn 10) {
snprintf(error_msg, sizeof(error_msg),
_(%s: fn should be 1-10), argv[0]);
- return false;
+ return FALSE;
}
keymap_add(cfg-keymap, KEY_F(fn), cmd-val);
cfg-labels[fn - 1] = g_strdup(label);
-return true;
+return TRUE;
}
@@ -522,7 +522,7 @@ parse_file(config_t *cfg, const char *file, const command_t
*cmd)
if (!fp) {
snprintf(error_msg, sizeof(error_msg), _(%s: fopen(): %s),
file, strerror(errno));
- return false;
+ return FALSE;
}
while (fgets(buf, sizeof(buf), fp)) {
@@ -549,7 +549,7 @@ parse_file(config_t *cfg, const char *file, const command_t
*cmd)
argv[0]);
g_ptr_array_free(args, TRUE);
fclose(fp);
- return false;
+ return FALSE;
}
if (!(c-handler(cfg, args-len, argv))) {
@@ -559,13 +559,13 @@ parse_file(config_t *cfg, const char *file, const
command_t *cmd)
g_free(ss);
g_ptr_array_free(args, TRUE);
fclose(fp);
- return false;
+ return FALSE;
}
g_ptr_array_free(args, TRUE);
}
fclose(fp);
-return true;
+return TRUE;
}
static bool
@@ -582,10 +582,10 @@ load_user_keymap(config_t *cfg, const char *file)
cfg-ext_keymap = g_array_new(TRUE, FALSE, sizeof(edit_key_map_type));
if (!parse_file(cfg, file, cmd)) {
- return false;
+ return FALSE;
}
-return true;
+return TRUE;
}
bool
@@ -597,7 +597,7 @@ edit_load_user_map(WEdit *edit)
struct stat s;
if (edit_key_emulation != EDIT_KEY_EMULATION_USER)
- return true;
+ return TRUE;
file = mhl_str_dir_plus_file(home_dir, MC_USERMAP);
@@ -606,7 +606,7 @@ edit_load_user_map(WEdit *edit)
edit_error_dialog(_(Error), msg);
g_free(msg);
g_free(file);
- return false;
+ return FALSE;
}
if (s.st_mtime != cfg.mtime) {
@@ -617,7 +617,7 @@ edit_load_user_map(WEdit *edit)
edit_error_dialog
updated: [0450daf] Removed type SHELL_ESCAPED_STR in favour of plain char*
The following commit has been merged in the master branch:
commit 0450daf56672a75df543c8222353c8042de8c7a1
Author: Patrick Winnertz win...@debian.org
Date: Fri Feb 6 00:09:35 2009 +0100
Removed type SHELL_ESCAPED_STR in favour of plain char*
Signed-off-by: Patrick Winnertz win...@debian.org
diff --git a/ChangeLog b/ChangeLog
index a4b977f..3fd7ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,7 +40,7 @@
2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
- * replaced calls to g_free() by g_free()
+ * replaced calls to g_free() by mhl_mem_free()
2009-01-29 Mikhail S. Pobolovets styx...@gmail.com
diff --git a/mhl/escape.h b/mhl/escape.h
index 485579c..3f07d62 100644
--- a/mhl/escape.h
+++ b/mhl/escape.h
@@ -17,9 +17,6 @@
#define mhl_shell_escape_nottoesc(x) \
(((x)!=0) (!mhl_shell_escape_toesc((x
-/* type for escaped string - just for a bit more type safety ;-p */
-typedef struct { char* s; } SHELL_ESCAPED_STR;
-
/** To be compatible with the general posix command lines we have to escape
strings for the command line
@@ -28,10 +25,10 @@ typedef struct { char* s; } SHELL_ESCAPED_STR;
/returns
return escaped string (later need to free)
*/
-static inline SHELL_ESCAPED_STR mhl_shell_escape_dup(const char* src)
+static inline char* mhl_shell_escape_dup(const char* src)
{
if ((src==NULL)||(!(*src)))
- return (SHELL_ESCAPED_STR){ .s = strdup() };
+ return strdup();
char* buffer = calloc(1, strlen(src)*2+2);
char* ptr = buffer;
@@ -50,7 +47,7 @@ static inline SHELL_ESCAPED_STR mhl_shell_escape_dup(const
char* src)
/* at this point we either have an \0 or an char to escape */
if (!c)
- return (SHELL_ESCAPED_STR){ .s = buffer };
+ return buffer;
*ptr = '\\';
ptr++;
diff --git a/src/complete.c b/src/complete.c
index ed4dfcd..6a7b19d 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -206,9 +206,7 @@ filename_completion_function (char *text, int state,
INPUT_COMPLETE_FLAGS flags)
if (temp (flags INPUT_COMPLETE_SHELL_ESC))
{
- SHELL_ESCAPED_STR e_temp = mhl_shell_escape_dup(temp);
- g_free (temp);
- temp = e_temp.s;
+ temp = mhl_shell_escape_dup(temp);
}
return temp;
}
@@ -486,9 +484,8 @@ command_completion_function (char *text, int state,
INPUT_COMPLETE_FLAGS flags)
p = filename_completion_function (text, state, flags);
if (!p)
return 0;
- SHELL_ESCAPED_STR e_p = mhl_shell_escape_dup(p);
- g_free(p);
- return e_p.s;
+ p = mhl_shell_escape_dup(p);
+ return p;
}
found = NULL;
@@ -543,9 +540,9 @@ command_completion_function (char *text, int state,
INPUT_COMPLETE_FLAGS flags)
}
if ((p = strrchr (found, PATH_SEP)) != NULL) {
p++;
- SHELL_ESCAPED_STR e_p = mhl_shell_escape_dup(p);
+ p = mhl_shell_escape_dup(p);
g_free(found);
- return e_p.s;
+ return p;
}
return found;
diff --git a/vfs/fish.c b/vfs/fish.c
index 06cf483..397d310 100644
--- a/vfs/fish.c
+++ b/vfs/fish.c
@@ -367,7 +367,7 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode
*dir, char *remote_path)
char buffer[8192];
struct vfs_s_entry *ent = NULL;
FILE *logfile;
-SHELL_ESCAPED_STR quoted_path;
+char *quoted_path;
int reply_code;
#if 0
@@ -462,7 +462,7 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode
*dir, char *remote_path)
else\n
echo '### 500'\n
fi\n,
- quoted_path.s, quoted_path.s, quoted_path.s, quoted_path.s,
quoted_path.s, quoted_path.s);
+ quoted_path, quoted_path, quoted_path, quoted_path, quoted_path,
quoted_path);
g_free (quoted_path.s);
ent = vfs_s_generate_entry(me, NULL, dir, 0);
while (1) {
@@ -618,7 +618,7 @@ fish_file_store(struct vfs_class *me, struct vfs_s_fh *fh,
char *name, char *loc
struct stat s;
int was_error = 0;
int h;
-SHELL_ESCAPED_STR quoted_name;
+char *quoted_name;
h = open (localname, O_RDONLY);
@@ -659,7 +659,7 @@ fish_file_store(struct vfs_class *me, struct vfs_s_fh *fh,
char *name, char *loc
*/
quoted_name = mhl_shell_escape_dup(name);
-print_vfs_message(_(fish: store %s: sending command...), quoted_name.s );
+print_vfs_message(_(fish: store %s: sending command...), quoted_name );
/* FIXME: File size is limited to ULONG_MAX */
if (!fh-u.fish.append)
@@ -683,8 +683,8 @@ fish_file_store(struct vfs_class *me, struct vfs_s_fh *fh,
char *name, char *loc
rest=`expr $rest - $n`\n
done\n
}; echo '### 200'\n,
-(unsigned long) s.st_size, quoted_name.s,
-quoted_name.s, (unsigned long) s.st_size,
+(unsigned long) s.st_size, quoted_name,
+quoted_name, (unsigned long
updated: [ae987b9] Reverted the use of bool in favour of gboolean
The following commit has been merged in the master branch:
commit ae987b923e5341422bdc3048079ce2c5a2b8dd2f
Author: Patrick Winnertz win...@debian.org
Date: Thu Feb 5 23:46:07 2009 +0100
Reverted the use of bool in favour of gboolean
Signed-off-by: Patrick Winnertz win...@debian.org
diff --git a/edit/usermap.c b/edit/usermap.c
index bbc0dd7..e30c011 100644
--- a/edit/usermap.c
+++ b/edit/usermap.c
@@ -59,7 +59,7 @@ typedef struct Config {
typedef struct Command {
const char *name;
-bool (*handler) (config_t *cfg, int argc, char *argv[]);
+int (*handler) (config_t *cfg, int argc, char *argv[]);
} command_t;
static char error_msg[200] = Nobody see this;
@@ -255,7 +255,7 @@ cfg_free_maps(config_t *cfg)
static GPtrArray *
split_line(char *str)
{
-bool inside_quote = FALSE;
+gboolean inside_quote = FALSE;
int move = 0;
GPtrArray *args;
@@ -345,7 +345,7 @@ keymap_add(GArray *keymap, int key, int cmd)
}
/* bind key command */
-static bool
+static gboolean
cmd_bind(config_t *cfg, int argc, char *argv[])
{
char *keyname, *command;
@@ -471,7 +471,7 @@ static void edit_my_define (Dlg_head * h, int idx, const
char *text,
#endif
/* label number command label */
-static bool
+static gboolean
cmd_label(config_t *cfg, int argc, char *argv[])
{
const name_map_t *cmd = command_names;
@@ -511,7 +511,7 @@ cmd_label(config_t *cfg, int argc, char *argv[])
}
-static bool
+static gboolean
parse_file(config_t *cfg, const char *file, const command_t *cmd)
{
char buf[200];
@@ -568,7 +568,7 @@ parse_file(config_t *cfg, const char *file, const command_t
*cmd)
return TRUE;
}
-static bool
+static gboolean
load_user_keymap(config_t *cfg, const char *file)
{
const command_t cmd[] = {
@@ -588,7 +588,7 @@ load_user_keymap(config_t *cfg, const char *file)
return TRUE;
}
-bool
+gboolean
edit_load_user_map(WEdit *edit)
{
static config_t cfg;
diff --git a/edit/usermap.h b/edit/usermap.h
index bf06d12..fecf03b 100644
--- a/edit/usermap.h
+++ b/edit/usermap.h
@@ -1,13 +1,11 @@
#ifndef MC_USERMAP_H
#define MC_USERMAP_H
-#include mhl/types.h
-
#define MC_USERMAP .mc/cedit/cooledit.bindings
#include edit.h
/* load user map */
-bool edit_load_user_map(WEdit *);
+gboolean edit_load_user_map(WEdit *);
#endif
diff --git a/src/ecs-test.c b/src/ecs-test.c
index e7f64e5..a194280 100644
--- a/src/ecs-test.c
+++ b/src/ecs-test.c
@@ -29,13 +29,11 @@
#include locale.h
#include stdio.h
-#include mhl/types.h
-
#include global.h
#include ecs.h
#ifdef EXTCHARSET_ENABLED
-static bool
+static gboolean
change_locale(const char *loc)
{
const char *ident;
@@ -67,7 +65,7 @@ test_locale_en_US_UTF_8(void)
const char *teststr_c = Zuckert\374te;
ecs_char *ecs;
char *mbs;
- boolvalid;
+ gbooleanvalid;
if (!change_locale(en_US.UTF-8)) return;
diff --git a/src/ecs.c b/src/ecs.c
index 62683a6..89ef8e0 100644
--- a/src/ecs.c
+++ b/src/ecs.c
@@ -37,7 +37,7 @@
* String type conversion
*/
-extern bool ecs_mbstr_to_str(ecs_char **ret_str, const char *s)
+extern gboolean ecs_mbstr_to_str(ecs_char **ret_str, const char *s)
{
#ifdef EXTCHARSET_ENABLED
size_t maxlen, len;
@@ -61,7 +61,7 @@ extern bool ecs_mbstr_to_str(ecs_char **ret_str, const char
*s)
#endif
}
-extern bool ecs_str_to_mbstr(char **ret_str, const ecs_char *s)
+extern gboolean ecs_str_to_mbstr(char **ret_str, const ecs_char *s)
{
#ifdef EXTCHARSET_ENABLED
size_t maxlen, len;
@@ -103,57 +103,57 @@ extern bool ecs_str_to_mbstr(char **ret_str, const
ecs_char *s)
(cf(c))
#endif
-extern bool ecs_isalnum(ecs_char c)
+extern gboolean ecs_isalnum(ecs_char c)
{
return ECS_CTYPE(iswalnum, isalnum, c);
}
-extern bool ecs_isalpha(ecs_char c)
+extern gboolean ecs_isalpha(ecs_char c)
{
return ECS_CTYPE(iswalpha, isalpha, c);
}
-extern bool ecs_iscntrl(ecs_char c)
+extern gboolean ecs_iscntrl(ecs_char c)
{
return ECS_CTYPE(iswcntrl, iscntrl, c);
}
-extern bool ecs_isdigit(ecs_char c)
+extern gboolean ecs_isdigit(ecs_char c)
{
return ECS_CTYPE(iswdigit, isdigit, c);
}
-extern bool ecs_isgraph(ecs_char c)
+extern gboolean ecs_isgraph(ecs_char c)
{
return ECS_CTYPE(iswgraph, isgraph, c);
}
-extern bool ecs_islower(ecs_char c)
+extern gboolean ecs_islower(ecs_char c)
{
return ECS_CTYPE(iswlower, islower, c);
}
-extern bool ecs_isprint(ecs_char c)
+extern gboolean ecs_isprint(ecs_char c)
{
return ECS_CTYPE(iswprint, isprint, c);
}
-extern bool ecs_ispunct(ecs_char c)
+extern gboolean ecs_ispunct(ecs_char c)
{
return ECS_CTYPE(iswpunct, ispunct, c);
}
-extern bool ecs_isspace(ecs_char c)
+extern gboolean ecs_isspace(ecs_char c)
{
return ECS_CTYPE(iswspace, isspace, c);
}
-extern bool ecs_isupper(ecs_char c)
+extern gboolean ecs_isupper(ecs_char c
updated: [3d0f9e4] Reverted some more GString removals. (See f235b1976ee6dd7aa2be7e75c870784c424e3de3)
The following commit has been merged in the master branch:
commit 3d0f9e419a1b8a28196ee15b93adf56eafdd1a1e
Author: Patrick Winnertz win...@debian.org
Date: Thu Feb 5 23:22:08 2009 +0100
Reverted some more GString removals. (See
f235b1976ee6dd7aa2be7e75c870784c424e3de3)
Signed-off-by: Patrick Winnertz win...@debian.org
diff --git a/edit/edit.c b/edit/edit.c
index e853a96..4504df7 100644
--- a/edit/edit.c
+++ b/edit/edit.c
@@ -153,9 +153,10 @@ edit_load_file_fast (WEdit *edit, const char *filename)
buf2 = edit-curs2 S_EDIT_BUF_SIZE;
if ((file = mc_open (filename, O_RDONLY | O_BINARY)) == -1) {
- char errmsg[8192];
- snprintf(errmsg, sizeof(errmsg), _( Cannot open %s for reading ),
filename);
- edit_error_dialog (_(Error), get_sys_error (errmsg));
+ GString *errmsg = g_string_new(NULL);
+ g_string_sprintf(errmsg, _( Cannot open %s for reading ), filename);
+ edit_error_dialog (_(Error), get_sys_error (errmsg-str));
+ g_string_free (errmsg, TRUE);
return 1;
}
@@ -315,8 +316,7 @@ static int
check_file_access (WEdit *edit, const char *filename, struct stat *st)
{
int file;
-char errmsg[8192];
-errmsg[0] = 0;
+GString *errmsg = (GString *) 0;
/* Try opening an existing file */
file = mc_open (filename, O_NONBLOCK | O_RDONLY | O_BINARY, 0666);
@@ -331,7 +331,8 @@ check_file_access (WEdit *edit, const char *filename,
struct stat *st)
O_NONBLOCK | O_RDONLY | O_BINARY | O_CREAT | O_EXCL,
0666);
if (file 0) {
- snprintf (errmsg, sizeof(errmsg), _( Cannot open %s for reading
), filename);
+ g_string_sprintf (errmsg = g_string_new (NULL),
+ _( Cannot open %s for reading ), filename);
goto cleanup;
} else {
/* New file, delete it if it's not modified or saved */
@@ -341,13 +342,15 @@ check_file_access (WEdit *edit, const char *filename,
struct stat *st)
/* Check what we have opened */
if (mc_fstat (file, st) 0) {
- snprintf (errmsg, sizeof(errmsg), _( Cannot get size/permissions for
%s ), filename);
+ g_string_sprintf (errmsg = g_string_new (NULL),
+ _( Cannot get size/permissions for %s ), filename);
goto cleanup;
}
/* We want to open regular files only */
if (!S_ISREG (st-st_mode)) {
- snprintf (errmsg, sizeof(errmsg), _( %s is not a regular file ),
filename);
+ g_string_sprintf (errmsg = g_string_new (NULL),
+ _( %s is not a regular file ), filename);
goto cleanup;
}
@@ -360,14 +363,16 @@ check_file_access (WEdit *edit, const char *filename,
struct stat *st)
}
if (st-st_size = SIZE_LIMIT) {
- snprintf (errmsg, sizeof(errmsg), _( File %s is too large ),
filename);
+g_string_sprintf (errmsg = g_string_new (NULL),
+ _( File %s is too large ), filename);
goto cleanup;
}
cleanup:
(void) mc_close (file);
-if (errmsg[0]) {
- edit_error_dialog (_(Error), errmsg);
+if (errmsg) {
+ edit_error_dialog (_(Error), errmsg-str);
+ g_string_free (errmsg, TRUE);
return 1;
}
return 0;
diff --git a/edit/editcmd.c b/edit/editcmd.c
index 8de68ea..9d730e0 100644
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@ -1214,16 +1214,14 @@ edit_replace_prompt (WEdit * edit, char *replace_text,
int xpos, int ypos)
0, 0, 0, 0, 0},
NULL_QuickWidget};
-const char* label_nls = _( Replace with: );
-char label_text[8192];
-if (*replace_text)
-{
- size_t label_len = strlen(label_nls);
- snprintf(label_text, sizeof(label_text), %s%s, label_nls,
replace_text);
- convert_to_display((label_text)+label_len);
+GString *label_text = g_string_new (_( Replace with: ));
+if (*replace_text) {
+size_t label_len;
+ label_len = label_text-len;
+g_string_append (label_text, replace_text);
+convert_to_display (label_text-str + label_len);
}
-
-quick_widgets[5].text = label_text;
+quick_widgets[5].text = label_text-str;
{
int retval;
@@ -1242,6 +1240,7 @@ edit_replace_prompt (WEdit * edit, char *replace_text,
int xpos, int ypos)
Quick_input.ypos = ypos;
retval = quick_dialog (Quick_input);
+ g_string_free (label_text, TRUE);
return retval;
}
}
diff --git a/edit/syntax.c b/edit/syntax.c
index 5de3aaf..479f3c5 100644
--- a/edit/syntax.c
+++ b/edit/syntax.c
@@ -505,14 +505,10 @@ void edit_get_syntax_color (WEdit * edit, long
byte_index, int *color)
*/
static int read_one_line (char **line, FILE * f)
{
-char buffer[8192];
-int index = 0, c, r = 0;
-buffer[0] = 0;
+GString *p = g_string_new ();
+int c, r = 0;
for (;;) {
- if (index = (sizeof(buffer)-1))
- break;
-
c = fgetc (f);
if (c == EOF) {
if (ferror (f
updated: [5920d13] First bunch of reverting stuff from mhl to switch back to glib
The following commit has been merged in the master branch:
commit 5920d138105dc27eb6f4aec4de7b4d21bd219cdf
Author: Patrick Winnertz win...@debian.org
Date: Thu Feb 5 23:09:37 2009 +0100
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 win...@debian.org
diff --git a/ChangeLog b/ChangeLog
index e395d88..3fd7ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-05 Patrick Winnertz win...@debian.org
+
+ * reverted all mhl usage in files except escaping stuff
+
2009-02-04 Enrico Weigelt, metux ITS weig...@metux.de
* mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing
#239, #240)
diff --git a/edit/usermap.c b/edit/usermap.c
index 7914d75..b25cad9 100644
--- a/edit/usermap.c
+++ b/edit/usermap.c
@@ -29,8 +29,8 @@
#include sys/types.h
#include sys/stat.h
#include unistd.h
-#include stdbool.h
+#include mhl/types.h
#include mhl/memory.h
#include mhl/string.h
diff --git a/edit/usermap.h b/edit/usermap.h
index 29097c4..bf06d12 100644
--- a/edit/usermap.h
+++ b/edit/usermap.h
@@ -1,7 +1,7 @@
#ifndef MC_USERMAP_H
#define MC_USERMAP_H
-#include stdbool.h
+#include mhl/types.h
#define MC_USERMAP .mc/cedit/cooledit.bindings
diff --git a/src/ecs-test.c b/src/ecs-test.c
index 2493be9..963a63b 100644
--- a/src/ecs-test.c
+++ b/src/ecs-test.c
@@ -28,7 +28,8 @@
#include assert.h
#include locale.h
#include stdio.h
-#include stdbool.h
+
+#include mhl/types.h
#include global.h
#include ecs.h
diff --git a/src/ecs.c b/src/ecs.c
index cd8da0c..a38c54e 100644
--- a/src/ecs.c
+++ b/src/ecs.c
@@ -26,8 +26,8 @@
#include assert.h
#include ctype.h
-#include stdbool.h
+#include mhl/types.h
#include mhl/string.h
#include global.h
diff --git a/src/ecs.h b/src/ecs.h
index 1a53c6f..98e9a9a 100644
--- a/src/ecs.h
+++ b/src/ecs.h
@@ -44,7 +44,7 @@ typedef char ecs_char;
# define ECS_STR(s) (s)
#endif
-#include stdbool.h
+#include mhl/types.h
/*
* String conversion functions between the wide character encoding and
diff --git a/src/file.c b/src/file.c
index ebd414e..1a367ea 100644
--- a/src/file.c
+++ b/src/file.c
@@ -48,8 +48,8 @@
#include sys/types.h
#include sys/stat.h
#include unistd.h
-#include stdbool.h
+#include mhl/types.h
#include mhl/memory.h
#include mhl/escape.h
#include mhl/string.h
diff --git a/src/find.c b/src/find.c
index 564ed86..bf95b7f 100644
--- a/src/find.c
+++ b/src/find.c
@@ -26,8 +26,8 @@
#include stdlib.h
#include string.h
#include sys/stat.h
-#include stdbool.h
+#include mhl/types.h
#include mhl/memory.h
#include mhl/string.h
diff --git a/src/key.c b/src/key.c
index 3bf66de..1434fa7 100644
--- a/src/key.c
+++ b/src/key.c
@@ -31,8 +31,8 @@
#include string.h
#include sys/types.h
#include unistd.h
-#include stdbool.h
+#include mhl/types.h
#include mhl/memory.h
#include mhl/string.h
diff --git a/src/logging.c b/src/logging.c
index 60db3e6..a48dcfb 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -25,9 +25,9 @@
#include stdarg.h
#include stdio.h
-#include stdbool.h
#include mhl/memory.h
+#include mhl/types.h
#include global.h
#include logging.h
diff --git a/src/treestore.c b/src/treestore.c
index e8d81ec..cb08cb2 100644
--- a/src/treestore.c
+++ b/src/treestore.c
@@ -40,8 +40,8 @@
#include sys/types.h
#include sys/stat.h
#include unistd.h
-#include stdbool.h
+#include mhl/types.h
#include mhl/memory.h
#include mhl/string.h
diff --git a/src/tty.c b/src/tty.c
index 70dbfb6..44b40e5 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -28,7 +28,6 @@
#include signal.h
#include stdarg.h
-#include stdbool.h
#include mhl/types.h
diff --git a/src/tty.h b/src/tty.h
index b7ea928..f6d520b 100644
--- a/src/tty.h
+++ b/src/tty.h
@@ -25,7 +25,7 @@
#endif /* WANT_TERM_H */
#endif /* USE_NCURSES */
-#include stdbool.h
+#include mhl/types.h
/* {{{ Input }}} */
diff --git a/src/utilunix.c b/src/utilunix.c
index 71f839a..4cf70dc 100644
--- a/src/utilunix.c
+++ b/src/utilunix.c
@@ -32,7 +32,7 @@
#include stdio.h
#include stdlib.h
#include string.h
-#include stdbool.h
+
#include sys/param.h
#include sys/types.h
#include sys/stat.h
@@ -41,6 +41,7 @@
#endif
#include unistd.h
+#include mhl/types.h
#include mhl/memory.h
#include mhl/string.h
diff --git a/src/view.c b/src/view.c
index b00916a..dcd3559 100644
--- a/src/view.c
+++ b/src/view.c
@@ -42,8 +42,8 @@
#include sys/types.h
#include sys/stat.h
#include unistd.h
-#include stdbool.h
+#include mhl/types.h
#include mhl/memory.h
#include mhl/string.h
diff --git a/src/widget.c b/src/widget.c
index e8f8be3..31afab6 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -33,8 +33,8 @@
#include stdio.h
#include string.h
#include sys/types.h
-#include stdbool.h
+#include mhl/types.h
#include mhl/memory.h
#include mhl/string.h
diff --git a/src/widget.h b
updated: [d8aa8a3] Forgot to remove some more .s strings and do a rename in order to prevent compiler warnings + added include
The following commit has been merged in the master branch:
commit d8aa8a302837a84c0ddaf65009b2ce6bc7dcf6dd
Author: Patrick Winnertz win...@debian.org
Date: Fri Feb 6 00:34:50 2009 +0100
Forgot to remove some more .s strings and do a rename in order to prevent
compiler warnings + added include
Signed-off-by: Patrick Winnertz win...@debian.org
diff --git a/mhl/memory.h b/mhl/memory.h
index 3a77934..3268e93 100644
--- a/mhl/memory.h
+++ b/mhl/memory.h
@@ -11,13 +11,13 @@
#definemhl_mem_alloc_z(sz) (calloc(1,sz))
/* free a chunk of memory from stack, passing NULL does no harm */
-static inline void g_free(void* ptr)
+static inline void mhl_mem_free(void* ptr)
{
if (ptr) free(ptr);
}
/* free an ptr and NULL it */
-#defineMHL_PTR_FREE(ptr) do { g_free(ptr); (ptr) = NULL; } while
(0)
+#defineMHL_PTR_FREE(ptr) do { mhl_mem_free(ptr); (ptr) = NULL; }
while (0)
/* allocate a chunk on stack - automatically free'd on function exit */
#definemhl_stack_alloc(sz) (alloca(sz))
diff --git a/vfs/fish.c b/vfs/fish.c
index 397d310..2e59c8b 100644
--- a/vfs/fish.c
+++ b/vfs/fish.c
@@ -463,7 +463,7 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode
*dir, char *remote_path)
echo '### 500'\n
fi\n,
quoted_path, quoted_path, quoted_path, quoted_path, quoted_path,
quoted_path);
-g_free (quoted_path.s);
+g_free (quoted_path);
ent = vfs_s_generate_entry(me, NULL, dir, 0);
while (1) {
int res = vfs_s_get_line_interruptible (me, buffer, sizeof (buffer),
SUP.sockr);
@@ -735,14 +735,14 @@ fish_file_store(struct vfs_class *me, struct vfs_s_fh
*fh, char *name, char *loc
(unsigned long) s.st_size);
}
close(h);
-g_free(quoted_name.s);
+g_free(quoted_name);
if ((fish_get_reply (me, SUP.sockr, NULL, 0) != COMPLETE) || was_error)
ERRNOR (E_REMOTE, -1);
return 0;
error_return:
close(h);
fish_get_reply(me, SUP.sockr, NULL, 0);
-g_free(quoted_name.s);
+g_free(quoted_name);
return -1;
}
@@ -780,7 +780,7 @@ fish_linear_start (struct vfs_class *me, struct vfs_s_fh
*fh, off_t offset)
echo '### 500'\n
fi\n,
quoted_name, quoted_name, quoted_name, quoted_name );
-g_free (quoted_name.s);
+g_free (quoted_name);
if (offset != PRELIM) ERRNOR (E_REMOTE, 0);
fh-linear = LS_LINEAR_OPEN;
fh-u.fish.got = 0;
@@ -934,8 +934,8 @@ static int fish_##name (struct vfs_class *me, const char
*path1, const char *pat
rpath2 = mhl_shell_escape_dup (crpath2); \
g_free (mpath2); \
g_snprintf(buf, sizeof(buf), string \n, rpath1, rpath2, rpath1, rpath2);
\
-g_free (rpath1.s); \
-g_free (rpath2.s); \
+g_free (rpath1); \
+g_free (rpath2); \
return fish_send_command(me, super2, buf, OPT_FLUSH); \
}
diff --git a/vfs/vfs.c b/vfs/vfs.c
index 6995d55..f13d217 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -38,6 +38,8 @@
#include signal.h
#include ctype.h /* is_digit() */
+#include mhl/string.h
+
#include ../src/global.h
#include ../src/tty.h/* enable/disable interrupt key */
#include ../src/wtools.h /* message() */
--
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [fe95221] Rewrote the shell_escape function in order to make us of GString and g_string_append_c
The following commit has been merged in the master branch:
commit fe95221f05e3cc4a80effdcb886768a9eb77efa7
Author: Patrick Winnertz win...@debian.org
Date: Fri Feb 6 14:32:09 2009 +0100
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 win...@debian.org
diff --git a/src/util.c b/src/util.c
index 9924f35..96396c0 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1550,16 +1550,18 @@ Q_ (const char *s)
string for escaping
\returns
- return escaped string (later need to free)
+ return escaped string (which needs to be freed later)
*/
char*
shell_escape(const char* src)
{
+ GString *str;
+ char *result = NULL;
+
if ((src==NULL)||(!(*src)))
return strdup();
- char* buffer = calloc(1, strlen(src)*2+2);
- char* ptr = buffer;
+ str = g_string_new();
/* look for the first char to escape */
while (1)
@@ -1568,19 +1570,19 @@ shell_escape(const char* src)
/* copy over all chars not to escape */
while ((c=(*src)) shell_escape_nottoesc(c))
{
- *ptr = c;
- ptr++;
+ g_string_append_c(str,c);
src++;
}
/* at this point we either have an \0 or an char to escape */
- if (!c)
- return buffer;
+ if (!c) {
+ result = str-str;
+ g_string_free(str,FALSE);
+ return result;
+ }
- *ptr = '\\';
- ptr++;
- *ptr = c;
- ptr++;
+ g_string_append_c(str,'\\');
+ g_string_append_c(str,c);
src++;
}
}
--
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [589ffd0] Use g_snprintf instead of snprintf as we switch back to glib
The following commit has been merged in the master branch:
commit 589ffd0b106b192fc43d1879aa1b7d364297528d
Author: Patrick Winnertz win...@debian.org
Date: Thu Feb 5 23:49:00 2009 +0100
Use g_snprintf instead of snprintf as we switch back to glib
Signed-off-by: Patrick Winnertz win...@debian.org
diff --git a/edit/editcmd.c b/edit/editcmd.c
index 60bced2..6d3c2ed 100644
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@ -2316,7 +2316,7 @@ edit_goto_cmd (WEdit *edit)
char *error;
char s[32];
-snprintf (s, sizeof (s), %ld, line);
+g_snprintf (s, sizeof (s), %ld, line);
f = input_dialog (_( Goto line ), _( Enter line: ),
MC_HISTORY_EDIT_GOTO_LINE,
line ? s : );
if (!f)
diff --git a/edit/editdraw.c b/edit/editdraw.c
index b191391..86ea3f9 100644
--- a/edit/editdraw.c
+++ b/edit/editdraw.c
@@ -72,7 +72,7 @@ static void status_string (WEdit * edit, char *s, int w)
*/
if (edit-curs1 edit-last_byte) {
unsigned char cur_byte = edit_get_byte (edit, edit-curs1);
- snprintf (byte_str, sizeof (byte_str), %c %3d 0x%02X,
+ g_snprintf (byte_str, sizeof (byte_str), %c %3d 0x%02X,
is_printable (cur_byte) ? cur_byte : '.',
(int) cur_byte,
(unsigned) cur_byte);
@@ -81,7 +81,7 @@ static void status_string (WEdit * edit, char *s, int w)
}
/* The field lengths just prevent the status line from shortening too much
*/
-snprintf (s, w,
+g_snprintf (s, w,
[%c%c%c%c] %2ld L:[%3ld+%2ld %3ld/%3ld] *(%-4ld/%4ldb)= %s,
edit-mark1 != edit-mark2 ? ( column_highlighting ? 'C' : 'B')
: '-',
edit-modified ? 'M' : '-',
diff --git a/edit/editoptions.c b/edit/editoptions.c
index 777431f..9011ded 100644
--- a/edit/editoptions.c
+++ b/edit/editoptions.c
@@ -147,9 +147,9 @@ edit_options_dialog (void)
i18n_flag = 1;
}
-snprintf (wrap_length, sizeof (wrap_length), %d,
+g_snprintf (wrap_length, sizeof (wrap_length), %d,
option_word_wrap_line_length);
-snprintf (tab_spacing, sizeof (tab_spacing), %d,
+g_snprintf (tab_spacing, sizeof (tab_spacing), %d,
option_tab_spacing);
quick_widgets[3].text = wrap_length;
diff --git a/src/boxes.c b/src/boxes.c
index a2c863c..a950f3d 100644
--- a/src/boxes.c
+++ b/src/boxes.c
@@ -573,7 +573,7 @@ sel_charset_button (int action)
: codepages[new_display_codepage].name;
/* avoid strange bug with label repainting */
-snprintf (buf, sizeof (buf), %-27s, cpname);
+g_snprintf (buf, sizeof (buf), %-27s, cpname);
label_set_text (cplabel, buf);
return 0;
}
@@ -774,12 +774,12 @@ configure_vfs (void)
ret_use_netrc = use_netrc;
ret_ftpfs_use_passive_connections = ftpfs_use_passive_connections;
ret_ftpfs_use_passive_connections_over_proxy =
ftpfs_use_passive_connections_over_proxy;
-snprintf(buffer3, sizeof (buffer3), %i, ftpfs_directory_timeout);
+g_snprintf(buffer3, sizeof (buffer3), %i, ftpfs_directory_timeout);
confvfs_widgets[8].text = buffer3;
confvfs_widgets[10].text = ftpfs_anonymous_passwd;
confvfs_widgets[5].text = ftpfs_proxy_host;
#endif
-snprintf (buffer2, sizeof (buffer2), %i, vfs_timeout);
+g_snprintf (buffer2, sizeof (buffer2), %i, vfs_timeout);
confvfs_widgets [3 + VFS_WIDGETBASE].text = buffer2;
if (quick_dialog (confvfs_dlg) != B_CANCEL) {
diff --git a/src/charsets.c b/src/charsets.c
index 4e807c0..f2e69e0 100644
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -198,7 +198,7 @@ init_translation_table (int cpsource, int cpdisplay)
cd = iconv_open (cpdisp, cpsour);
if (cd == (iconv_t) - 1) {
- snprintf (errbuf, sizeof (errbuf),
+ g_snprintf (errbuf, sizeof (errbuf),
_(Cannot translate from %s to %s), cpsour, cpdisp);
return errbuf;
}
@@ -212,7 +212,7 @@ init_translation_table (int cpsource, int cpdisplay)
cd = iconv_open (cpsour, cpdisp);
if (cd == (iconv_t) - 1) {
- snprintf (errbuf, sizeof (errbuf),
+ g_snprintf (errbuf, sizeof (errbuf),
_(Cannot translate from %s to %s), cpdisp, cpsour);
return errbuf;
}
diff --git a/src/chmod.c b/src/chmod.c
index 3f76b0c..2671c65 100644
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -161,7 +161,7 @@ chmod_callback (Dlg_head *h, dlg_msg_t msg, int parm)
case DLG_ACTION:
if (id = 0) {
c_stat ^= check_perm[id].mode;
- snprintf (buffer, sizeof (buffer), %o, c_stat);
+ g_snprintf (buffer, sizeof (buffer), %o, c_stat);
label_set_text (statl, buffer);
chmod_toggle_select (h, id);
mode_change = 1;
@@ -302,7 +302,7 @@ void chmod_cmd (void)
add_widget (ch_dlg, label_new (FY+6, FX+2, c_fown));
c_fgrp = name_trunc (get_group (sf_stat.st_gid), 21);
add_widget (ch_dlg, label_new (FY+8, FX+2, c_fgrp
updated: [3b8f37b] Moved some functions out of mhl into src/util.c
The following commit has been merged in the master branch:
commit 3b8f37b99e551eb1db84b8136f828c4165e4be6f
Author: Patrick Winnertz win...@debian.org
Date: Fri Feb 6 11:17:03 2009 +0100
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 win...@debian.org
diff --git a/edit/edit.c b/edit/edit.c
index e8c0c8e..12f5b72 100644
--- a/edit/edit.c
+++ b/edit/edit.c
@@ -2667,7 +2667,7 @@ user_menu (WEdit * edit)
int nomark;
struct stat status;
long start_mark, end_mark;
-char *block_file = mhl_str_dir_plus_file (home_dir, BLOCK_FILE);
+char *block_file = concat_dir_and_file (home_dir, BLOCK_FILE);
int rc = 0;
nomark = eval_marks (edit, start_mark, end_mark);
diff --git a/edit/editcmd.c b/edit/editcmd.c
index 6d3c2ed..26930c6 100644
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@ -215,7 +215,7 @@ edit_save_file (WEdit *edit, const char *filename)
return 0;
if (*filename != PATH_SEP edit-dir) {
- savename = mhl_str_dir_plus_file (edit-dir, filename);
+ savename = concat_dir_and_file (edit-dir, filename);
filename = catstrs (savename, (char *) NULL);
g_free (savename);
}
@@ -281,7 +281,7 @@ edit_save_file (WEdit *edit, const char *filename)
savedir[slashpos - filename + 1] = '\0';
} else
savedir = mhl_str_dup (.);
- saveprefix = mhl_str_dir_plus_file (savedir, cooledit);
+ saveprefix = concat_dir_and_file (savedir, cooledit);
g_free (savedir);
fd = mc_mkstemps (savename, saveprefix, NULL);
g_free (saveprefix);
diff --git a/edit/editwidget.c b/edit/editwidget.c
index 8fb8c14..89e0a5a 100644
--- a/edit/editwidget.c
+++ b/edit/editwidget.c
@@ -176,7 +176,7 @@ edit_file (const char *_file, int line)
WButtonBar *edit_bar;
if (!made_directory) {
- char *dir = mhl_str_dir_plus_file (home_dir, EDIT_DIR);
+ char *dir = concat_dir_and_file (home_dir, EDIT_DIR);
made_directory = (mkdir (dir, 0700) != -1 || errno == EEXIST);
g_free (dir);
}
diff --git a/edit/syntax.c b/edit/syntax.c
index 8fdea33..427d24e 100644
--- a/edit/syntax.c
+++ b/edit/syntax.c
@@ -1026,7 +1026,7 @@ edit_read_syntax_file (WEdit * edit, char ***pnames,
const char *syntax_file,
f = fopen (syntax_file, r);
if (!f){
- lib_file = mhl_str_dir_plus_file (mc_home, syntax PATH_SEP_STR
Syntax);
+ lib_file = concat_dir_and_file (mc_home, syntax PATH_SEP_STR
Syntax);
f = fopen (lib_file, r);
g_free (lib_file);
if (!f)
@@ -1187,7 +1187,7 @@ edit_load_syntax (WEdit *edit, char ***pnames, const char
*type)
if (!*edit-filename !type)
return;
}
-f = mhl_str_dir_plus_file (home_dir, SYNTAX_FILE);
+f = concat_dir_and_file (home_dir, SYNTAX_FILE);
r = edit_read_syntax_file (edit, pnames, f, edit ? edit-filename : 0,
get_first_editor_line (edit), type);
if (r == -1) {
diff --git a/edit/usermap.c b/edit/usermap.c
index e30c011..bb8e0db 100644
--- a/edit/usermap.c
+++ b/edit/usermap.c
@@ -599,7 +599,7 @@ edit_load_user_map(WEdit *edit)
if (edit_key_emulation != EDIT_KEY_EMULATION_USER)
return TRUE;
-file = mhl_str_dir_plus_file(home_dir, MC_USERMAP);
+file = concat_dir_and_file(home_dir, MC_USERMAP);
if (stat(file, s) 0) {
char *msg = g_strdup_printf(_(%s not found!), file);
diff --git a/src/charsets.c b/src/charsets.c
index f2e69e0..10bbefc 100644
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -50,7 +50,7 @@ load_codepages_list (void)
extern int display_codepage;
char *default_codepage = NULL;
-fname = mhl_str_dir_plus_file (mc_home, CHARSETS_INDEX);
+fname = concat_dir_and_file (mc_home, CHARSETS_INDEX);
if (!(f = fopen (fname, r))) {
fprintf (stderr, _(Warning: file %s not found\n), fname);
g_free (fname);
diff --git a/src/cmd.c b/src/cmd.c
index 0bab86e..048037d 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -374,7 +374,7 @@ mkdir_cmd (void)
if (dir[0] == '/' || dir[0] == '~')
absdir = g_strdup (dir);
else
- absdir = mhl_str_dir_plus_file (current_panel-cwd, dir);
+ absdir = concat_dir_and_file (current_panel-cwd, dir);
save_cwds_stat ();
if (my_mkdir (absdir, 0777) == 0) {
@@ -580,10 +580,10 @@ void ext_cmd (void)
_( Which extension file you want to edit? ),
D_NORMAL, 2,
_(User), _(System Wide));
}
-extdir = mhl_str_dir_plus_file (mc_home, MC_LIB_EXT);
+extdir = concat_dir_and_file (mc_home, MC_LIB_EXT);
if (dir == 0){
- buffer = mhl_str_dir_plus_file (home_dir
updated: [8bd8830] Removed TODO Marker in util.c as the functions are fully ported to use glib now
The following commit has been merged in the master branch:
commit 8bd883085fe3f749d0a533cd9233c389d49f0234
Author: Patrick Winnertz win...@debian.org
Date: Fri Feb 6 15:01:34 2009 +0100
Removed TODO Marker in util.c as the functions are fully ported to use glib
now
Signed-off-by: Patrick Winnertz win...@debian.org
diff --git a/src/util.c b/src/util.c
index 2046f10..cee81e8 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1531,8 +1531,6 @@ Q_ (const char *s)
return (sep != NULL) ? sep + 1 : result;
}
-/*TODO: These three functions should use glib and should be fixed soon */
-
#define shell_escape_toesc(x) \
(((x)==' ')||((x)=='!')||((x)=='#')||((x)=='$')||((x)=='%')|| \
((x)=='(')||((x)==')')||((x)=='\'')||((x)=='')||((x)=='~')|| \
--
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [8a55cb1] Removed three more includes of mhl files in smbfs.c
The following commit has been merged in the master branch: commit 8a55cb1e9af2d632555fade4a745617f5a10d956 Author: Patrick Winnertz win...@debian.org Date: Sun Feb 8 12:41:44 2009 +0100 Removed three more includes of mhl files in smbfs.c Signed-off-by: Patrick Winnertz win...@debian.org diff --git a/vfs/smbfs.c b/vfs/smbfs.c index 2001a7d..2f15ebf 100644 --- a/vfs/smbfs.c +++ b/vfs/smbfs.c @@ -26,9 +26,6 @@ #include stdio.h #include sys/types.h -#include mhl/types.h -#include mhl/string.h - #undef USE_NCURSES /* Don't include *curses.h */ #include ../src/global.h #include ../src/tty.h/* enable/disable interrupt key */ @@ -53,8 +50,6 @@ #include string.h -#include mhl/string.h - #include vfs.h #include vfs-impl.h #include smbfs.h -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: updated: [fe95221] Rewrote the shell_escape function in order to make us of GString and g_string_append_c
Am Dienstag 10 Februar 2009 13:38:26 schrieb Oswald Buddenhagen: On Tue, Feb 10, 2009 at 12:49:57PM +0100, Patrick Winnertz wrote: Rewrote the shell_escape function in order to make us of GString and g_string_append_c glib has functions for shell (un-)escaping. did you look at those? Yepp.. indeed. But these functions don't have all the features we needed. Thanks however for your hint. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Building 4.6.2
Hey This should not be for when a tarball is about to be created, because these symlinks might be invalid on a target system. Well. I think we're speaking here about two different things. It's perfectly normal that autogen.sh will create symlinks this is intended and okay. However we need to resolve these symlinks before putting the next release on the download page. As not every user is supposed to have autofoo installed the symlinks needs to be resolved for the release. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [76da0dd] Merge branch 'master' of ssh://midnight-commander.org:2222/git/mc
The following commit has been merged in the master branch: commit 76da0dd3e59e8d0a0746bec8eeed3eb172da6bf5 Merge: 5a3072e2f84d7a2f7f0d1fec88af42aa6510ed61 220f4f4cafb2a75fe9d9472cc93825fe986edd97 Author: Patrick Winnertz win...@debian.org Date: Thu Feb 5 10:26:53 2009 +0100 Merge branch 'master' of ssh://midnight-commander.org:/git/mc -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [bbf507b] Merge branch '161_drop_bundled_slang'
The following commit has been merged in the master branch: commit bbf507b237bfbbfb3280bdbff6c10eaf9726e78d Merge: 76da0dd3e59e8d0a0746bec8eeed3eb172da6bf5 4f9185a3eedb0258628970bdaf5e5f88fdde7237 Author: Patrick Winnertz win...@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 win...@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 weig...@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 weig...@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 weig...@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 weig...@metux.de, Patrick Winnertz win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich sly...@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 weig...@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 weig...@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 weig...@metux.de + + * replaced calls to g_free() by mhl_mem_free() 2009-01-29 Mikhail S. Pobolovets styx...@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 weig...@metux.de - * mhl/escape.h, mhl/string.h: fixed comments to use /* ... */ 2009-01-27 Sergei Trofimovich sly...@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 weig...@metux.de +2009-01-25 Enrico Weigelt, metux ITS weig...@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 weig...@metux.de +2009-01-24 Enrico Weigelt, metux ITS weig...@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 win...@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 weig...@metux.de +2009-01-24 Enrico Weigelt, metux IT service weig...@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 win...@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 weig...@metux.de +2009-01-16 Enrico Weigelt, metux ITS weig...@metux.de * src/subshell: setting subshell pty to close-on-exec (taken from mandriva patches
Build failure: cannot fine install-sh
Hey Paul, Sorry for not replying directly to you, but I've subsribed to the list right now ;-) Currently we are unable to reproduce your problem on our systems so that we badly need some more informations. The md5sum of the tarball is okay? If yes: On what system do you try to build? And what was your steps before calling ./configure? Please give some more details how to reproduce the problem and we'll try to help you :) Greetings Winnie ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: trac register error
Am Donnerstag 05 Februar 2009 17:02:58 schrieb Jan Engelhardt: Oops… Trac detected an internal error: OperationalError: database is locked Yepp. this issue will raise from time to time.. this is related to a sqlite database under trac (so this occur if too many instances try to open the sqlite db). As the server is too overloaded with trac currently I'll move the complete stuff (trac + git + database) to another bigger server soon, the server is already setted up (nott.ayous.org and belongs to in some way to the debian project) but currently I've sadly no time to move everything to this server. (But this will happen surely this month). Please stay calm until this has happened :) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: ticket mail delay
Am Donnerstag 05 Februar 2009 20:35:48 schrieb Oswald Buddenhagen: as nobody is picking that up ... On Sat, Jan 31, 2009 at 06:26:46AM +0100, Enrico Weigelt wrote: * Oswald Buddenhagen o...@kde.org schrieb: the typical mail from trac contains: Received: from menubar.gnome.org (localhost.localdomain [127.0.0.1]) by menubar.gnome.org (Postfix) with ESMTP id C3E4175022D; Fri, 30 Jan 2009 15:17:23 + (GMT) Received: from localhost (localhost.localdomain [127.0.0.1]) by menubar.gnome.org (Postfix) with ESMTP id B611B750087 for mc-devel@gnome.org; Mon, 26 Jan 2009 17:00:59 + (GMT) maybe the machine is under too heavy load, so mails lay around that long ;-o i assume you were kidding. otherwise you have quite a lot to learn ... i *think* fixing this is merely a matter of subscribing the tracker address to the mailing list. while this should be done by a list admin, in principle anybody could do it (provided the confirmation mail gets through the moderation queue :D) - only that it would cause some more mail noise. Well.. this will end in a mail loop... *g* as the sender is tick...@midnight- commander.org.. and the same adress is used to create tickets.. so if mails are delivered to this adress trac will automatically create a ticket for this mail and send again a mail to the mailinglist which then hits again on tick...@... and... you know ;-) I'll have a look if I can make two adresses out of this one.. one sender and one reciever address ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Building 4.6.2
Hey, jup. Jupp there will be a 4.6.2.1 release soon. make dist-check avoids such bloopers - for the next time. ;) Thanks for the hint ;) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [41f06e4] Merge branch 'mc-4.6'
The following commit has been merged in the master branch: commit 41f06e42b143cb30256ded26923d8c7cf5d5e312 Merge: 648a377ad87cea89af81773bc2f6ddf53735fcdd c83e1995e49ed7e2d4f49df948cbbcbcf4f893ed Author: Patrick Winnertz win...@debian.org Date: Wed Feb 4 12:43:30 2009 +0100 Merge branch 'mc-4.6' * mc-4.6: Resolve some issues in mhl Rollang Illig pointed us to: Added enhancements from Sergei which he attached to #241. Call va_end after the iteration as we need to free the list again. Fixing a theoretical buffer overflow which was reported by Roland Illig Signed-off-by: Patrick Winnertz win...@debian.org -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [0c7d399] Reverted Enricos backport from master which removes accidentially slang1.x support
The following commit has been merged in the mc-4.6 branch:
commit 0c7d399300204a2f102bcd0bd9812c0e057d05ef
Author: Patrick Winnertz win...@debian.org
Date: Wed Feb 4 20:37:00 2009 +0100
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 win...@debian.org
diff --git a/ChangeLog b/ChangeLog
index b48e121..9bdc617 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,9 +9,6 @@
2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
- * acinclude.m4: removed MC_SLANG_PRIVATE macro
- * src/slint.c: removed HAVE_SLANG_PRIVATE conditional and
- replaced SLang_getkey2(), SLang_input_pending2()
* 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)
diff --git a/acinclude.m4 b/acinclude.m4
index aa2c6fa..f4c0e3b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -299,6 +299,44 @@ AC_DEFUN([MC_USE_TERMCAP], [
dnl
+dnl Check if private functions are available for linking
+dnl
+AC_DEFUN([MC_SLANG_PRIVATE], [
+AC_CACHE_CHECK([if S-Lang exports private functions],
+ [mc_cv_slang_private], [
+ ac_save_LIBS=$LIBS
+ LIBS=$LIBS -lslang
+ AC_TRY_LINK([
+#ifdef HAVE_SLANG_SLANG_H
+#include slang/slang.h
+#else
+#include slang.h
+#endif
+#if SLANG_VERSION = 1
+extern unsigned int SLsys_getkey (void);
+#else
+extern unsigned int _SLsys_getkey (void);
+#endif
+ ], [
+#if SLANG_VERSION = 1
+_SLsys_getkey ();
+#else
+SLsys_getkey ();
+#endif
+ ],
+ [mc_cv_slang_private=yes],
+ [mc_cv_slang_private=no])
+ LIBS=$ac_save_LIBS
+])
+
+if test x$mc_cv_slang_private = xyes; then
+ AC_DEFINE(HAVE_SLANG_PRIVATE, 1,
+ [Define if private S-Lang functions are available])
+fi
+])
+
+
+dnl
dnl Check if the installed S-Lang library uses termcap
dnl
AC_DEFUN([MC_SLANG_TERMCAP], [
@@ -373,6 +411,7 @@ it's not fully supported yet])
if test x$with_screen = xslang; then
AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
[Define to use S-Lang library installed on the system])
+ MC_SLANG_PRIVATE
screen_type=slang
screen_msg=S-Lang library (installed on the system)
else
diff --git a/src/slint.c b/src/slint.c
index cf87322..c30fac1 100644
--- a/src/slint.c
+++ b/src/slint.c
@@ -77,6 +77,66 @@ static int no_slang_delay;
/* Forward declarations */
static void load_terminfo_keys (void);
+#ifndef HAVE_SLANG_PRIVATE
+/* Private interfaces have been stripped, so we cannot use them */
+#define SLang_getkey2() SLang_getkey()
+#define SLang_input_pending2(s) SLang_input_pending(s)
+#else
+/* Copied from ../slang/slgetkey.c, removed the DEC_8Bit_HACK. */
+extern unsigned char SLang_Input_Buffer [];
+#if SLANG_VERSION = 1
+extern unsigned int _SLsys_getkey (void);
+extern int _SLsys_input_pending (int);
+#else
+extern unsigned int SLsys_getkey (void);
+extern int SLsys_input_pending (int);
+#endif
+
+static unsigned int SLang_getkey2 (void)
+{
+ unsigned int imax;
+ unsigned int ch;
+
+ if (SLang_Input_Buffer_Len)
+ {
+ ch = (unsigned int) *SLang_Input_Buffer;
+ SLang_Input_Buffer_Len--;
+ imax = SLang_Input_Buffer_Len;
+
+ memmove ((char *) SLang_Input_Buffer,
+ (char *) (SLang_Input_Buffer + 1), imax);
+ return(ch);
+ }
+#if SLANG_VERSION = 1
+ else return(_SLsys_getkey ());
+#else
+ else return(SLsys_getkey());
+#endif
+}
+
+static int SLang_input_pending2 (int tsecs)
+{
+ int n, i;
+ unsigned char c;
+
+ if (SLang_Input_Buffer_Len) return (int) SLang_Input_Buffer_Len;
+#if SLANG_VERSION = 1
+ n = _SLsys_input_pending (tsecs);
+#else
+ n = SLsys_input_pending (tsecs);
+#endif
+ if (n = 0) return 0;
+
+ i = SLang_getkey2 ();
+ if (i == SLANG_GETKEY_ERROR)
+ return 0; /* don't put crippled error codes into the input buffer */
+ c = (unsigned char)i;
+ SLang_ungetkey_string (c, 1);
+
+ return n;
+}
+#endif /* HAVE_SLANG_PRIVATE */
+
/* Only done the first time */
void
slang_init (void)
@@ -405,10 +465,10 @@ getch (void)
{
int c;
if (no_slang_delay)
- if (SLang_input_pending (0) == 0)
+ if (SLang_input_pending2 (0) == 0)
return -1;
-c = SLang_getkey ();
+c = SLang_getkey2 ();
if (c == SLANG_GETKEY_ERROR) {
fprintf (stderr
Re: Building 4.6.2
Hey I think this is error. Run of ./configure is enougth in release tarball. Correct tarball must provides all required files to be ndependent of autotools installed or not on current host. Jepp. that's true. And I found the error I guess: win...@energy:/tmp/mc-4.6.2$ ls -l ./config/install-sh lrwxrwxrwx 1 winnie winnie 35 4. Feb 07:49 ./config/install-sh - /usr/share/automake-1.10/install-sh win...@energy:/tmp/mc-4.6.2$ It seeems that autogen.sh create links instead of copying the files to the correct place. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [786b1a8] Fix typo in NEWS to prepare for 4.6.2
The following commit has been merged in the mc-4.6 branch: commit 786b1a8ee9989ac036632ab2bb2ebc49e3d51205 Author: Patrick Winnertz win...@debian.org Date: Sun Feb 1 17:05:34 2009 +0100 Fix typo in NEWS to prepare for 4.6.2 Signed-off-by: Patrick Winnertz win...@debian.org diff --git a/NEWS b/NEWS index 5bc98c7..da5fa60 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,7 @@ Version 4.6.2 - Fixed file renames, when copying/moving is performed into deleted directories. (Closes: #181) - Add an option to show executables first in the panels (Closes: #173) - - Fixed concat_dir_and_file if there is a paramter = NULL (Closes: #180) + - Fixed concat_dir_and_file if there is a parameter = NULL (Closes: #180) - Allow out-of-tree builds (Closes: #224, #208) - Editor -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [9fd7988] Merge branch 'mc-4.6'
The following commit has been merged in the master branch: commit 9fd798845ddd37c693a3f20f037711f4a75f24bc Merge: df4129517b53d2851368dc5ed5fbcc2b5eec9ee8 f25ecd8bdfe97c7040da39bbeed9d31db8525527 Author: Patrick Winnertz win...@debian.org Date: Sun Feb 1 13:47:22 2009 +0100 Merge branch 'mc-4.6' -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: [bug #25438] Crash when editing a file with a nonexistent syntax file included by ~/.mc/cedit/Syntax
Am Freitag 30 Januar 2009 10:28:29 schrieb Oswald Buddenhagen: On Fri, Jan 30, 2009 at 09:10:39AM +, Slava Zanko wrote: In the future, please use trac on www.midnight-commander.org such requests are rather pointless. why wasn't the old bug tracker shut down yet, or at least locked for new submissions? why didn't any of the old admins bother to mark the old home page as obsolete and add a link to the new one? I've asked Miguel and Pavel several times to lock the bugtracker and to add a hint on the project page that the development has moved to www.midnight- commander.org but nothing happened. I would be happy if finally the bugtracker on savannah could be closed. Furthermore it would be cool if somone could give me (and maybe someone else from the new team access to the savannah stuff so that we are able to continue to upload the new source tarball to the gnu servers. otoh, the new home page isn't so much of a home page at all - it is a development hub. while user-oriented information is scarce on the old page, it is non-existant on the new one. i mean, even the wikipedia page tells me more about that program ... Yeah.. this is true. If you like I can give you write permissions on the git and you'll can add this informations there? This would be very cool. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [e624bd1] Merge branch 'mc-4.6' of ssh://midnight-commander.org:2222/git/mc into mc-4.6
The following commit has been merged in the mc-4.6 branch: commit e624bd18cb40485325baa497b041bc0f09bbd16d Merge: 360be65d2ba16b4776c1e7521417a0e0f4af9097 1da3919eb1e30a1c364c4be15998e1ab0d5933bc Author: Patrick Winnertz win...@debian.org Date: Thu Jan 29 10:01:36 2009 +0100 Merge branch 'mc-4.6' of ssh://midnight-commander.org:/git/mc into mc-4.6 -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [360be65] po/ru.po: In russian translation, there are some hotkey conficts in menu.
The following commit has been merged in the mc-4.6 branch: commit 360be65d2ba16b4776c1e7521417a0e0f4af9097 Author: Patrick Winnertz win...@debian.org Date: Thu Jan 29 07:34:27 2009 +0100 po/ru.po: In russian translation, there are some hotkey conficts in menu. This is a cherry-pick of 1150007bff08f7f1000eaf0e668cf20d1e343e47 from master. It's unclear for me why Milestone 4.6.2 was set but this change wasn't merged into mc-4.6. Conflicts: po/ChangeLog diff --git a/po/ChangeLog b/po/ChangeLog index dbd8923..4c2adce 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-01-10 Andrew Borodin aboro...@vmail.ru + + * ru.po: Fix conflicting shortcuts in the russian translation. + 2008-06-30 David Martin dmart...@excite.com * es.po: Updated Spanish translation. Converted to UTF-8. diff --git a/po/ru.po b/po/ru.po index 271c6e4..5ee11d0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -423,7 +423,7 @@ msgid Insert file... F15 msgstr ... F15 msgid Copy to file... C-f -msgstr �� � ... C-f +msgstr �� � ... C-f msgid User menu... F11 msgstr ... F11 @@ -513,7 +513,7 @@ msgid Sort... M-t msgstr ��... M-t msgid Paste output of... M-u -msgstr � ���... M-u +msgstr � ���... M-u msgid External Formatter F19 msgstr �� F19 @@ -540,7 +540,7 @@ msgid Syntax Highlighting... msgstr �� ��... msgid Save setup... -msgstr � � +msgstr � � msgid File msgstr @@ -2165,7 +2165,7 @@ msgid View file... msgstr �... msgid Filtered view M-! -msgstr ��� M-! +msgstr ��� M-! msgid Edit F4 msgstr ��F4 @@ -2264,7 +2264,7 @@ msgid Edit editor menu file msgstr �� � msgid Edit syntax file -msgstr �� +msgstr �� msgid Configuration... msgstr ... -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [f664b98] Updated the NEWS file for 4.6.2 and added the bugnumbers behind the items in the list.
The following commit has been merged in the mc-4.6 branch: commit f664b9871453885f321f3664c532bc390fc8d804 Author: Patrick Winnertz win...@debian.org Date: Thu Jan 29 22:49:04 2009 +0100 Updated the NEWS file for 4.6.2 and added the bugnumbers behind the items in the list. If you would like to see the corresponding ticket please have a look on: http://www.midnight-commander.org/ticket/$ticketnumber Signed-off-by: Patrick Winnertz win...@debian.org diff --git a/NEWS b/NEWS index 3a59a70..f63e9ed 100644 --- a/NEWS +++ b/NEWS @@ -2,43 +2,46 @@ Version 4.6.2 - MC Core - Changed HQ url to point to new website - www.midnight-commander.org + www.midnight-commander.org (Closes: #137, #138) - Added a micro helper library in order to go slowly - avay from glib + avay from glib (Closes: #157) - Use static strings as section entries in ~/.mc/history - WARNING!: This will break old files + WARNING!: This will break old files (Closes: #50) - Fixed a repaint issue when clicking on the View Button instead - of using F3 - - Removed obsolete autoconf macros - - Fix escaping for command line completion - - prevent mc from segfaulting when getting invalid timestamps on files - - Fixed a keybord issue when running mc via a putty console - - setted pty fd to closeonexec (on subshell) - - Fixed strange file renames, when copying/moving is performed - into deleted directory. + of using F3 (Closes: #35) + - Removed obsolete autoconf macros (Closes: #133) + - Fix escaping for command line completion (Closes: #147) + - prevent mc from segfaulting when getting invalid timestamps on files (Closes: #96) + - Fixed a keybord issue when running mc via a putty console (Closes: #203) + - setted pty fd to closeonexec (on subshell) (Closes: #174) + - Fixed file renames, when copying/moving is performed + into deleted directories. (Closes: #181) + - Add an option to show executables first in the panels (Closes: #173) - Editor - Syntax highlighting for: - + debian files (debian/changelog, debian/control, debian/copyright, ..) - + updated sh syntax highlighting - + updated pascal syntax highlighting - + differentiate between c and cpp files for highlighting - - Removed some unneeded variables - - Do use a ro test if a file exists - - Fixes some missbehaviour in regex matching + + debian files (debian/changelog, debian/control, debian/copyright, ..) (Closes: #142) + + updated sh syntax highlighting (Closes: #143) + + updated pascal syntax highlighting (Closes: #65) + + differentiate between c and cpp files for highlighting (Closes: #16) + + updated python highlighting to support python 2.6 (Closes: #216) + - Removed some unneeded variables (Closes: #168, #151) + - Do use a ro test if a file exists (Closes: #206) + - Fixes some missbehaviour in regex matching (Closes: #207, #211 ) + start at front of line and not on cursor position + . shouldn't match a newline - VFS - - Fix some bashisms in some extfs scripts + - Fix some bashisms in some extfs scripts (Closes: #146) - Fixed various problems with symlinks and files with chars which needs - escaping over fish - - Added 7zip extfs descriptor + escaping over fish (Closes: #10, #87, #149) + - Added 7zip extfs descriptor (Closes: #92) + - Switched from o3totxt to odf2txt as o3totxt is outdated (Closes: #218) - Locale - - Updated german translation - - New Belarussian translation - - Updated russian translation + - Updated german translation (Closes: #167) + - New Belarussian translation (Closes: #170) + - Updated russian translation (Closes: #159) Version 4.6.2-pre1. -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [66c9fde] Now a trailing slash will only be added in copy move dialogs if the path itselfs
The following commit has been merged in the mc-4.6 branch:
commit 66c9fde141b2e3534d8e52087cc7ca688d388687
Author: Patrick Winnertz win...@debian.org
Date: Wed Jan 28 23:53:10 2009 +0100
Now a trailing slash will only be added in copy move dialogs if the path
itselfs
doesn't already have a trailing slash.
Signed-off-by: Patrick Winnertz win...@debian.org
diff --git a/src/file.c b/src/file.c
index 272f9a7..b8d54e7 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1795,11 +1795,15 @@ panel_operate (void *source_panel, FileOperation
operation,
* dir is deleted)
*/
if (force_single)
- // just copy
+ /* just copy */
dest_dir_ = mhl_str_dup (dest_dir);
else
- // add trailing separator
- dest_dir_ = mhl_str_concat (dest_dir, PATH_SEP_STR);
+ /* add trailing separator */
+ if (*dest_dir strcmp(dest_dir[strlen(dest_dir)-1],
PATH_SEP_STR)) {
+ dest_dir_ = mhl_str_concat (dest_dir, PATH_SEP_STR);
+ } else {
+ dest_dir_ = mhl_str_dup (dest_dir);
+ }
if (!dest_dir_) {
file_op_context_destroy (ctx);
return 0;
--
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [77d2839] Merge branch '203_keypad_putty' into mc-4.6
The following commit has been merged in the mc-4.6 branch: commit 77d2839de595bde13cf61e2102243b4996b5f08f Merge: 3dd87166466dda09ea93ff13a3003e86875e70ff ea5cfade553f113a0b13ccc0146854ec78198eaf Author: Patrick Winnertz win...@debian.org Date: Tue Jan 27 22:55:16 2009 +0100 Merge branch '203_keypad_putty' into mc-4.6 -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [bef7294] Merge branch 'mc-4.6' of ssh://midnight-commander.org:2222/git/mc into mc-4.6
The following commit has been merged in the mc-4.6 branch: commit bef72946fd79f788b2eb693e9f314bbdf449c04e Merge: 77d2839de595bde13cf61e2102243b4996b5f08f 2f6f6af4259f261f58c4e6dfd2c4ebd0a6e1a803 Author: Patrick Winnertz win...@debian.org Date: Tue Jan 27 22:55:40 2009 +0100 Merge branch 'mc-4.6' of ssh://midnight-commander.org:/git/mc into mc-4.6 -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [cad6ffd] Merge branch 'mc-4.6'
The following commit has been merged in the master branch:
commit cad6ffd2bb47beb653e574d69d539fc6b9ffaaf9
Merge: e34e748666c0ad817013a5e8044cd1cba11f8e48
bef72946fd79f788b2eb693e9f314bbdf449c04e
Author: Patrick Winnertz win...@debian.org
Date: Tue Jan 27 23:03:06 2009 +0100
Merge branch 'mc-4.6'
diff --combined src/main.c
index 68c9988,f323905..6ba72e0
--- a/src/main.c
+++ b/src/main.c
@@@ -425,7 -425,7 +425,7 @@@ voi
do_possible_cd (const char *new_dir)
{
if (!do_cd (new_dir, cd_exact))
- message (1, _(Warning),
+ message (D_ERROR, _(Warning),
_( The Commander can't change to the directory that \n
the subshell claims you are in. Perhaps you have \n
deleted your working directory, or given yourself \n
@@@ -471,7 -471,7 +471,7 @@@ quit_cmd_internal (int quiet
} else {
if (query_dialog
(_( The Midnight Commander ),
- _( Do you really want to quit the Midnight Commander? ), 0,
+ _( Do you really want to quit the Midnight Commander? ),
D_NORMAL,
2, _(Yes), _(No)) == 0)
q = 1;
}
@@@ -686,7 -686,7 +686,7 @@@ directory_history_list (WPanel *panel
if (_do_panel_cd (panel, s, cd_exact))
directory_history_add (panel, panel-cwd);
else
- message (1, MSG_ERROR, _(Cannot change directory));
+ message (D_ERROR, MSG_ERROR, _(Cannot change directory));
g_free (s);
}
@@@ -993,7 -993,7 +993,7 @@@ toggle_fast_reload (void
{
fast_reload = !fast_reload;
if (fast_reload_w == 0 fast_reload) {
- message (0, _( Information ),
+ message (D_NORMAL, _( Information ),
_
( Using the fast reload option may not reflect the exact \n
directory contents. In this case you'll need to do a \n
@@@ -1617,6 -1617,8 +1617,8 @@@ update_xterm_title_path (void
if (!is_printable ((unsigned char) *s))
*s = '?';
} while (*++s);
+ if (!alternate_plus_minus)
+ numeric_keypad_mode ();
fprintf (stdout, \33]0;mc - %s\7, p);
fflush (stdout);
g_free (p);
--
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [881ff40] Merge branch 'mc-4.6'
The following commit has been merged in the master branch:
commit 881ff40b3d926d0ecab2f93b7256c1420e7910eb
Merge: 481b0a34ea8a803418cb4bdf505feaad96c7749c
74dadcc25881b1565a375a869e06ee61a5587a05
Author: Patrick Winnertz win...@debian.org
Date: Mon Jan 26 10:30:14 2009 +0100
Merge branch 'mc-4.6'
diff --combined ChangeLog
index 460647f,e0fca55..c27399b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,9 +1,9 @@@
+ 2009-01-25 Ilia Maslakov il.sm...@gmail.com
+
+ * src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
+ * src/main.c, src/panel.h, src/screen.c, src/setup.c:
+ - Add support for showing executables at first in the panel view
+
2009-01-25 Enrico Weigelt weig...@metux.de
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
@@@ -17,19 -23,10 +23,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 weig...@metux.de
+
+ * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules
+for Nemerle source files
+
+2009-01-19 Patrick Winnertz win...@debian.org
+
+ * edit/edit.h: Add two more ints
+ * src/setup.c: Add keybinding to disable tab highlighting
+
2009-01-18 Patrick Winnertz win...@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
@@@ -53,39 -50,10 +59,39 @@@
* AUTHORS: Added Enrico Weigelt, Slava Zanko and
Patrick Winnertz as authors
+2009-01-11 Enrico Weigelt, metux ITS weig...@metux.de
+
+ * FAQ HACKING README man/*: new HQ url
+ * syntax/awk.syntax: added awk syntax file
+ * configure.ac: replaced obsolete autoconf macros AC_GNU_SOURCE
+AC_AIX AC_MINIX by AC_USE_SYSTEM_EXTENSIONS
+
2009-01-11 Patrick Winnertz win...@debian.org
* syntax/pascal.syntax: Added syntax highlighting for
- some delphi keywords
+some delphi keywords
+
+2009-01-10 Enrico Weigelt, metux ITS weig...@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 weig...@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.il...@gmx.de
@@@ -263,7 -231,7 +269,7 @@@
* doc/mc.1.in: Document `fish_directory_timeout'.
-2006-02-18 David Martin dmart...@excite.com
+2006-02-18 David Martin dmart...@excite.com
* doc/es/mc.1.in: Cleanup. Fix key naming.
diff --combined src/boxes.c
index e672df9,b7652d8..5c66f3d
--- a/src/boxes.c
+++ b/src/boxes.c
@@@ -266,22 -266,23 +266,23 @@@ display_box (WPanel *panel, char **user
return result;
}
- static int SORT_X = 40, SORT_Y = 14;
+ static int SORT_X = 60, SORT_Y = 14;
static const char *sort_orders_names [SORT_TYPES];
sortfn *
- sort_box (sortfn *sort_fn, int *reverse, int *case_sensitive)
+ sort_box (sortfn *sort_fn, int *reverse, int *case_sensitive, int *exec_first)
{
int i, r, l;
sortfn *result;
- WCheck *c, *case_sense;
+ WCheck *c, *case_sense, *exec_ff;
const char *ok_button = _(OK);
const char *cancel_button = _(Cancel);
const char *reverse_label = _(Reverse);
const char *case_label = _(case sensitive);
const char *sort_title = _(Sort order);
+ const char *exec_label = _(Executable first);
static int i18n_sort_flag = 0, check_pos = 0, button_pos = 0;
@@@ -339,6 -340,8 +340,8 @@@
button_new (9, button_pos, B_ENTER, DEFPUSH_BUTTON,
ok_button, 0));
+ exec_ff = check_new (5, check_pos, *exec_first, exec_label);
+ add_widget (dd, exec_ff);
case_sense = check_new (4, check_pos, *case_sensitive, case_label);
add_widget (dd, case_sense);
c = check_new (3, check_pos, *reverse, reverse_label);
@@@ -355,6 -358,7 +358,7
updated: [7abcb66] Merge branch 'mc-4.6'
The following commit has been merged in the master branch:
commit 7abcb66aba13fd520fb0f031fee8949ee1e7da25
Merge: e3a82ba1d8585c458f030688c6364e4102c2cc13
1fd3aa61d62456698dd82ef764615c7f069ce99b
Author: Patrick Winnertz win...@debian.org
Date: Mon Jan 26 16:56:24 2009 +0100
Merge branch 'mc-4.6'
diff --combined ChangeLog
index c27399b,35e47b4..99fbd9b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -4,6 -4,11 +4,11 @@@
* src/main.c, src/panel.h, src/screen.c, src/setup.c:
- Add support for showing executables at first in the panel view
+ 2009-01-25 Patrick Winnertz win...@debian.org Sergei Trofimovich
sly...@inbox.ru
+
+ * 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 Enrico Weigelt weig...@metux.de
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
@@@ -23,19 -28,10 +28,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 weig...@metux.de
+
+ * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules
+for Nemerle source files
+
+2009-01-19 Patrick Winnertz win...@debian.org
+
+ * edit/edit.h: Add two more ints
+ * src/setup.c: Add keybinding to disable tab highlighting
+
2009-01-18 Patrick Winnertz win...@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
@@@ -59,39 -55,10 +64,39 @@@
* AUTHORS: Added Enrico Weigelt, Slava Zanko and
Patrick Winnertz as authors
+2009-01-11 Enrico Weigelt, metux ITS weig...@metux.de
+
+ * FAQ HACKING README man/*: new HQ url
+ * syntax/awk.syntax: added awk syntax file
+ * configure.ac: replaced obsolete autoconf macros AC_GNU_SOURCE
+AC_AIX AC_MINIX by AC_USE_SYSTEM_EXTENSIONS
+
2009-01-11 Patrick Winnertz win...@debian.org
* syntax/pascal.syntax: Added syntax highlighting for
- some delphi keywords
+some delphi keywords
+
+2009-01-10 Enrico Weigelt, metux ITS weig...@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 weig...@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.il...@gmx.de
@@@ -269,7 -236,7 +274,7 @@@
* doc/mc.1.in: Document `fish_directory_timeout'.
-2006-02-18 David Martin dmart...@excite.com
+2006-02-18 David Martin dmart...@excite.com
* doc/es/mc.1.in: Cleanup. Fix key naming.
diff --combined vfs/fish.c
index 63e4d60,545aa25..29b5f67
--- a/vfs/fish.c
+++ b/vfs/fish.c
@@@ -50,6 -50,9 +50,9 @@@
#include tcputil.h
#include ../src/unixcompat.h
#include fish.h
+ #include ../mhl/memory.h
+ #include ../mhl/string.h
+ #include ../mhl/escape.h
int fish_directory_timeout = 900;
@@@ -239,7 -242,7 +242,7 @@@ fish_open_archive_int (struct vfs_clas
/* Currently, this does not work. ssh reads passwords from
/dev/tty, not from stdin :-(. */
- message (1, MSG_ERROR,
+ message (D_ERROR, MSG_ERROR,
_
(Sorry, we cannot do password authenticated connections
for now.));
ERRNOR (EPERM, -1);
@@@ -358,33 -361,100 +361,100 @@@ fish_dir_load(struct vfs_class *me, str
char *quoted_path;
int reply_code;
+ #if 0
+ /*
+ * Simple FISH debug interface :]
+ */
+ if (!(MEDATA-logfile))
+ {
+ MEDATA-logfile = fopen(/tmp/mc-FISH.sh, w);
+ }
+ #endif // 0
+
logfile = MEDATA-logfile;
print_vfs_message(_(fish: Reading directory %s...), remote_path);
gettimeofday(dir-timestamp, NULL);
dir-timestamp.tv_sec += fish_directory_timeout;
- quoted_path
updated: [bcc78ef] Merge branch '167_locale_german'
The following commit has been merged in the master branch: commit bcc78efe1712c7135f32526adcf3428c1018df2e Merge: 7abcb66aba13fd520fb0f031fee8949ee1e7da25 17c0e75e62184faab2eae5250dff777d472d6acb Author: Patrick Winnertz win...@debian.org Date: Mon Jan 26 17:55:41 2009 +0100 Merge branch '167_locale_german' diff --combined ChangeLog index 99fbd9b,016036d..b0f5e26 --- a/ChangeLog +++ b/ChangeLog @@@ -28,19 -28,10 +28,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 weig...@metux.de + + * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules +for Nemerle source files + +2009-01-19 Patrick Winnertz win...@debian.org + + * edit/edit.h: Add two more ints + * src/setup.c: Add keybinding to disable tab highlighting + 2009-01-18 Patrick Winnertz win...@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 @@@ -64,39 -55,21 +64,50 @@@ * AUTHORS: Added Enrico Weigelt, Slava Zanko and Patrick Winnertz as authors +2009-01-11 Enrico Weigelt, metux ITS weig...@metux.de + + * FAQ HACKING README man/*: new HQ url + * syntax/awk.syntax: added awk syntax file + * configure.ac: replaced obsolete autoconf macros AC_GNU_SOURCE +AC_AIX AC_MINIX by AC_USE_SYSTEM_EXTENSIONS ++ + 2009-01-11 Patrick Winnertz win...@debian.org + + * po/de.po: Fix some spelling errors + + 2009-01-11 Enrico Weigelt, metux ITS weig...@metux.de + + * FAQ HACKING README man/*: new HQ url + * syntax/awk.syntax: added awk syntax file + * configure.ac: replaced obsolete autoconf macros AC_GNU_SOURCE + AC_AIX AC_MINIX by AC_USE_SYSTEM_EXTENSIONS 2009-01-11 Patrick Winnertz win...@debian.org * syntax/pascal.syntax: Added syntax highlighting for - some delphi keywords +some delphi keywords + +2009-01-10 Enrico Weigelt, metux ITS weig...@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 weig...@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.il...@gmx.de @@@ -274,7 -247,7 +285,7 @@@ * doc/mc.1.in: Document `fish_directory_timeout'. -2006-02-18 David Martin dmart...@excite.com +2006-02-18 David Martin dmart...@excite.com * doc/es/mc.1.in: Cleanup. Fix key naming. -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [d79dfa1] Some minor fixes to the german locale
The following commit has been merged in the mc-4.6 branch: commit d79dfa13243996bdd46823996972b54754629409 Author: Patrick Winnertz win...@debian.org Date: Mon Jan 26 19:11:29 2009 +0100 Some minor fixes to the german locale diff --git a/po/de.po b/po/de.po index 07f6140..1374eef 100644 --- a/po/de.po +++ b/po/de.po @@ -16,6 +16,7 @@ msgstr PO-Revision-Date: 2009-01-25 17:50-\n Last-Translator: Patrick Winnertz win...@der-winnie.de\n Language-Team: German gnome...@gnome.org\n +Plural-Forms: nplurals=2; plural=(n != 1);\n MIME-Version: 1.0\n Content-Type: text/plain; charset=ISO-8859-1\n Content-Transfer-Encoding: 8bit\n @@ -1873,7 +1874,9 @@ msgstr L msgid \n Are you sure you want to remove this entry? -msgstr Diesen Eintrag wirklich l�schen? +msgstr +\n + Diesen Eintrag wirklich l�schen? msgid \n -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [2a6edc2] Merge branch 'mc-4.6'
The following commit has been merged in the master branch: commit 2a6edc23c52fa069fe6735178104ac137f49201b Merge: c63d25931411b1aa29409d35883103ed84bfed1c d79dfa13243996bdd46823996972b54754629409 Author: Patrick Winnertz win...@debian.org Date: Mon Jan 26 19:12:18 2009 +0100 Merge branch 'mc-4.6' -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [89d3cbd] Removed unneeded var to make build process a bit cleaner
The following commit has been merged in the mc-4.6 branch:
commit 89d3cbddd279659f60b788c17081779964b420d6
Author: Patrick Winnertz win...@debian.org
Date: Mon Jan 26 21:29:25 2009 +0100
Removed unneeded var to make build process a bit cleaner
diff --git a/mhl/string.h b/mhl/string.h
index 28f6198..9bb48b7 100644
--- a/mhl/string.h
+++ b/mhl/string.h
@@ -3,7 +3,7 @@
#include ctype.h
#include stdarg.h
-#include mhl/memory.h
+#include ../mhl/memory.h
#definemhl_str_dup(str)((str ? strdup(str) : strdup()))
#define mhl_str_ndup(str,len) ((str ? strndup(str,len) : strdup()))
@@ -61,7 +61,7 @@ static inline char* __mhl_str_concat_hlp(const char* base,
...)
size_t totalsize = 0;
// first pass: scan through the params and count string sizes
-va_list par;
+//va_list par;
if (base)
{
--
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [753a663] Merge branch 'mc-4.6'
The following commit has been merged in the master branch: commit 753a663d2ddd3b91d7f7c235513dabe8016445bd Merge: 2a6edc23c52fa069fe6735178104ac137f49201b 89d3cbddd279659f60b788c17081779964b420d6 Author: Patrick Winnertz win...@debian.org Date: Mon Jan 26 21:44:42 2009 +0100 Merge branch 'mc-4.6' -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [3dd8716] Not only comment it out but removing it
The following commit has been merged in the mc-4.6 branch:
commit 3dd87166466dda09ea93ff13a3003e86875e70ff
Author: Patrick Winnertz win...@debian.org
Date: Mon Jan 26 21:51:40 2009 +0100
Not only comment it out but removing it
diff --git a/mhl/string.h b/mhl/string.h
index 9bb48b7..e3c7d2f 100644
--- a/mhl/string.h
+++ b/mhl/string.h
@@ -3,7 +3,7 @@
#include ctype.h
#include stdarg.h
-#include ../mhl/memory.h
+#include mhl/memory.h
#definemhl_str_dup(str)((str ? strdup(str) : strdup()))
#define mhl_str_ndup(str,len) ((str ? strndup(str,len) : strdup()))
@@ -60,9 +60,6 @@ static inline char* __mhl_str_concat_hlp(const char* base,
...)
int count = 0;
size_t totalsize = 0;
-// first pass: scan through the params and count string sizes
-//va_list par;
-
if (base)
{
arg_ptr[0] = base;
--
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
Re: updated: [89d3cbd] Removed unneeded var to make build process a bit cleaner
Am Dienstag 27 Januar 2009 01:53:28 schrieb Roland Illig: Patrick Winnertz schrieb: @@ -61,7 +61,7 @@ static inline char* __mhl_str_concat_hlp(const char* base, ...) size_t totalsize = 0; // first pass: scan through the params and count string sizes -va_list par; +//va_list par; These comments are not valid in C90. And please don't use identifiers that start with a double underscore. They are reserved for the compiler. As you see in latest checkouts I've removed this comments completly. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
[bug #23849] Tabs are replaced with dashes, making edit difficult to use
Follow-up Comment #2, bug #23849 (project mc): Hey Henrik. Thanks for addition to this report. However in the meantime the development of Midnight Commander has moved from here to it's own domain (mainly because there was many spam here). Please have a look here: http://www.midnight-commander.org/ticket/148 .. this is the ticket about adding a shortcut do switch this feature off. ___ Reply to this item at: http://savannah.gnu.org/bugs/?23849 ___ Nachricht geschickt von/durch Savannah http://savannah.gnu.org/ ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Commit mails from git
Hey, I've requested a mc-comm...@gnome.org maillinglist some time ago for us.. but the postmasters currently doesn't want to give us one.. (@Miguel: maybe you could request a list for us?) However: As I think that we badly need a commits mailinglist for us I would like to ask if someone has something against mailing the changes to this list until we have a commits-list. If noone stands up until tomorrow evening I'll create such a forwarding ;-) Greetings Winnie -- . '' `. Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'`http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Glib or no glib - we need a decision
Hey, As there are some guys here which want to stick with glib and some who doesn't want this. As each sites have some good arguments pro or contra glib I'll write some thoughs here down and would like to ask you to add your arguments here and discuss then these arguments on the list. Please note that we really need a decision :) pro: - glib has many preformed functions and we don't have to think about many issues as they are solved inside glib. - ... contra: - glib is huge and we only use a very small amount of functions. Rewriting this functions would make mc smaller and faster. This is important at least for embedded devices. - ... Please discuss on this as I would like to have this solved/out-of-the-world for 4.7 Greetings Winnie -- .''`. Patrick Winnertz patrick.winne...@skolelinux.org : :' : GNU/Linux Debian-Edu Developer `. `'` http://www.der-winnie.de http://d.skolelinux.org/~winnie `- Debian - when you have better things to do than fixing systems ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: problems with http://www.midnight-commander.org
Am Mittwoch 07 Januar 2009 15:16:16 schrieb Sergei Trofimovich: Any URL on site gives following error: Trac detected an internal error: OSError: [Errno 24] Zu viele offene Dateien ^^ (Too many open files?) Is that OK? Nope.. this is yet again a bug in trac.. There are several 0.11.1 instances in the net which shows this error. For the moment I increased the filehandles for the www-data user to 4096.. If this doesn't fix it the issue I'll report a bug on edgewall.org. (There is a bug already about this issue but this issue has solved somehow for the reporter after some time.) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
[MPORTANT]: Created new default query for tickets
Hey, I've created one new default queriy for tickets: If someone has found a patch for a issue reported in a ticket and add this patch to this specific ticket, he can add a review keyword to the keywords list. If this keyword exists there this ticket will show up under this url: http://www.midnight-commander.org/report/9 This should make it easier to track patches which needs a review and make the time in between several reviews a bit shorter. But please do also not forget if you got a patch reviewed by someone and there are errors/difficulties to remove the keyword until the patch is fixed. So that this list is always as short as possible. Greetings Winnie ps: There are some smaller patches which currently need a review by someone ;-) -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: [MPORTANT]: Created new default query for tickets
Hey * add votes via keywords (eg. vote-username) * if there are enough votes (currently: 2 devs), add the keyword approved. * patches that need rework get the rework keyword instead of review Could you please set up some more quries for this ? Done.. also added a cleanup keyword. Valid keywords are now: * vote-your_username (You've voted positiv for the patch attached) * approved (Two or more dev's have voted) * rework (Patch is not okay and need a rework) * cleanup (Patch is basically okay but need some cleanup) * review (reviews are needed) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: RFC: updated workflow [WAS: Re: git+patch workflow]
Am Montag 05 Januar 2009 15:13:48 schrieb Enrico Weigelt: * Oswald Buddenhagen o...@kde.org schrieb: Hi, delete *the* stable branch, but not the concept of stable branches per se. doing so would mean that once you merged a feature patch to master, you cannot do a bugfix release any more until you make a feature release (*). to keep the option of bugfix releases open Actually, I dislike that idea. Instead we should declare, that 'master' branch is *always* what becomes the next release. We just have to take care that it's always in a state that it could be released ASAP - so: *no* development there. New features only get committed if they're really ready to get into next release (which in theory could come any second). Well.. I like the idea of mc-4.6 stable branch quite much as we can then do point releases there which is only bugfixing and do active development in master on e.g. utf8 support or.. or or... This has this advantage: - we release mc-4.6.2 from mc-4.6 branch Tested utf8 very much and include it in master - there is now a smaller issue but we doesn't want to release e.g .4.7 (with utf8) yet -- make a pointrelease with that fix applied and work further on master With your scenario we have troubles here, because we can't make a smaller point release fixing only some bugs without introducing new big features which should be reserved for a new bigger release. Fixes done in mc-4.6 branches can then be merged back into master so that master contains always every patch. I hope that this sound logically for you and I we can work this way :) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: git+patch workflow [WAS: bundled intl stuff necessary]
Am Samstag 03 Januar 2009 21:53:20 schrieb Enrico Weigelt: * Slava Zanko slavaza...@gmail.com wrote: (bouncing back to the list ;-p) Hi, I not fully understand... How automate process of patch submission, in your mind? Okay, let's take an example: I'm currently working on some sub-project. Now I've did my work, everything seems okay for me and I'd like to publish it. All I now (ideally) would have to do is enter some quick command line (eg. including some description) and the rest goes automatic: my work is published, ticket opened, etc. Okay I work so: (on master branch): git checkout -b foobar [do some work] git add new files/changed files git diff master /tmp/$new-patch-to-publish.patch git reset --hard $sumoflastcommit (e.g. atm: 4c58d938cbe836c48c105eeb525a2ffc8dd519e5) git show # now everything should be clean and no changes should be there. git checkout master git branch -d foobar (or -D foobar if there are changes which are not merged into master) publish now the patch on trac via email or webinterface. Coming from the other side, it would be cool to have some command get me the changes from ticket xyz, so we don't have to download and apply the patches manually. Well... :) such a tool would be nice but doesn't exist atm. The best solution - use git branches for tracking patches, IMHO. hmm, heard of that, but never used it. How does it work ? hmm, do my changes then go to the current branch (assuming I've cloned from there) ? Yes, your changes will applyed to the main branch (named 'master'). You may create any count of commits (via git-commit), but this commits placed only in your local copy of repro. You may delete some of this commits, verge, revert commits... Okay, that's just normal working in the local repo ... but if you will run command 'git-push', all of your commits will frozen for changes. Because this commits transferred in parent repro and will see by any developer (via git-pull). git-pull will get latest changes from parent repro (like svn up, or full command: svn update). But this commits directly to our master repo, thus breaking our workflow, right ? Yes of course... Only commit the patch after it is acked... :) If you want to have own 'sandbox' with some patches (not included in 'master'), you may create new local branch: Can I freely create branches within the master repo ? And more important: *should* I do this ? Yes why not.. they are local as long as you don't push them to the server via git push $localbranch origin and this is something which should be done _very_ rare. As I think that there are several people not very familiar with git I'll write a small Howto use the git repro together with our workflow. After I'm finished I'll publish the url here. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Trac - remove crap tickets
Am Sonntag 04 Januar 2009 09:44:43 schrieb Enrico Weigelt: Hi folks, is it possible to remove certain crap tickets (I mean those which are *really* crap, like testings, accidential double-posts, etc) ? Yes.. deleting via shell should be possible for me :) Which ticket should be removed? Greetings Winnie ps: There is also a plugin for that.. I'll consider to add it to trac. -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: git+patch workflow [WAS: bundled intl stuff necessary]
Am Sonntag 04 Januar 2009 17:48:56 schrieb Oswald Buddenhagen: On Sun, Jan 04, 2009 at 05:21:29PM +0100, Patrick Winnertz wrote: git diff master /tmp/$new-patch-to-publish.patch git reset --hard $sumoflastcommit (e.g. atm: 4c58d938cbe836c48c105eeb525a2ffc8dd519e5) git show # now everything should be clean and no changes should be there. git checkout master git branch -d foobar (or -D foobar if there are changes which are not merged into master) publish now the patch on trac via email or webinterface. you want to play with git rebase -i git format-patch more? Yes.. this tools are cooler than this way I described above, that's true. I picked the above because it's using only rudimental functions of git which should already be known from other vcs systems. fwiw, the suggested backporting workflow is quite a nightmare with git, as all the merging goodies work only with forwardporting. I know but having many many branches with patches inside is also a nightmare.. in order to have a overview. instead, you need to develop on master (the conventional name for the trunk), branch for stabilization of each release, do *all* bugfixing in the current stable branch and merge it back into master each time fixes have been applied. A improvement of the situation atm would be to make master the stable branch and creating one testing branch which is based on master, wouldn't it? This would be the easiest change in oder to do not completly rework everything. major new features have to be developed on branches of master, so they can be merged back into master. everything else results in use of cherry-pick, cherry-pick was the tool I wanted to use. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Reporting Bugs via mail works now (with drawbacks)
Hey, Yes, 'database is locking'... :( ACK. Got the same error all the time. Any idea what's up w/ the server ? Yes.. according to the ticket system for trac itself this is an error of trac 0.11 ... some issue with the sql backend. I'm searching atm for a fix (patch for trac). The issues with the load of the server should be fixed...I hope that I'll get this issue also fixed. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
RFC: updated workflow [WAS: Re: git+patch workflow]
Hey because of Oswald Buddenhagen's post I rethinked the workflow and discussed a better workflow with slavaz. Please comment: - every patch has to be acked twice -- if patch is broken a rev2 has to be created and be discussed - a acked patch has to be applied in a branch of master and needs to be tested there by different people. (Everybody who has tested it should report to the ticket) - after some testing in the branch we merge into the master branch (and the ticket is closed) This is pretty much the old stuff above (now we create a branch for every ticket (proposed branchname 1234_something_describing). When we want to do a release: Simply do a tag on mc-4.6.2~rc1 -- Test it and if it is okay tag also mc-4.6.2 -- Otherwise mc-4.6.2~rc2 -- Test it and if it is okay tag here mc-4.6.2 -- ... In the meantime new patches can be discussed and tested as written above.. After the release we rebase the branches and merge them into master. Please comment. Greetings Winnie ps: If this is okay I'll delete the stable branch and update/write a bit about this workflow to our wiki) -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Reporting Bugs via mail works now (with drawbacks)
Am Sonntag 04 Januar 2009 22:26:18 schrieb Enrico Weigelt: * Patrick Winnertz win...@debian.org schrieb: Yes.. according to the ticket system for trac itself this is an error of trac 0.11 ... some issue with the sql backend. Just a guess: sqlite locking issue ? Jepp exactly. As trac is based on sqlite (with the optional backend of postgres) and the a bit more experimental mysql backend) I've set it up with a sqlite database... obviously this was not the best choice ;-) (I'll have a look how good the mysql backend is, as I've already a mysql server running). I hope this will fix this issue in the long term.. in the short term simply do a refresh of the site ;-) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: RFC: updated workflow [WAS: Re: git+patch workflow]
Hey, - after some testing the branch with patch will deleted (and the ticket is closed) - if testing fail, create new branch with patch... hm, need to discuss this situation. See below my suggestion. This is pretty much the old stuff above (now we create a branch for every ticket (proposed branchname 1234_something_describing). BTW, may be a situation in which no one askes for the patch (no time or busy, lazy, don't want to take responsibility for the consequences of a patch, etc). What do in this case? Well.. if this will be the case in the future we have to rethink the idea.. but until at least 3 people are more or less active this shouldn't happen. And what do if no testing reports? Is ticket leave in 'always testing' stage? Okay to fasten the process a bit up: - if a ticket contains a patch the acceptor of this ticket create a branch with this patch applied - people can test it there and comment in this ticket - if they have an enhancment they can fix it in git (and push it to the server of course ;-)) and add a updated patch (for tracking the issue) to the bugreport. If the patch in it's latest version is acked the branch get merged back into the master branch. Then we have only one ack step and not two anymore. Now, how to handle the ticket states with this workflow: After a ticket is created it is new.. When someone accepts it it is set to accepted. When someone has a patch which is worth to be added to a git branch, this should be done. Then the ticket can be set to testing as this is currently the case (We test if the patch is okay). If two people acked the patch (they really should test it and not only look on the sourcecode), the branch with the fix inside will be merged by the acceptor of the ticket this branch belongs too, into master. Then the ticket will be set to closed. The same if we develop after 4.6.2 own new stuff: A ticket is opened with the idea inside... Someone develops a new feature based on master in a branch. After he thinks that this task is done he adds a patch to the report and set the report to testing. Then someone can look at his work and comment in the ticket. After the patch is fine this branch get merged into master (and the ticket is closed). Hope this helps to make it someone easier. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: RFC: updated workflow [WAS: Re: git+patch workflow]
delete *the* stable branch, but not the concept of stable branches per se. doing so would mean that once you merged a feature patch to master, you cannot do a bugfix release any more until you make a feature release (*). to keep the option of bugfix releases open (and distributors really want that), one should always make a release branch from master (say, 4.6) and branch for bugfix patches from that branch. then one can make a bugfix release (say, 4.6.3) from the 4.6 branch at any time. the release branch is merged into master (but not the other way round) after each fix. of course that requires upfront planning whether a particular patch needs to go into a possible bugfix release, but given the patch branch process, you have a good start for that (the proposal in your next mail seems reasonable). This was the way I planned it actually before writting my email. After rethinking the stuff I thought it would also be possible to only work with master without having stable branches. The disadvantage is that a pure bugfix release won't be possible (since master is also used for development.) Okay as I think think this makes sense: [copy paste from a older mail]: - if a ticket contains a patch the acceptor of this ticket create a branch (*) with this patch applied - people can test it there and comment in this ticket - if they have an enhancment they can fix it in git (and push it to the server of course ;-)) and add a updated patch (for tracking the issue) to the bugreport. If the patch in it's latest version is acked the branch get merged back into the parent branch. Then we have only one ack step and not two anymore. (*): based on, wether it should be a bugfix for a stable tree, mc-4.6 or if it should be a new feature, on master. If created on a stable release branch this fix is also merged back after it is applied on the release branch into the master branch. Now, how to handle the ticket states with this workflow: After a ticket is created it is new.. When someone accepts it it is set to accepted. When someone has a patch which is worth to be added to a git branch, this should be done. Then the ticket can be set to testing as this is currently the case (We test if the patch is okay). If two people acked the patch (they really should test it and not only look on the sourcecode), the branch with the fix inside will be merged by the acceptor of the ticket this branch belongs too, into the appropiate branch (e.g. mc-4.6 or master). Then the ticket will be set to closed. The same if we develop after 4.6.2 own new stuff: A ticket is opened with the idea inside... Someone develops a new feature based on master in a branch. After he thinks that this task is done he adds a patch to the report and set the report to testing. Then someone can look at his work and comment in the ticket. After the patch is fine this branch get merged into master (and the ticket is closed). (*) actually, one can retroactively create a release branch from a past master revision on demand. anyway, that results in a mess, as the need for cherry picking is practically guaranteed in that case. on top of that, the release process as such becomes a mess (if a release branch exists, tag there, otherwise tag on master. think of this, don't forget that, and, oh, if you are religious: pray). This is a mess and was never intended :) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Reporting Bugs via mail works now (with drawbacks)
Hey Both bugs seems to be located in the email2trac scripts (the first one seems to be a incompatibility with trac version 0.11) and the second one seems to be a general programming bug .. :S I've filled bugreports there but as long as there is no fix, we'll get no notification if a bug is filled via email.. notifications via webfronted of course works -- This is fixed now.. The issue was that the scripts needs a writeable egg- cache (as user www-data). It's possible to add tickets, add comments to existing tickets and the emails will get carbon-copied back to the mc-devel list. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: RFC: Suggestion for workflow on patches
Hey - Every patch which should be applied to the git should be attached to a bugreport in our ticketsystem. There should be for each patch a own ticket so that we have a good overview. hmm, has the drawback, that it's bit unconvenient (as long as we don't have an automatic cmdline tool for that ;-P) moves the talks away from the list. No not really.. You only post indrect to the list via the ticket system... all things will hit then the mailinglist and can be discussed there if the need is there :) Of course, an ideal situation would be an gateway between maillist and trac, so new tickets are sent to the list and replies are automatically bounced to the ticket's comments. There will be such a gateway. All things which are added to tickets in trac get already bounced to the list. Vice versa is not working atm, I work on this currently. Afterwards you only needs to cc tic...@midnight-commander.org (or something else) and the answer will show up in the corresponding ticket. - Every patch that is in the ticket system must be approved by two devs in order to get applied again the working branch (master). Ok, seems reasonable. BTW: does trac have some voting mechanism ? No, sadly not.. at least I found nothing up to now. Bug I'll search further. :) Until there is a solution for this we need to do this by writing something into the ticket ( a defined text for ACK /NACK). Maybe something like this: - XYZ-asdf.patch revision 2 : ACK or: - ABC-fdsa.patch revision 1 : NACK There exists a VotePlugin but as I understand it you can only vote for tickets and not for patches with different revisions... and this doesn't help us in my eyes :S Great ! Maybe you could also install the xmlrpc plugin, so I can code my own upload tool. I'll have a look on the plugin.. but there seems to be some issues with newest trac (0.11) which is running on www.m-c.org. What do you think? Is this workflow for patches okay? If yes I would write this down somewhere in the wiki in order to make it official. ACK. BTW: may I request write access to the wiki ? Should be there now (together with your ssh access). Do you want to write this down in the wiki and link it on the first page? :) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Further Midnight Commander development
Am Montag 29 Dezember 2008 18:33:44 schrieb Miguel de Icaza: Hellom IMHO we should start with the latest stable release (4.6.1 ?) and apply all the vendor/distro patches floating around step by step (*1). Once that's done, we should make a new official release very soon. I agree with this approach, we should start by reviewing those patches as well, as not every distro patch in packages is suitable for upstream inclusion. I suggest that the patches are posted to the list, in a way similar to other projects so the patches can be peer-reviewed and discussed before they go into the tree. Miguel +1 ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
RFC: Suggestion for workflow on patches
Hey, As there is currently no real written down workflow for patches I would like to suggest the following: - Every patch which should be applied to the git should be attached to a bugreport in our ticketsystem. There should be for each patch a own ticket so that we have a good overview. - Every patch that is in the ticket system must be approved by two devs in order to get applied again the working branch (master). - If someone dislikes a patch he should either contact the author of the patch in order to get a updated version (which should again be added to the same bugreport) or fix it himself. In both cases again two developers should give their okay to this patch. This system makes it possible that everytime a patch should be applied to mc at least three people had a look on it (the submitter and two other developers). As every comment in the ticketsystem from trac is send to the mailinglist it should be possible to track things while reading the mailinglist. A feature I will add in some time is that you can answer to the ticketmails and the automatically get added to the ticketsystem of trac, but this doesn't work right now. What do you think? Is this workflow for patches okay? If yes I would write this down somewhere in the wiki in order to make it official. -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Tree-Maintenance: current/devel
Hey folks, As I thought that this is a great idea I set it up in the git. the master branch is the branch where development should go into and there is a stable branch which shouldn't be touched while working on patches/new features. After a patch is tested well enough this patch can be cherry-picked from the mater branch into the stable branch in order to make a release from this branch. There should be only some people who moves patches out from master into stable, but this should be also discussed in the ticketsystem (e.g. the ticket will only be closed when the patch is finally in the stable branch). As I'm intrested in this part and Enrico is also I would suggest that we two works on this. Is this okay for everybody? Greetings Winniie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Website trouble
Am Samstag 27 Dezember 2008 22:25:58 schrieb Enrico Weigelt: Hi, the server for http://www.midnight-commander.org/ seems to be running out of memory. Well.. there is more than 500MB of Ram available, but I'll have a eye on this. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
commit mailinglist for midnight commander.
Hey! As one of the last developers stepped back last week from mc a new development team was formed around mc[1]. In order to organise the development we would like to have a second mailinglist for the midnight commander where we can send commit mails to (e.g. mc-comm...@gnome.org). As all other mc related mailinglists are also hosted on gnome.org it would be cool to host this mailinglist also there. Is this possible? Greetings Winnie [1]: This team contains some people who formerly forked mc, and some guys who maintains mc in distributions (e.g. I'm the maintainer of mc in Debian (and in Ubuntu)). -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Further Midnight Commander development
Am Monday 22 December 2008 21:02:21 schrieben Sie: Patrick Winnertz wrote: If yes I'll set up a trac on my private server until I find a better solution. If this repro is ready I'll ping you and we can start to migrate you patches into the git repro. Is this okay for you (and the rest of the team?) Team vote 100% yes We are ready to work with you. Cool. So please: All people who wants to have write access to the repro should send mail (preffered signed) to me (win...@debian.org) and I'll create a new ssh account for committing into the git repro. Furthermore I would need the usernames for trac.. I'll create random passwords and send them then to you indiviually so that you can change them after that. After this I'll/We'll could start to migrate the stuff from the mc.redhat- club.org team into this repro. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Further Midnight Commander development
Hey, [removed some private stuff] 1) why not asking for git on savannah? As trac needs a local git. 2) is it mc on savannah doomed? Well.. the bugtracker there is ugly.. there is too much spam, cvs is very ancient, git is so much better. 3) Why not officially close it? My intention is to set up a new place to officially develop mc and then ask the people who are responsible for the webpage and the savannah stuff to forward visitors to the trac. And add a big fat note into the cvs that the development has moved into git. Is there something else which have to be done in order to move the development officially into a new place? It would be cool if someone would help me with speaking with savannah and ibiblio.org in order to place there informations that the official site is located now elsewhere. (I'm currently set up the trac, after I'm ready i'll point you to the link) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Further Midnight Commander development
Am Friday 19 December 2008 05:28:56 schrieben Sie: Hello, Miguel! Quoting Miguel de Icaza mig...@ximian.com: I would personally like to see mc move to git, there are nice hosting services like github, it is easy to fork and it is easy to review patches from third parties. I'm maintaining a git mirror of the mc repository: http://repo.or.cz/w/mc.git It's updated automatically. It can be just cloned for further development. I took care to provide full names of all committers ever committing anything to the mc repository. Yes.. this would be great. Would it be possible to migrate your patches against mc into a new build up git repro which is cloned from this mirror? If yes: Is your host also captable of hosting git repros? If not I would setup a trac with git backend on my private server until we find a better solution where to host the repro. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Further Midnight Commander development
Many patches(Fedora, debian) applied in one revision at start of project, sorry. Many own patches is relative to previous patches. Is it possible to migrate? Gm... Nothing is impossible :) But this will require much effort and time. Well,, this should be quite easy. Have a look on the git-svn tool. You should be able to create a git checkout from your svn stuff.. After this it's very easy to pick each commit and apply it on the new git repro. This is maybe a effort of ~2-3 hours. BTW, Many people do not know English, but use mc. I would like to consider a system that allows such people to participate in the improvement project. Well.. as long as the development is in english and in one repository (with maybe several branches to test things). This is a good idea. If this means to also have several repros this is in my eyes a very bad idea. For example, to establish national sub-projects (bugtrackers), of which bugreports translated and transferred to the main (English) project by administrators of sub-projects. Administrators do not transfer all bugreports - duplicates, invalid bugreports, wontfix and etc. remain in the sub-project. The main bugreport-system remains clean (developers work inly with main bugtracking system). Repository source for all subprojects one, so the fixing of bugs will be seen in all sub-project. Administrators of subprojects will see comments on the revision and would close corresponding bugreports. Or/and will see status of own English bugreport and then change status of relative bugreport in sub-project. The scheme of multinational sub-projects are very difficult, but allowed very large numbers of people to participate in the development, testing and improvement project. Yes. I would suggest to start with one repro for the development with a main bugtracker (which is in english) and then have your bugtracker for the russian things. Is this okay for you? If yes I'll set up a trac on my private server until I find a better solution. If this repro is ready I'll ping you and we can start to migrate you patches into the git repro. Is this okay for you (and the rest of the team?) Greetings Winnie WBR, Slavaz. -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Further Midnight Commander development
Well, As I see there are plenty of people who would like to work further on mc, it would be very sad if these people will work on different versions, as this is ineffective, and tend to end in even more dead projects. My suggestion would be to have at first a look who wants to help to develop mc further and then where to do this. Personally I would like to make a viewable break to the development which was done until now, this mean: a new repository (not longer the CVS (as CVS is ancient in my eyes and svn or git is much better). So: At first the people who would like to work on mc should send a: I would like to do something. After we know who want's to work on mc we have to decide where to work on it: Either on savannah, or on the new/forked mc project. No matter where we will work further on it I'll help :) Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Removing myself from the project
Hey Pavel, Could you please be so kind and add me to the list of people who are allowed to commit into the cvs? I would like to work further on mc and integrate patches from the mc clone into mc. It would be very sad if mc will die out. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Further Midnight Commander development
Am Thursday 18 December 2008 07:39:30 schrieben Sie: Slava Zanko said: (by the date of Thu, 18 Dec 2008 02:23:07 +0200) Alex Custov Andrew Savchenko Denis Frolov Dmitry Korzhevin Pavel Vasil'ev Slava Zanko Isn't Patrick Winnertz part of your newly formed development team? I guess that he wants to be! He just asked for write access to CVS. No, I'm the maintainer of mc inside debian and using it very heavily. I wrote some smaller patches for mc which I posted to the list several months ago. After no reaction I worked for my own. If nobody has any objections I would like to work together with this new team on the development of mc. Greetings Winnie -- . '' ` . Patrick Winnertz win...@debian.org : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~winnie - http://www.der-winnie.de `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
comparing our patches
Hello, I guess a good start to get a repository with a set of all of our patches is to get a overview about all of them, in order to find patches which are identical in every distribution. In order to do this I've set up a git repository on my own server. (I think when we have a freedesktop project I'll surely move everything to freedesktop's git). (See https://git.der-winnie.de) I've created in this git repo several branches. For each distribution one. It would rock if you can send me a login name + a ssh-key and I'll give you ssh access to this repository. Then we can start slowly to add patches there. (Not everything at once, but one patch per commit, in order to make merging easier). Please give the patches useful names (not something like: main.c.patch but: adding_feature_foo.patch). After each distribution has checked in the patches, I would suggest that we start to have a look at patches/patchseries with a specific aim. So at first we start to find a common patch basis for patches which add/modify/delete something related to the syntax highlighting (./syntax/*). After finding a common set of patches here we can add this one to master and start to have a look on the next set of patches. Greetings Winnie -- .''`. Patrick Winnertz [EMAIL PROTECTED] : :' : GNU/Linux Debian Developer `. `'` http://www.der-winnie.de http://people.skolelinux.org/~winnie `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
[bug #22471] Crash while copy directory with symbolic links
Follow-up Comment #4, bug #22471 (project mc): Yes. I have. This was a error in one patch which is applied to the mc-4.6.2~pre1 version. I've verified this and tested the latest CVS version of mc, and I wasn't able to reproduce it without the patch applied. With this patch I was easily able to reproduce. I would suggest to close this bugreport. In debian this issue is already closed. ___ Reply to this item at: http://savannah.gnu.org/bugs/?22471 ___ Nachricht geschickt von/durch Savannah http://savannah.gnu.org/ ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Hello mc Maintainers! :)
I removed Egmond from Uhulinux, he doesn't work anymore for uhulinux according a mail I recived right after sending my previous one. * having a own repository where we have different branches for every distribution and one branch for a pure patchset. Then we can start to put all patches into the corresponding branch (e.g. I would put my ones into the debian branch). After that we can discuss every patch (there will be some different approaches of patch the same thing). and merge it into the main one. After we are done with every patch (of course except the ones which are distribution specific) we have a patchset for the CVS from upstream and can start to rediff them for the distributions needs. E.g. one distribution is using 4.6.2-pre1 and not a cvs snapshot then were will be a little work to rediff it, but this shoudl be quite easy. This guarantees that everybody uses the same patchset, that if there is a fix in one distribution for a error, this will be afterwards in every distribution. OK, that could work. Yes, I hope so. This is basically the same as your wiki idea only using a VCS instead. git would do the job quite good, but cvs will work, too, I guess. I am most familiar with cvs and svn, but maybe git would fit better. I am most familiar with svn and cvs, too but there are some things I really miss in svn ... I dislike the idea of branching there. git is quite new for me, too, but as I heard from different people it should be exactly what is needed here. I've got a comment on a blogpost from another Debian Developer. This site he mentioned on my Discussion page is worth to have a look on. http://www.der-winnie.de/posts/collab-maint_between_distributions__63__/discussion/ But I think that we should made this discussion visible for upstream. What about moving it to mc-devel? Yes, indeed. I've cc'ed it. Is everybody here subscribed to this list? If yes we can use this list for a first start to discuss everything. Greetings Winnie -- .''`. Patrick Winnertz [EMAIL PROTECTED] : :' : GNU/Linux Debian Developer `. `'` http://www.der-winnie.de http://people.skolelinux.org/~winnie `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
Re: Hello mc Maintainers! :)
On Friday 07 March 2008 19:55:10 Pavel Roskin wrote: On Fri, 2008-03-07 at 17:23 +0100, Patrick Winnertz wrote: This is basically the same as your wiki idea only using a VCS instead. git would do the job quite good, but cvs will work, too, I guess. I am most familiar with cvs and svn, but maybe git would fit better. I am most familiar with svn and cvs, too but there are some things I really miss in svn ... I dislike the idea of branching there. git is quite new for me, too, but as I heard from different people it should be exactly what is needed here. I can set up a git mirror on http://repo.or.cz/ and keep it updated from the cron script. I'm doing it for another project already. This would rock.. Please do. Thanks in advance Greetings Winnie -- .''`. Patrick Winnertz [EMAIL PROTECTED] : :' : GNU/Linux Debian Developer `. `'` http://www.der-winnie.de http://people.skolelinux.org/~winnie `- Debian - when you have better things to do than fixing systems signature.asc Description: This is a digitally signed message part. ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
[bug #22471] Crash while copy directory with symbolic links
Follow-up Comment #2, bug #22471 (project mc): Hey. I'm the maintainer of mc in debian. Since this is a debian specific bug I would suggest to close it here. @Sascha (boing4000): Please fill the next time a bugreport in the debian bts using the reportbug tool. Thanks in advance. Greetings Winnie ___ Reply to this item at: http://savannah.gnu.org/bugs/?22471 ___ Nachricht geschickt von/durch Savannah http://savannah.gnu.org/ ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
two patches for 3 issues ;-)
Hello..
Since I'm the new mc maintainer in debian and I would like to get rid of
many annoying bugs in mc I wrote two patches which will close several
issues in the debian bugtracking system and/or several issues in the
savannah bugtracking system.
The first patch (fish_fix_whitespace.patch) will fix a issue that it was
impossible to copy files via the fish vfs if the name of the file contains
a space or starts with one.
Furthermore it fixes a displaying issue, since such a file was displayed
without the leading space.
This fix will close this Debian Bug: 461532
The second patch (escaping-issue.patch) will fix several
escaping/unescaping issues in the internal cd and in the widgets.
Furthermore is this patch needed by the first one, since the internal cp
function via fish expects to get the string unescaped but get it in
reallity escaped. So the unescape function is needed in order to fix this
behaviour.
Furthermore now it is possible to use tab completion for external commands
on the subshell ( e.g. for a folder called a / the completion gave
previously for example: rm -rf a / ... which is definitly not what was
wanted *g*, now it escapes it correct and you'll get rm -rf a\ /.
This patch would close these Savannah Bugs: 16176, 18695, 14976
and these Debian Bugs: 326047, 458403
I'll hope that these patches will make it into the CVS. Thanks in advance.
Greetings
Winnie
ps:
In order to se the particular bugreports, please use:
http://bugs.debian.org/$bugnumber
for the debian bugs. And this for the savannah ones:
https://savannah.gnu.org/bugs/?$bugnumber
--
.''`. Patrick Winnertz [EMAIL PROTECTED]
: :' : GNU/Linux Debian Developer
`. `'` http://www.der-winnie.de http://people.skolelinux.org/~winnie
`- Debian - when you have better things to do than fixing systems
Index: util.c
===
RCS file: /cvsroot/mc/mc/src/util.c,v
retrieving revision 1.141
diff -u -w -r1.141 util.c
--- util.c 25 Sep 2007 15:33:37 - 1.141
+++ util.c 27 Feb 2008 15:38:13 -
@@ -1525,3 +1525,58 @@
return (sep != NULL) ? sep + 1 : result;
}
+/* Unescape paths or other strings for e.g the internal cd */
+char *
+unescape_string ( const char * in ) {
+ char * local = NULL;
+ int i = 0;
+ int j = 20;
+ int k = 0;
+
+ local = g_malloc(j);
+
+ for (i=0;i=strlen(in);i++) {
+ if (i-k = j ) {
+ j = j + 20;
+ local = g_realloc(local,j);
+ }
+ if ( (strchr( \t*|;,in[i])) ( strchr(\\,in[i-1])) ) {
+ k++;
+ local[i-k] = in[i];
+ } else {
+ local[i-k] = in[i];
+ }
+ }
+ local[i-k] = '\0';
+
+ return local;
+}
+
+/* To be compatible with the general posix command lines we have to escape *
+ * strings for the command line */
+char *
+escape_string ( const char * in ) {
+ char * local = NULL;
+ int i = 0;
+ int j = 20;
+ int k = 0;
+
+ local = g_malloc(j);
+
+ for (i=0;istrlen(in);i++) {
+ if (i+k = j ) { //If 20 chars is too low for the path
+ j = j + 20;
+ local = g_realloc(local,j);
+ }
+ if ( (strchr( \t*|;,in[i])) (! strchr(\\,in[i-1])) ) {
+ local[i+k] = 92; // Ascii for \
+ k = k+1;
+ local[i+k] = in[i];
+ } else {
+ local[i+k] = in[i];
+ }
+ }
+ local[i+k] = '\0';
+
+ return local;
+}
Index: util.h
===
RCS file: /cvsroot/mc/mc/src/util.h,v
retrieving revision 1.78
diff -u -w -r1.78 util.h
--- util.h 3 Feb 2006 17:04:17 - 1.78
+++ util.h 27 Feb 2008 15:38:13 -
@@ -14,6 +14,8 @@
extern const char *cstrcasestr (const char *haystack, const char *needle);
extern const char *cstrstr (const char *haystack, const char *needle);
+char *unescape_string ( const char * in );
+char *escape_string ( const char * in );
void str_replace(char *s, char from, char to);
int is_printable (int c);
void msglen (const char *text, /[EMAIL PROTECTED]@*/ int *lines, /[EMAIL PROTECTED]@*/ int *columns);
Index: file.c
===
RCS file: /cvsroot/mc/mc/src/file.c,v
retrieving revision 1.151
diff -u -w -r1.151 file.c
--- file.c 25 Sep 2007 15:33:36 - 1.151
+++ file.c 27 Feb 2008 15:38:14 -
@@ -63,6 +63,7 @@
#include widget.h
#include wtools.h
#include background.h /* we_are_background */
+#include util.h
/* Needed for current_panel, other_panel and WTree */
#include dir.h
@@ -456,7 +457,7 @@
};
int
-copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
+copy_file_file (FileOpContext *ctx, const char *s, const char *d,
int ask_overwrite, off_t *progress_count,
double *progress_bytes, int is_toplevel_file)
{
@@ -464,6 +465,8 @@
gid_t src_gid = (gid_t) - 1;
char *buf = NULL;
+const char *dst_path = NULL;
+const char *dst_path = NULL;
int buf_size = BUF_8K;
int src_desc, dest_desc = -1;
int n_read, n_written;
@@ -479,7 +482,8 @@
/* FIXME: We should not be using global variables
Re: two patches for 3 issues ;-)
Sorry again for the answer to myself.. but after testing the patches again
a bit I found out that not everything worked fine with the patches I
posted. After I've corrected this the last hours, I've done heavy testing
so that now definitly everythings works as it should.
Sorry for the noise on the list. :S
Greetings
Winnie
--
.''`. Patrick Winnertz [EMAIL PROTECTED]
: :' : GNU/Linux Debian Developer
`. `'` http://www.der-winnie.de http://people.skolelinux.org/~winnie
`- Debian - when you have better things to do than fixing systems
Index: fish.c
===
RCS file: /cvsroot/mc/mc/vfs/fish.c,v
retrieving revision 1.125
diff -u -r1.125 fish.c
--- fish.c 2 Nov 2007 14:50:41 - 1.125
+++ fish.c 27 Feb 2008 13:02:12 -
@@ -96,6 +96,7 @@
return code / 100;
}
+
/* Returns a reply code, check /usr/include/arpa/ftp.h for possible values */
static int fish_get_reply (struct vfs_class *me, int sock, char *string_buf, int string_len)
{
@@ -366,17 +367,17 @@
dir-timestamp.tv_sec += fish_directory_timeout;
quoted_path = name_quote (remote_path, 0);
fish_command (me, super, NONE,
- #LIST /%s\n
- if ls -1 /%s /dev/null 21 ;\n
+ #LIST \/%s\\n
+ if ls -1 \/%s\ /dev/null 21 ;\n
then\n
- ls -lLan /%s 2/dev/null | grep '^[^cbt]' | (\n
+ ls -lQLan \/%s\ 2/dev/null | grep '^[^cbt]' | (\n
while read p l u g s m d y n; do\n
- echo \P$p $u.$g\nS$s\nd$m $d $y\n:$n\n\\n
+ echo \P$p $u.$g\nS$s\nd$m $d $y\n:$n\n\| sed 's#\\\##g'\n
done\n
)\n
- ls -lan /%s 2/dev/null | grep '^[cb]' | (\n
+ ls -Qlan \/%s\ 2/dev/null | grep '^[cb]' | (\n
while read p l u g a i m d y n; do\n
- echo \P$p $u.$g\nE$a$i\nd$m $d $y\n:$n\n\\n
+ echo \P$p $u.$g\nE$a$i\nd$m $d $y\n:$n\n\ | sed 's#\\\##g'\n
done\n
)\n
echo '### 200'\n
@@ -534,9 +535,9 @@
/* FIXME: File size is limited to ULONG_MAX */
if (!fh-u.fish.append)
n = fish_command (me, super, WAIT_REPLY,
- #STOR %lu /%s\n
+ #STOR %lu \/%s\\n
echo '### 001'\n
- file=/%s\n
+ file=\/%s\\n
res=`exec 31\n
(\n
head -c %lu -q - || echo DD 3\n
@@ -558,10 +559,10 @@
(unsigned long) s.st_size);
else
n = fish_command (me, super, WAIT_REPLY,
- #STOR %lu /%s\n
+ #STOR %lu \/%s\\n
echo '### 001'\n
{\n
- file=/%s\n
+ file=\/%s\\n
rest=%lu\n
while [ $rest -gt 0 ]\n
do\n
@@ -627,7 +628,7 @@
return 0;
quoted_name = name_quote (name, 0);
g_free (name);
-name = quoted_name;
+name = unescape_string(quoted_name);
fh-u.fish.append = 0;
/*
@@ -637,15 +638,15 @@
* standard output (i.e. over the network).
*/
offset = fish_command (me, FH_SUPER, WANT_STRING,
- #RETR /%s\n
- if dd if=/%s of=/dev/null bs=1 count=1 2/dev/null ;\n
+ #RETR \/%s\\n
+ if dd if=\/%s\ of=/dev/null bs=1 count=1 2/dev/null ;\n
then\n
- ls -ln /%s 2/dev/null | (\n
+ ls -ln \/%s\ 2/dev/null | (\n
read p l u g s r\n
echo \$s\\n
)\n
echo '### 100'\n
- cat /%s\n
+ cat \//%s\\n
echo '### 200'\n
else\n
echo '### 500'\n
@@ -777,7 +778,7 @@
fish_chmod (struct vfs_class *me, const char *path, int mode)
{
PREFIX
-g_snprintf(buf, sizeof(buf), #CHMOD %4.4o /%s\n
+g_snprintf(buf, sizeof(buf), #CHMOD %4.4o \/%s\\n
chmod %4.4o \/%s\ 2/dev/null\n
echo '### 000'\n,
mode 0, rpath,
@@ -811,11 +812,11 @@
return fish_send_command(me, super2, buf, OPT_FLUSH); \
}
-FISH_OP(rename, #RENAME /%s /%s\n
- mv /%s /%s 2/dev/null\n
+FISH_OP(rename, #RENAME \/%s\ \/%s\\n
+ mv \/%s\ \/%s\ 2/dev/null\n
echo '### 000' )
-FISH_OP(link, #LINK /%s /%s\n
- ln /%s /%s 2/dev/null\n
+FISH_OP(link, #LINK \/%s\ \/%s\\n
+ ln \%s\ \/%s\ 2/dev/null\n
echo '### 000' )
static int fish_symlink (struct vfs_class *me, const char *setto, const char *path)
@@ -824,8 +825,8 @@
PREFIX
qsetto = name_quote (setto, 0);
g_snprintf(buf, sizeof(buf),
-#SYMLINK %s /%s\n
- ln -s %s /%s 2/dev/null\n
+#SYMLINK \%s\ \/%s\\n
+ ln -s \%s\ \/%s\ 2/dev/null\n
echo '### 000'\n,
qsetto, rpath, qsetto, rpath);
g_free (qsetto);
@@ -850,16 +851,16 @@
{
PREFIX
g_snprintf (buf, sizeof(buf),
- #CHOWN /%s /%s\n
- chown %s /%s 2/dev/null\n
+ #CHOWN /%s \/%s\\n
+ chown %s \/%s\ 2/dev/null\n
echo '### 000'\n,
sowner, rpath,
sowner, rpath);
fish_send_command (me, super, buf, OPT_FLUSH);
/* FIXME: what should we report if chgrp succeeds but chown fails? */
g_snprintf (buf, sizeof(buf),
-#CHGRP /%s /%s\n
- chgrp %s /%s 2/dev/null\n
+#CHGRP /%s \/%s\\n
+ chgrp %s \/%s\ 2/dev/null\n
echo '### 000'\n,
sgroup, rpath,
sgroup, rpath);
@@ -872,8 +873,8 @@
{
PREFIX
g_snprintf(buf, sizeof(buf),
-#DELE
