mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/1397_master_broken'

Browse Source 
* commit 'origin/1397_master_broken':
  Ticket #1397 (Broken build of project without --enable-charset option)
This commit is contained in:
Slava Zanko 2009-07-14 13:55:25 +03:00
commit f830dcc0a8
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/view.c
View File

@ -3261,7 +3261,9 @@ view_search_cmd (WView *view)
char *defval = g_strdup (view->last_search_string != NULL ? view->last_search_string : "");
char *exp = NULL;
#ifdef HAVE_CHARSET
GString *tmp;
#endif
int ttype_of_search = (int) view->search_type;
int tall_codepages = (int) view->search_all_codepages;
@ -3323,14 +3325,15 @@ view_search_cmd (WView *view)
if (exp == NULL || exp[0] == '\0')
goto cleanup;
g_free (defval);
defval = NULL;
#ifdef HAVE_CHARSET
tmp = str_convert_to_input (exp);
if (tmp)
defval = tmp->str;
g_string_free (tmp, FALSE);
{
g_free(exp);
exp = g_string_free (tmp, FALSE);
}
#endif
g_free (view->last_search_string);
view->last_search_string = exp;
@ -3339,7 +3342,7 @@ view_search_cmd (WView *view)
if (view->search)
mc_search_free(view->search);
view->search = mc_search_new(defval, -1);
view->search = mc_search_new(view->last_search_string, -1);
if (! view->search)
goto cleanup;