* extract_token() now expects to be supplied with the size of the

[citadel.git] / citadel / userlist.c

diff --git a/citadel/userlist.c b/citadel/userlist.c
index bd59f04a582cf1f4cef04f742065eafa7740339a..59a398d7999843eb238a50e94d514e9335c9e04e 100644 (file)
--- a/citadel/userlist.c
+++ b/citadel/userlist.c
@@ -23,64 +23,67 @@
 
 #include "citadel.h"
 #include <unistd.h>
-#include "ipc.h"
+#include "citadel_ipc.h"
 #include "tools.h"
 
 void logoff(int code)
 {
        exit(code);
-       }
+}
 
-void userlist(void) { 
+void userlist(CtdlIPC *ipc) { 
        char buf[SIZ];
        char fl[SIZ];
-       struct tm *tmbuf;
+       struct tm tmbuf;
        time_t lc;
+       char *listing = NULL;
+       int r;
 
-       serv_puts("LIST");
-       serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("%s\n",&buf[4]);
+       r = CtdlIPCUserListing(ipc, &listing, buf);
+       if (r / 100 != 1) {
+               printf("%s\n", buf);
                return;
-               }
+       }
        printf("       User Name           Num  L  LastCall  Calls Posts\n");
        printf("------------------------- ----- - ---------- ----- -----\n");
-       while (serv_gets(buf), strcmp(buf,"000")) {
-               extract(fl,buf,0);
+       while (strlen(listing) > 0) {
+               extract_token(buf, listing, 0, '\n', sizeof buf);
+               remove_token(listing, 0, '\n');
+               extract_token(fl, buf, 0, '|', sizeof fl);
                printf("%-25s ",fl);
-               printf("%5ld %d ",extract_long(buf,2),
+               printf("%5ld %d ", extract_long(buf,2),
                        extract_int(buf,1));
                lc = extract_long(buf,3);
-               tmbuf = (struct tm *)localtime(&lc);
+               localtime_r(&lc, &tmbuf);
                printf("%02d/%02d/%04d ",
-                       (tmbuf->tm_mon+1),
-                       tmbuf->tm_mday,
-                       (tmbuf->tm_year + 1900));
+                       (tmbuf.tm_mon+1),
+                       tmbuf.tm_mday,
+                       (tmbuf.tm_year + 1900));
                printf("%5ld %5ld\n",
                        extract_long(buf,4),extract_long(buf,5));
-               }
-       printf("\n");
        }
+       printf("\n");
+}
 
 
 int main(int argc, char **argv)
 {
        char buf[SIZ];
        char hostbuf[SIZ], portbuf[SIZ];
+       CtdlIPC *ipc = NULL;
 
-       attach_to_server(argc, argv, hostbuf, portbuf);
-       serv_gets(buf);
+       ipc = CtdlIPC_new(argc, argv, hostbuf, portbuf);
+       CtdlIPC_chat_recv(ipc, buf);
        if ((buf[0]!='2')&&(strncmp(buf,"551",3))) {
                fprintf(stderr,"%s: %s\n",argv[0],&buf[4]);
                logoff(atoi(buf));
-               }
+       }
 
-       userlist();
+       userlist(ipc);
 
-       serv_puts("QUIT");
-       serv_gets(buf);
+       CtdlIPCQuit(ipc);
        exit(0);
-       }
+}
 
 
 #ifndef HAVE_STRERROR
@@ -91,12 +94,7 @@ char *strerror(int e)
 {
        static char buf[32];
 
-       sprintf(buf,"errno = %d",e);
+       snprintf(buf, sizeof buf, "errno = %d",e);
        return(buf);
-       }
+}
 #endif
-
-
-
-
-