|
 |
1c9de34 |
diff -up mc-4.7.1/src/find.c.findfix mc-4.7.1/src/find.c
|
|
|
1c9de34 |
--- mc-4.7.1/src/find.c.findfix 2010-02-26 12:34:03.000000000 +0100
|
|
|
1c9de34 |
+++ mc-4.7.1/src/find.c 2010-03-02 15:46:55.000000000 +0100
|
|
|
1c9de34 |
@@ -1004,8 +1004,7 @@ init_find_vars (void)
|
|
|
1c9de34 |
static char *
|
|
|
1c9de34 |
make_fullname (const char *dirname, const char *filename)
|
|
|
1c9de34 |
{
|
|
|
1c9de34 |
-
|
|
|
1c9de34 |
- if (strcmp(dirname, ".") == 0 || strcmp(dirname, "."PATH_SEP_STR) == 0)
|
|
|
1c9de34 |
+ if (dirname == NULL || strcmp(dirname, ".") == 0 || strcmp(dirname, "."PATH_SEP_STR) == 0)
|
|
|
1c9de34 |
return g_strdup (filename);
|
|
|
1c9de34 |
if (strncmp(dirname, "."PATH_SEP_STR, 2) == 0)
|
|
|
1c9de34 |
return concat_dir_and_file (dirname + 2, filename);
|
|
|
1c9de34 |
@@ -1258,7 +1257,7 @@ find_file (const char *start_dir, const
|
|
|
1c9de34 |
if ((le->text == NULL) || (entry->data == NULL))
|
|
|
1c9de34 |
continue;
|
|
|
1c9de34 |
|
|
|
1c9de34 |
- if (content_pattern != NULL)
|
|
|
1c9de34 |
+ if (content_pattern != NULL && strchr (le->text + 4, ':'))
|
|
|
1c9de34 |
lc_filename = strchr (le->text + 4, ':') + 1;
|
|
|
1c9de34 |
else
|
|
|
1c9de34 |
lc_filename = le->text + 4;
|