identify.c: Stash a copy of the caller's description string.

[fwd] / fwd.c

diff --git a/fwd.c b/fwd.c
index df5c821..0455bc4 100644 (file)
--- a/fwd.c
+++ b/fwd.c
@@ -29,6 +29,7 @@
 /*----- Global variables --------------------------------------------------*/
 
 sel_state *sel;                                /* Multiplexor for nonblocking I/O */
+unsigned flags = 0;                    /* Global state flags */
 
 /*----- Static variables --------------------------------------------------*/
 
@@ -37,14 +38,9 @@ typedef struct conffile {
   char *name;
 } conffile;
 
-static unsigned flags = 0;             /* Global state flags */
 static unsigned active = 0;            /* Number of active things */
 static conffile *conffiles = 0;                /* List of configuration files */
 
-#define FW_SYSLOG 1u
-#define FW_QUIET 2u
-#define FW_SET 4u
-
 /*----- Configuration parsing ---------------------------------------------*/
 
 /* --- @parse@ --- *
@@ -245,7 +241,7 @@ void fw_log(time_t t, const char *fmt, ...)
     t = time(0);
   tm = localtime(&t);
   DENSURE(&d, 64);
-  d.len += strftime(d.buf, d.sz, "%Y-%m-%d %H:%M:%S ", tm);
+  d.len += strftime(d.buf, d.sz, "%Y-%m-%d %H:%M:%S %z ", tm);
   va_start(ap, fmt);
   dstr_vputf(&d, fmt, &ap);
   va_end(ap);
@@ -487,7 +483,7 @@ int main(int argc, char *argv[])
 
       /* --- Standard GNU help options --- */
 
-      { "help",        0,              0,      'h' },
+      { "help",                0,              0,      'h' },
       { "version",     0,              0,      'v' },
       { "usage",       0,              0,      'u' },