X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrash.c;h=e1f6ede3b6f2b31054618a04187ef1c10356f6ea;hb=cdcde0c689ec4b66f1884dbd455284b7a35fb425;hp=928bf957cd1705ae439789e6b774bae0a6c3e4fc;hpb=a9e90f22d2cefbafc9d490a03a3bc7d1b75d57ee;p=idzebra-moved-to-github.git diff --git a/index/zebrash.c b/index/zebrash.c index 928bf95..e1f6ede 100644 --- a/index/zebrash.c +++ b/index/zebrash.c @@ -1,4 +1,4 @@ -/* $Id: zebrash.c,v 1.33 2005-03-09 12:14:42 adam Exp $ +/* $Id: zebrash.c,v 1.37 2006-05-10 08:13:23 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -28,7 +28,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#include /* for isatty */ +#if HAVE_UNISTD_H +#include +#endif #if HAVE_READLINE_READLINE_H #include @@ -191,7 +193,7 @@ static int cmd_zebra_open( char *args[], WRBUF outbuff) if (!zs) wrbuf_puts(outbuff,"zebra seems not to have been started, " "trying anyway\n"); - zh=zebra_open(zs); + zh = zebra_open(zs, 0); return 0; /* ok */ } @@ -741,7 +743,7 @@ static int cmd_help( char *args[], WRBUF outbuff) /* If Zebra reports an error after an operation, * append it to the outbuff and log it */ -static void Zerrors ( WRBUF outbuff) +static void Zerrors (WRBUF outbuff) { int ec; if (!zh) @@ -755,7 +757,6 @@ static void Zerrors ( WRBUF outbuff) wrbuf_printf(outbuff, " Zebra error %d: %s, (%s)\n", ec, zebra_errString (zh), zebra_errAdd (zh) ); - zebra_clearError(zh); } } @@ -860,3 +861,11 @@ int main (int argc, char ** argv) shell(); return 0; } /* main */ +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +