diff options
| author | delphij <delphij@FreeBSD.org> | 2007-06-04 01:42:54 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2007-06-04 01:42:54 +0000 |
| commit | 9b5d103b5b51a6fea5caf2c8b1fc678d65a357c9 (patch) | |
| tree | f7d1bd15b558b3590d7bb4d4e31ef8833e0a1171 /contrib/less/cmdbuf.c | |
| parent | 05dd7cf6267b7b4d66cfc8e51b6d7e47d0eba220 (diff) | |
| parent | 7672cb6e48e2ed472cbd72caaa0eb155608a644d (diff) | |
| download | FreeBSD-src-9b5d103b5b51a6fea5caf2c8b1fc678d65a357c9.zip FreeBSD-src-9b5d103b5b51a6fea5caf2c8b1fc678d65a357c9.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r170256,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/less/cmdbuf.c')
| -rw-r--r-- | contrib/less/cmdbuf.c | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/contrib/less/cmdbuf.c b/contrib/less/cmdbuf.c index 1d3e284..6effb60 100644 --- a/contrib/less/cmdbuf.c +++ b/contrib/less/cmdbuf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2005 Mark Nudelman + * Copyright (C) 1984-2007 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -68,22 +68,23 @@ struct mlist struct mlist *prev; struct mlist *curr_mp; char *string; + int modified; }; /* * These are the various command histories that exist. */ struct mlist mlist_search = - { &mlist_search, &mlist_search, &mlist_search, NULL }; + { &mlist_search, &mlist_search, &mlist_search, NULL, 0 }; public void * constant ml_search = (void *) &mlist_search; struct mlist mlist_examine = - { &mlist_examine, &mlist_examine, &mlist_examine, NULL }; + { &mlist_examine, &mlist_examine, &mlist_examine, NULL, 0 }; public void * constant ml_examine = (void *) &mlist_examine; #if SHELL_ESCAPE || PIPEC struct mlist mlist_shell = - { &mlist_shell, &mlist_shell, &mlist_shell, NULL }; + { &mlist_shell, &mlist_shell, &mlist_shell, NULL, 0 }; public void * constant ml_shell = (void *) &mlist_shell; #endif @@ -124,12 +125,11 @@ cmd_reset() } /* - * Clear command line on display. + * Clear command line. */ public void clear_cmd() { - clear_bot(); cmd_col = prompt_col = 0; cmd_mbc_buf_len = 0; } @@ -767,6 +767,7 @@ cmd_accept() if (curr_mlist == NULL) return; cmd_addhist(curr_mlist, cmdbuf); + curr_mlist->modified = 1; #endif } @@ -1275,13 +1276,21 @@ cmd_char(c) * Return the number currently in the command buffer. */ public LINENUM -cmd_int() +cmd_int(frac) + long *frac; { - register char *p; + char *p; LINENUM n = 0; + int err; - for (p = cmdbuf; *p != '\0'; p++) - n = (10 * n) + (*p - '0'); + for (p = cmdbuf; *p >= '0' && *p <= '9'; p++) + n = (n * 10) + (*p - '0'); + *frac = 0; + if (*p++ == '.') + { + *frac = getfraction(&p, NULL, &err); + /* {{ do something if err is set? }} */ + } return (n); } @@ -1294,6 +1303,17 @@ get_cmdbuf() return (cmdbuf); } +/* + * Return the last (most recent) string in the current command history. + */ + public char * +cmd_lastpattern() +{ + if (curr_mlist == NULL) + return (NULL); + return (curr_mlist->curr_mp->prev->string); +} + #if CMD_HISTORY /* * Get the name of the history file. @@ -1309,7 +1329,7 @@ histfile_name() name = lgetenv("LESSHISTFILE"); if (name != NULL && *name != '\0') { - if (strcmp(name, "-") == 0) + if (strcmp(name, "-") == 0 || strcmp(name, "/dev/null") == 0) /* $LESSHISTFILE == "-" means don't use a history file. */ return (NULL); return (save(name)); @@ -1428,6 +1448,8 @@ save_cmdhist() filename = histfile_name(); if (filename == NULL) return; + if (!mlist_search.modified && !mlist_shell.modified) + return; f = fopen(filename, "w"); free(filename); if (f == NULL) |
