ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: exclude the search-at-startup feature from the tiny version

master
Benno Schulenberg 2019-08-18 12:54:28 +02:00
parent ed4b6486a1
commit 5c399dfc6e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nano.c
View File

@ -2581,12 +2581,14 @@ int main(int argc, char **argv)
/* Read the files mentioned on the command line into new buffers. */ /* Read the files mentioned on the command line into new buffers. */
while (optind < argc && (!openfile || read_them_all)) { while (optind < argc && (!openfile || read_them_all)) {
ssize_t givenline = 0, givencol = 0; ssize_t givenline = 0, givencol = 0;
#ifndef NANO_TINY
char *searchstring = NULL; char *searchstring = NULL;
#endif
/* If there's a +LINE[,COLUMN] argument here, eat it up. */ /* If there's a +LINE[,COLUMN] argument here, eat it up. */
if (optind < argc - 1 && argv[optind][0] == '+') { if (optind < argc - 1 && argv[optind][0] == '+') {
int n = 1; int n = 1;
#ifndef NANO_TINY
while (isalpha(argv[optind][n])) { while (isalpha(argv[optind][n])) {
switch (argv[optind][n++]) { switch (argv[optind][n++]) {
case 'c': SET(CASE_SENSITIVE); break; case 'c': SET(CASE_SENSITIVE); break;
@ -2608,7 +2610,7 @@ int main(int argc, char **argv)
statusline(ALERT, _("Empty search string")); statusline(ALERT, _("Empty search string"));
optind++; optind++;
} else } else
#endif
if (!parse_line_column(&argv[optind++][n], &givenline, &givencol)) if (!parse_line_column(&argv[optind++][n], &givenline, &givencol))
statusline(ALERT, _("Invalid line or column number")); statusline(ALERT, _("Invalid line or column number"));
} }
@ -2625,6 +2627,7 @@ int main(int argc, char **argv)
/* If a position was given on the command line, go there. */ /* If a position was given on the command line, go there. */
if (givenline != 0 || givencol != 0) if (givenline != 0 || givencol != 0)
do_gotolinecolumn(givenline, givencol, FALSE, FALSE); do_gotolinecolumn(givenline, givencol, FALSE, FALSE);
#ifndef NANO_TINY
else if (searchstring != NULL) { else if (searchstring != NULL) {
if (ISSET(USE_REGEXP)) if (ISSET(USE_REGEXP))
regexp_init(searchstring); regexp_init(searchstring);
@ -2639,6 +2642,7 @@ int main(int argc, char **argv)
last_search = searchstring; last_search = searchstring;
searchstring = NULL; searchstring = NULL;
} }
#endif
#ifdef ENABLE_HISTORIES #ifdef ENABLE_HISTORIES
else if (ISSET(POSITIONLOG) && openfile->filename[0] != '\0') { else if (ISSET(POSITIONLOG) && openfile->filename[0] != '\0') {
ssize_t savedline, savedcol; ssize_t savedline, savedcol;