history patch (was Re: portable snprintf implementation)
RenE J.V. Bertin
rjvbertin@hotmail.com
Wed, 10 Jul 2002 16:35:20 +0200
This is a multi-part message in MIME format.
------=_NextPart_000_3896_5dbc_cfa
Content-Type: text/plain; format=flowed
Here's the patch. It looks like it does what I want it to do, but I haven't
yet tried it with multiple-line entries and the like. Please let me know if
anything turns up that I should look into (I attached it too, in case
hotmail wraps).
RenE J.V. Bertin
College de France/LPPA
11, place Marcelin Berthelot
75005 Paris, France
## A couple of 'diff -c' patches to modify the history system such that
subsequent identical lines are only entered once.
*** src/unix/sys-std.c.orig Sat Jun 29 19:16:31 2002
--- src/unix/sys-std.c Wed Jul 10 16:23:59 2002
***************
*** 324,331 ****
return;
if (line[0]) {
# ifdef HAVE_READLINE_HISTORY_H
! if (strlen(line) && readline_addtohistory)
! add_history(line);
# endif
l = (((readline_len-2) > strlen(line))?
strlen(line): (readline_len-2));
--- 324,353 ----
return;
if (line[0]) {
# ifdef HAVE_READLINE_HISTORY_H
! if (strlen(line) && readline_addtohistory){
! static char called=0;
! /* RJVB: Only add lines that are not identical to the previous line.
This is a very cheap
! \ way to reduce the history size, and to reduce the time the user may
spent searching it!
! \ For this to work properly, we (apparently) need to initialise the
history mechanism with
! \ the call to using_history().
! */
! HIST_ENTRY *prev= current_history();
! if( !called ){
! using_history();
! called= TRUE;
! }
! if( !prev ){
! /* It is possible that current_history() returns NULL while there
is a history. In that case,
! \ back up one entry, and if that succeeds, inch forward again.
! */
! if( (prev= previous_history()) ){
! next_history();
! }
! }
! if( !prev || strcmp(line, prev->line) ){
! add_history(line);
! }
! }
# endif
l = (((readline_len-2) > strlen(line))?
strlen(line): (readline_len-2));
*** src/modules/gnome/gtkconsole.c.orig Wed Mar 20 18:24:41 2002
--- src/modules/gnome/gtkconsole.c Wed Jul 10 16:21:30 2002
***************
*** 299,312 ****
/* add command to history */
term_ptr = strchr (text_chars, '\n');
if ((add_to_history == TRUE) && (term_ptr != NULL) && (*text_chars !=
'\n'))
! {
! history_buf = g_malloc (term_ptr - text_chars + 1);
! *term_ptr = '\0';
! strncpy (history_buf, text_chars, term_ptr - text_chars + 1);
! GTK_CONSOLE (object)->history =
! g_list_prepend (GTK_CONSOLE (object)->history, history_buf);
! GTK_CONSOLE (object)->history_num_items++;
}
g_free (text_chars);
--- 299,329 ----
/* add command to history */
term_ptr = strchr (text_chars, '\n');
if ((add_to_history == TRUE) && (term_ptr != NULL) && (*text_chars !=
'\n'))
! { GList *prev = NULL;
! /* RJVB: I don't like it when a repeated command is put into the
history every time...
! \ For this, we have to disregard object->history_cur; it will be NULL
when we come
! \ here after entering a new line, but it will point to the selected
history line when
! \ we come here after "wandering" through the history, and selecting a
previously entered
! \ command. I think that we do want to enter that command anew into
the history!
! */
! prev = object->history;
! if( prev ){
! *term_ptr = '\0';
! if( !strncmp( text_chars, (char*) prev->data, term_ptr - text_chars )
){
! add_to_history= FALSE;
! }
! }
! if( add_to_history ){
! history_buf = g_malloc (term_ptr - text_chars + 1);
! /* RJVB: sh*t happens... */
! g_return_if_fail( history_buf!=NULL );
! strncpy (history_buf, text_chars, term_ptr - text_chars + 1);
!
! GTK_CONSOLE (object)->history =
! g_list_prepend (GTK_CONSOLE (object)->history, history_buf);
! GTK_CONSOLE (object)->history_num_items++;
! }
}
g_free (text_chars);
_________________________________________________________________
Chat with friends online, try MSN Messenger: http://messenger.msn.com
------=_NextPart_000_3896_5dbc_cfa
Content-Type: application/octet-stream; name="RJVB-20020709.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="RJVB-20020709.patch"
IyMgQSBjb3VwbGUgb2YgJ2RpZmYgLWMnIHBhdGNoZXMgdG8gbW9kaWZ5IHRo
ZSBoaXN0b3J5IHN5c3RlbSBzdWNoIHRoYXQgc3Vic2VxdWVudCBpZGVudGlj
YWwgbGluZXMgYXJlIG9ubHkgZW50ZXJlZCBvbmNlLgoKKioqIHNyYy91bml4
L3N5cy1zdGQuYy5vcmlnCVNhdCBKdW4gMjkgMTk6MTY6MzEgMjAwMgotLS0g
c3JjL3VuaXgvc3lzLXN0ZC5jCVdlZCBKdWwgMTAgMTY6MjM6NTkgMjAwMgoq
KioqKioqKioqKioqKioKKioqIDMyNCwzMzEgKioqKgogIAlyZXR1cm47CiAg
ICAgIGlmIChsaW5lWzBdKSB7CiAgIyBpZmRlZiBIQVZFX1JFQURMSU5FX0hJ
U1RPUllfSAohIAlpZiAoc3RybGVuKGxpbmUpICYmIHJlYWRsaW5lX2FkZHRv
aGlzdG9yeSkKISAJICAgIGFkZF9oaXN0b3J5KGxpbmUpOwogICMgZW5kaWYK
ICAJbCA9ICgoKHJlYWRsaW5lX2xlbi0yKSA+IHN0cmxlbihsaW5lKSk/CiAg
CSAgICAgc3RybGVuKGxpbmUpOiAocmVhZGxpbmVfbGVuLTIpKTsKLS0tIDMy
NCwzNTMgLS0tLQogIAlyZXR1cm47CiAgICAgIGlmIChsaW5lWzBdKSB7CiAg
IyBpZmRlZiBIQVZFX1JFQURMSU5FX0hJU1RPUllfSAohIAlpZiAoc3RybGVu
KGxpbmUpICYmIHJlYWRsaW5lX2FkZHRvaGlzdG9yeSl7CiEgCSAgc3RhdGlj
IGNoYXIgY2FsbGVkPTA7CiEgCQkvKiBSSlZCOiBPbmx5IGFkZCBsaW5lcyB0
aGF0IGFyZSBub3QgaWRlbnRpY2FsIHRvIHRoZSBwcmV2aW91cyBsaW5lLiBU
aGlzIGlzIGEgdmVyeSBjaGVhcAohIAkJIFwgd2F5IHRvIHJlZHVjZSB0aGUg
aGlzdG9yeSBzaXplLCBhbmQgdG8gcmVkdWNlIHRoZSB0aW1lIHRoZSB1c2Vy
IG1heSBzcGVudCBzZWFyY2hpbmcgaXQhCiEgCQkgXCBGb3IgdGhpcyB0byB3
b3JrIHByb3Blcmx5LCB3ZSAoYXBwYXJlbnRseSkgbmVlZCB0byBpbml0aWFs
aXNlIHRoZSBoaXN0b3J5IG1lY2hhbmlzbSB3aXRoCiEgCQkgXCB0aGUgY2Fs
bCB0byB1c2luZ19oaXN0b3J5KCkuCiEgCQkqLwohIAkgIEhJU1RfRU5UUlkg
KnByZXY9IGN1cnJlbnRfaGlzdG9yeSgpOwohIAkgICAgaWYoICFjYWxsZWQg
KXsKISAJCSAgICB1c2luZ19oaXN0b3J5KCk7CiEgCQkgICAgY2FsbGVkPSBU
UlVFOwohIAkgICAgfQohIAkgICAgaWYoICFwcmV2ICl7CiEgCQkgICAgICAv
KiBJdCBpcyBwb3NzaWJsZSB0aGF0IGN1cnJlbnRfaGlzdG9yeSgpIHJldHVy
bnMgTlVMTCB3aGlsZSB0aGVyZSBpcyBhIGhpc3RvcnkuIEluIHRoYXQgY2Fz
ZSwKISAJCSAgICAgICBcIGJhY2sgdXAgb25lIGVudHJ5LCBhbmQgaWYgdGhh
dCBzdWNjZWVkcywgaW5jaCBmb3J3YXJkIGFnYWluLgohIAkJICAgICAgICov
CiEgCQkgICAgaWYoIChwcmV2PSBwcmV2aW91c19oaXN0b3J5KCkpICl7CiEg
CQkJICAgIG5leHRfaGlzdG9yeSgpOwohIAkJICAgIH0KISAJICAgIH0KISAJ
ICAgIGlmKCAhcHJldiB8fCBzdHJjbXAobGluZSwgcHJldi0+bGluZSkgKXsK
ISAJCSAgICBhZGRfaGlzdG9yeShsaW5lKTsKISAJICAgIH0KISAJfQogICMg
ZW5kaWYKICAJbCA9ICgoKHJlYWRsaW5lX2xlbi0yKSA+IHN0cmxlbihsaW5l
KSk/CiAgCSAgICAgc3RybGVuKGxpbmUpOiAocmVhZGxpbmVfbGVuLTIpKTsK
KioqIHNyYy9tb2R1bGVzL2dub21lL2d0a2NvbnNvbGUuYy5vcmlnCVdlZCBN
YXIgMjAgMTg6MjQ6NDEgMjAwMgotLS0gc3JjL21vZHVsZXMvZ25vbWUvZ3Rr
Y29uc29sZS5jCVdlZCBKdWwgMTAgMTY6MjE6MzAgMjAwMgoqKioqKioqKioq
KioqKioKKioqIDI5OSwzMTIgKioqKgogICAgLyogYWRkIGNvbW1hbmQgdG8g
aGlzdG9yeSAqLwogICAgdGVybV9wdHIgPSBzdHJjaHIgKHRleHRfY2hhcnMs
ICdcbicpOwogICAgaWYgKChhZGRfdG9faGlzdG9yeSA9PSBUUlVFKSAmJiAo
dGVybV9wdHIgIT0gTlVMTCkgJiYgKCp0ZXh0X2NoYXJzICE9ICdcbicpKQoh
ICAgICB7CiEgICAgICAgaGlzdG9yeV9idWYgPSBnX21hbGxvYyAodGVybV9w
dHIgLSB0ZXh0X2NoYXJzICsgMSk7CiEgICAgICAgKnRlcm1fcHRyID0gJ1ww
JzsKISAgICAgICBzdHJuY3B5IChoaXN0b3J5X2J1ZiwgdGV4dF9jaGFycywg
dGVybV9wdHIgLSB0ZXh0X2NoYXJzICsgMSk7CiAgCiEgICAgICAgR1RLX0NP
TlNPTEUgKG9iamVjdCktPmhpc3RvcnkgPQohIAlnX2xpc3RfcHJlcGVuZCAo
R1RLX0NPTlNPTEUgKG9iamVjdCktPmhpc3RvcnksIGhpc3RvcnlfYnVmKTsK
ISAgICAgICBHVEtfQ09OU09MRSAob2JqZWN0KS0+aGlzdG9yeV9udW1faXRl
bXMrKzsKICAgICAgfQogIAogICAgZ19mcmVlICh0ZXh0X2NoYXJzKTsKLS0t
IDI5OSwzMjkgLS0tLQogICAgLyogYWRkIGNvbW1hbmQgdG8gaGlzdG9yeSAq
LwogICAgdGVybV9wdHIgPSBzdHJjaHIgKHRleHRfY2hhcnMsICdcbicpOwog
ICAgaWYgKChhZGRfdG9faGlzdG9yeSA9PSBUUlVFKSAmJiAodGVybV9wdHIg
IT0gTlVMTCkgJiYgKCp0ZXh0X2NoYXJzICE9ICdcbicpKQohICAgICB7IEdM
aXN0ICpwcmV2ID0gTlVMTDsKICAKISAJCSAgLyogUkpWQjogSSBkb24ndCBs
aWtlIGl0IHdoZW4gYSByZXBlYXRlZCBjb21tYW5kIGlzIHB1dCBpbnRvIHRo
ZSBoaXN0b3J5IGV2ZXJ5IHRpbWUuLi4KISAJCSAgIFwgRm9yIHRoaXMsIHdl
IGhhdmUgdG8gZGlzcmVnYXJkIG9iamVjdC0+aGlzdG9yeV9jdXI7IGl0IHdp
bGwgYmUgTlVMTCB3aGVuIHdlIGNvbWUKISAJCSAgIFwgaGVyZSBhZnRlciBl
bnRlcmluZyBhIG5ldyBsaW5lLCBidXQgaXQgd2lsbCBwb2ludCB0byB0aGUg
c2VsZWN0ZWQgaGlzdG9yeSBsaW5lIHdoZW4KISAJCSAgIFwgd2UgY29tZSBo
ZXJlIGFmdGVyICJ3YW5kZXJpbmciIHRocm91Z2ggdGhlIGhpc3RvcnksIGFu
ZCBzZWxlY3RpbmcgYSBwcmV2aW91c2x5IGVudGVyZWQKISAJCSAgIFwgY29t
bWFuZC4gSSB0aGluayB0aGF0IHdlIGRvIHdhbnQgdG8gZW50ZXIgdGhhdCBj
b21tYW5kIGFuZXcgaW50byB0aGUgaGlzdG9yeSEKISAJCSAgICovCiEgCQlw
cmV2ID0gb2JqZWN0LT5oaXN0b3J5OwohIAkJaWYoIHByZXYgKXsKISAJCQkq
dGVybV9wdHIgPSAnXDAnOwohIAkJCWlmKCAhc3RybmNtcCggdGV4dF9jaGFy
cywgKGNoYXIqKSBwcmV2LT5kYXRhLCB0ZXJtX3B0ciAtIHRleHRfY2hhcnMg
KSApewohIAkJCQlhZGRfdG9faGlzdG9yeT0gRkFMU0U7CiEgCQkJfQohIAkJ
fQohIAkJaWYoIGFkZF90b19oaXN0b3J5ICl7CiEgCQkJaGlzdG9yeV9idWYg
PSBnX21hbGxvYyAodGVybV9wdHIgLSB0ZXh0X2NoYXJzICsgMSk7CiEgCQkJ
ICAvKiBSSlZCOiBzaCp0IGhhcHBlbnMuLi4gKi8KISAJCQlnX3JldHVybl9p
Zl9mYWlsKCBoaXN0b3J5X2J1ZiE9TlVMTCApOwohIAkJCXN0cm5jcHkgKGhp
c3RvcnlfYnVmLCB0ZXh0X2NoYXJzLCB0ZXJtX3B0ciAtIHRleHRfY2hhcnMg
KyAxKTsKISAKISAJCQlHVEtfQ09OU09MRSAob2JqZWN0KS0+aGlzdG9yeSA9
CiEgCQkJCWdfbGlzdF9wcmVwZW5kIChHVEtfQ09OU09MRSAob2JqZWN0KS0+
aGlzdG9yeSwgaGlzdG9yeV9idWYpOwohIAkJCUdUS19DT05TT0xFIChvYmpl
Y3QpLT5oaXN0b3J5X251bV9pdGVtcysrOwohIAkJfQogICAgICB9CiAgCiAg
ICBnX2ZyZWUgKHRleHRfY2hhcnMpOwo=
------=_NextPart_000_3896_5dbc_cfa--
-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
r-devel mailing list -- Read http://www.ci.tuwien.ac.at/~hornik/R/R-FAQ.html
Send "info", "help", or "[un]subscribe"
(in the "body", not the subject !) To: r-devel-request@stat.math.ethz.ch
_._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._