From 085ad99f5717a64563effb8d8f1b8b36ec1182f5 Mon Sep 17 00:00:00 2001 From: ja7 Date: Thu, 2 Dec 2004 13:55:35 +0000 Subject: [PATCH] Fixed bug 227 and bug 228 --- client/client.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/client/client.c b/client/client.c index be42824..9378faf 100644 --- a/client/client.c +++ b/client/client.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.256 2004-11-18 15:18:10 heikki Exp $ + * $Id: client.c,v 1.257 2004-12-02 13:55:35 ja7 Exp $ */ #include @@ -3055,7 +3055,7 @@ int cmd_lang(const char* arg) return 1; } -int cmd_source(const char* arg) +int cmd_source(const char* arg, int echo ) { /* first should open the file and read one line at a time.. */ FILE* includeFile; @@ -3082,7 +3082,10 @@ int cmd_source(const char* arg) if ((cp = strrchr (line, '\n'))) *cp = '\0'; - + + if( echo ) { + printf( "processing line: %s\n",line ); + }; process_cmd_line(line); } @@ -3093,6 +3096,15 @@ int cmd_source(const char* arg) return 1; } +int cmd_source_echo(const char* arg) { + cmd_source( arg, 1); +} + +int cmd_source_noecho(const char* arg) { + cmd_source( arg, 0 ); +} + + int cmd_subshell(const char* args) { if(strlen(args)) @@ -3306,17 +3318,19 @@ void source_rcfile() struct stat statbuf; char buffer[1000]; char* homedir=getenv("HOME"); - - if(!homedir) return; - - sprintf(buffer,"%s/.yazclientrc",homedir); - - if(stat(buffer,&statbuf)==0) { - cmd_source(buffer); - } + + if( homedir ) { + + sprintf(buffer,"%s/.yazclientrc",homedir); + + if(stat(buffer,&statbuf)==0) { + cmd_source(buffer, 0 ); + } + + }; if(stat(".yazclientrc",&statbuf)==0) { - cmd_source(".yazclientrc"); + cmd_source(".yazclientrc", 0 ); } } @@ -3903,7 +3917,7 @@ static struct { {"charset", cmd_charset, " ",NULL,0,NULL}, {"marccharset", cmd_marccharset, "",NULL,0,NULL}, {"lang", cmd_lang, "",NULL,0,NULL}, - {".", cmd_source, "",NULL,1,NULL}, + {".", cmd_source_echo, "",NULL,1,NULL}, {"!", cmd_subshell, "Subshell command",NULL,1,NULL}, {"set_apdufile", cmd_set_apdufile, "",NULL,1,NULL}, {"set_berfile", cmd_set_berfile, "",NULL,1,NULL}, -- 1.7.10.4