debian/control: Remove the Ethereal->Wireshark transition machinery.

[tripe] / client / tripectl.c

diff --git a/client/tripectl.c b/client/tripectl.c
index e5f086fdc5cee05d7ed9aba49731ea7f73510258..e264a7346375edfeeeed29553cf252ce7b754568 100644 (file)
--- a/client/tripectl.c
+++ b/client/tripectl.c
@@ -81,6 +81,7 @@ static const char *pidfile = 0;
 static const char *logname = 0;
 static FILE *logfp = 0;
 static unsigned f = 0;
+static const char *watch = 0;
 static int fd;
 static const char *bgtag = 0;
 
@@ -94,6 +95,7 @@ static const char *bgtag = 0;
 #define f_warn 128u
 #define f_uclose 256u
 #define f_losing 512u
+#define f_nostamp 1024u
 
 /*----- Main code ---------------------------------------------------------*/
 
@@ -110,8 +112,9 @@ static void writelog(const char *cat, const char *msg)
   char buf[256];
   time_t t = time(0);
   struct tm *tm = localtime(&t);
-  strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tm);
-  fprintf(logfp, "%s %s: %s\n", buf, cat, msg);
+  if (f & f_nostamp) buf[0] = 0;
+  else strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S ", tm);
+  fprintf(logfp, "%s%s: %s\n", buf, cat, msg);
 }
 
 static void checkbg(char **p)
@@ -163,9 +166,9 @@ static void cline(char *p, size_t len, void *b)
   if (!q)
     return;
   if (strcmp(q, "WARN") == 0)
-    dolog(LOG_WARNING, p);
+    dolog(LOG_WARNING, "%s", p);
   else if (strcmp(q, "TRACE") == 0)
-    dolog(LOG_DEBUG, p);
+    dolog(LOG_DEBUG, "%s", p);
   else if (!(f & f_command))
     dolog(LOG_ERR, "unexpected output `%s %s'", q, p);
   else if (strcmp(q, "FAIL") == 0) {
@@ -274,7 +277,11 @@ static void logfile(const char *name)
 {
   FILE *fp;
 
-  if ((fp = fopen(name, "a")) != 0) {
+  if (strcmp(name, "-") == 0)
+    logfp = stdout;
+  else if (strcmp(name, "!") == 0)
+    logfp = stderr;
+  else if ((fp = fopen(name, "a")) != 0) {
     if (logfp)
       fclose(logfp);
     logfp =  fp;
@@ -285,7 +292,7 @@ static void logfile(const char *name)
     if (logfp)
       writelog("error", d.buf);
     else if (logname)
-      die(EXIT_FAILURE, d.buf);
+      die(EXIT_FAILURE, "%s", d.buf);
     if (f & f_syslog)
       syslog(LOG_ERR, "%s", d.buf);
     dstr_destroy(&d);
@@ -354,7 +361,9 @@ Options in full:\n\
 \n\
 -l, --syslog           Log messages to system log.\n\
 -f, --logfile=FILE     Log messages to FILE.\n\
+-t, --no-timestamp     When logging to a file, don't emit timestamps.\n\
 -w, --warnings         Show warnings when running commands.\n\
+-W, --watch=THINGS     Watch for THINGS after connecting.\n\
 ", fp);
 }
 
@@ -406,12 +415,14 @@ int main(int argc, char *argv[])
       { "spawn-args",  OPTF_ARGREQ,    0,      'S' },
       { "syslog",      0,              0,      'l' },
       { "logfile",     OPTF_ARGREQ,    0,      'f' },
+      { "no-timestamp",        0,              0,      't' },
       { "warnings",    0,              0,      'w' },
+      { "watch",       OPTF_ARGREQ,    0,      'W' },
       { "pidfile",     OPTF_ARGREQ,    0,      'P' },
       { 0,             0,              0,      0 }
     };
 
-    i = mdwopt(argc, argv, "+hvuDU:G:d:a:sp:S:lwf:nP:", opts, 0, 0, 0);
+    i = mdwopt(argc, argv, "+hvuDU:G:d:a:sp:S:lwW:f:nP:t", opts, 0, 0, 0);
     if (i < 0)
       break;
     switch (i) {
@@ -457,10 +468,16 @@ int main(int argc, char *argv[])
       case 'w':
        f |= f_warn;
        break;
+      case 'W':
+       watch = optarg;
+       break;
       case 'f':
        logname = optarg;
        f |= f_noinput;
        break;
+      case 't':
+       f |= f_nostamp;
+       break;
       case 'P':
        pidfile = optarg;
        break;
@@ -567,8 +584,12 @@ int main(int argc, char *argv[])
 
   /* --- If we're meant to be interactive, do that --- */
 
-  if (optind == argc)
-    setup("WATCH -A+tw");
+  if (optind == argc) {
+    DRESET(&d);
+    dstr_puts(&d, "watch");
+    u_quotify(&d, watch ? watch : "-A+tw");
+    setup(d.buf);
+  }
   if (!(f & f_noinput) && optind == argc) {
     selbuf_init(&bu, &sel, STDIN_FILENO, uline, &bu);
     selbuf_init(&bs, &sel, fd, sline, &bs);
@@ -581,7 +602,11 @@ int main(int argc, char *argv[])
   /* --- If there's a command, submit it --- */
 
   if (optind < argc) {
-    setup((f & f_warn) ? "WATCH -A+w" : "WATCH -A");
+    DRESET(&d);
+    dstr_puts(&d, "watch");
+    u_quotify(&d, watch ? watch : (f & f_warn) ? "-A+w" : "-A");
+    setup(d.buf);
+    DRESET(&d);
     while (optind < argc)
       u_quotify(&d, argv[optind++]);
     dstr_putc(&d, '\n');