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

* find.c (find_parameters): Add a checkbox for case insensitive

Browse Source 
content search.
(search_content): Pass `-i' to egrep for case insensitive
search.
This commit is contained in:
Pavel Roskin 2001-04-06 05:21:29 +00:00
parent 4463ea58c2
commit 5adecba2fd
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2001-04-06 Andrew V. Samoilov <sav@bcs.zp.ua>
* find.c (find_parameters): Add a checkbox for case insensitive
content search.
(search_content): Pass `-i' to egrep for case insensitive
search.
2001-03-30 Andrew V. Samoilov <sav@bcs.zp.ua> 2001-03-30 Andrew V. Samoilov <sav@bcs.zp.ua>
* panel.h, screen.c (panel_new): panel_name constified to do gcc * panel.h, screen.c (panel_new): panel_name constified to do gcc

25
src/find.c
View File

@ -55,7 +55,7 @@
#endif #endif
/* Size of the find parameters window */ /* Size of the find parameters window */
#define FIND_Y 12 #define FIND_Y 14
static int FIND_X = 50; static int FIND_X = 50;
/* Size of the find window */ /* Size of the find window */
@ -156,6 +156,8 @@ static void get_list_info (char **file, char **dir);
* *
*/ */
static int case_sensitive = 1;
static int static int
find_parameters (char **start_dir, char **pattern, char **content) find_parameters (char **start_dir, char **pattern, char **content)
{ {
@ -163,6 +165,9 @@ find_parameters (char **start_dir, char **pattern, char **content)
#ifndef HAVE_GNOME #ifndef HAVE_GNOME
char *temp_dir; char *temp_dir;
#endif #endif
WCheck *case_sense;
static char* case_label = N_("case sensi&tive");
static char *in_contents = NULL; static char *in_contents = NULL;
static char *in_start_dir = NULL; static char *in_start_dir = NULL;
static char *in_start_name = NULL; static char *in_start_name = NULL;
@ -205,6 +210,7 @@ find_parameters (char **start_dir, char **pattern, char **content)
b2 = FIND_X - (strlen(buts[2]) + 6); b2 = FIND_X - (strlen(buts[2]) + 6);
i18n_flag = 1; i18n_flag = 1;
case_label = _(case_label);
} }
#endif /* ENABLE_NLS */ #endif /* ENABLE_NLS */
@ -220,17 +226,21 @@ find_par_start:
find_dlg = create_dlg (0, 0, FIND_Y, FIND_X, dialog_colors, find_dlg = create_dlg (0, 0, FIND_Y, FIND_X, dialog_colors,
common_dialog_callback, "[Find File]", "findfile", common_dialog_callback, "[Find File]", "findfile",
DLG_CENTER | DLG_GRID); DLG_CENTER | DLG_GRID);
x_set_dialog_title (find_dlg, _("Find File")); x_set_dialog_title (find_dlg, _("Find File"));
add_widgetl (find_dlg, button_new (9, b2, B_CANCEL, NORMAL_BUTTON, add_widgetl (find_dlg, button_new (11, b2, B_CANCEL, NORMAL_BUTTON,
buts[2], 0 ,0, "cancel"), XV_WLAY_RIGHTOF); buts[2], 0 ,0, "cancel"), XV_WLAY_RIGHTOF);
#ifndef HAVE_GNOME #ifndef HAVE_GNOME
add_widgetl (find_dlg, button_new (9, b1, B_TREE, NORMAL_BUTTON, add_widgetl (find_dlg, button_new (11, b1, B_TREE, NORMAL_BUTTON,
buts[1], 0, 0, "tree"), XV_WLAY_RIGHTOF); buts[1], 0, 0, "tree"), XV_WLAY_RIGHTOF);
#endif #endif
add_widgetl (find_dlg, button_new (9, b0, B_ENTER, DEFPUSH_BUTTON, add_widgetl (find_dlg, button_new (11, b0, B_ENTER, DEFPUSH_BUTTON,
buts[0], 0, 0, "ok"), XV_WLAY_CENTERROW); buts[0], 0, 0, "ok"), XV_WLAY_CENTERROW);
case_sense = check_new (9, 3, case_sensitive, case_label, "find-case-check");
add_widgetl (find_dlg, case_sense, XV_WLAY_RIGHTDOWN);
in_with = input_new (7, istart, INPUT_COLOR, ilen, in_contents, "content"); in_with = input_new (7, istart, INPUT_COLOR, ilen, in_contents, "content");
add_widgetl (find_dlg, in_with, XV_WLAY_BELOWOF); add_widgetl (find_dlg, in_with, XV_WLAY_BELOWOF);
@ -254,6 +264,7 @@ find_par_start:
#ifndef HAVE_GNOME #ifndef HAVE_GNOME
case B_TREE: case B_TREE:
temp_dir = g_strdup (in_start->buffer); temp_dir = g_strdup (in_start->buffer);
case_sensitive = case_sense->state & C_BOOL;
destroy_dlg (find_dlg); destroy_dlg (find_dlg);
g_free (in_start_dir); g_free (in_start_dir);
if (strcmp (temp_dir, ".") == 0){ if (strcmp (temp_dir, ".") == 0){
@ -271,6 +282,7 @@ find_par_start:
#endif #endif
default: default:
case_sensitive = case_sense->state & C_BOOL;
return_value = 1; return_value = 1;
*start_dir = g_strdup (in_start->buffer); *start_dir = g_strdup (in_start->buffer);
*pattern = g_strdup (in_name->buffer); *pattern = g_strdup (in_name->buffer);
@ -417,6 +429,7 @@ search_content (Dlg_head *h, char *directory, char *filename)
int i; int i;
pid_t pid; pid_t pid;
static char *egrep_path; static char *egrep_path;
char *egrep_opts = case_sensitive ? "-n" : "-in";
fname = concat_dir_and_file (directory, filename); fname = concat_dir_and_file (directory, filename);
@ -439,9 +452,9 @@ search_content (Dlg_head *h, char *directory, char *filename)
egrep_path = locate_egrep (); egrep_path = locate_egrep ();
#ifndef GREP_STDIN #ifndef GREP_STDIN
pipe = mc_doublepopen (file_fd, -1, &pid, egrep_path, egrep_path, "-n", content_pattern, NULL); pipe = mc_doublepopen (file_fd, -1, &pid, egrep_path, egrep_path, egrep_opts, content_pattern, NULL);
#else /* GREP_STDIN */ #else /* GREP_STDIN */
pipe = mc_doublepopen (file_fd, -1, &pid, egrep_path, egrep_path, "-n", content_pattern, "-", NULL); pipe = mc_doublepopen (file_fd, -1, &pid, egrep_path, egrep_path, egrep_opts, content_pattern, "-", NULL);
#endif /* GREP STDIN */ #endif /* GREP STDIN */
if (pipe == -1){ if (pipe == -1){