X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Futils%2Fsendcommand.c;fp=citadel%2Futils%2Fsendcommand.c;h=5ee87fd41d7fc09801761e8772150211607502af;hp=6146dbb654f7a8ae845cc9012f96dce5f84a3238;hb=6ecbe54a1f1e88ececca803d8f64ad3401c9e7eb;hpb=4ac15ab9435ec289998b7082a84ff0d4d8ea280d diff --git a/citadel/utils/sendcommand.c b/citadel/utils/sendcommand.c index 6146dbb65..5ee87fd41 100644 --- a/citadel/utils/sendcommand.c +++ b/citadel/utils/sendcommand.c @@ -150,6 +150,8 @@ int main(int argc, char **argv) char relhome[PATH_MAX]=""; char ctdldir[PATH_MAX]=CTDLDIR; + StartLibCitadel(SIZ); + /* Parse command line */ while ((a = getopt(argc, argv, "h:w:")) != EOF) { switch (a) { @@ -179,7 +181,7 @@ int main(int argc, char **argv) ); fflush(stderr); -// alarm(watchdog); + alarm(watchdog); serv_sock = uds_connectsock(file_citadel_admin_socket); serv_gets(buf); @@ -210,8 +212,10 @@ int main(int argc, char **argv) IOB.fd = serv_sock; FDIOBufferInit(&FDIO, &IOB, fileno(stdin), -1); - while (FileSendChunked(&FDIO, &ErrStr)); + while (FileSendChunked(&FDIO, &ErrStr) >= 0); alarm(watchdog); /* reset the watchdog timer */ + if (ErrStr != NULL) + fprintf(stderr, "Error while piping stuff: %s\n", ErrStr); FDIOBufferDelete(&FDIO); FreeStrBuf(&IOB.Buf); serv_puts("000"); @@ -251,7 +255,7 @@ int main(int argc, char **argv) } StrBufAppendBuf(OutBuf, Line, 0); StrBufAppendBufPlain(OutBuf, HKEY("\n"), 0); -// alarm(watchdog); /* reset the watchdog timer */ + alarm(watchdog); /* reset the watchdog timer */ break; case eBufferNotEmpty: break;