applied Eric's config.def.h patch

diff --git a/Makefile b/Makefile
index d77b4f218721fef253b1261598b0037dc8d731dd..6fdcfbb7dcfa5c509052ef11605070475f205022 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,11 @@ options:
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 
-${OBJ}: config.mk util.c
+${OBJ}: config.h config.mk util.c
+
+config.h:
+       @echo creating $@ from config.def.h
+       @cp config.def.h $@
 
 sic: ${OBJ}
        @echo CC -o $@

diff --git a/config.def.h b/config.def.h
new file mode 100644 (file)
index 0000000..6bbad14
--- /dev/null
+++ b/config.def.h
@@ -0,0 +1,8 @@
+// Host used when "-h" is not given
+#define DEFAULT_HOST "irc.oftc.net"
+
+// Port used when "-p" is not given
+#define DEFAULT_PORT "6667"
+
+// Timestamp format; see strftime(3)
+#define TIMESTAMP_FORMAT "%F %R"

diff --git a/sic.c b/sic.c
index d93c2ec6f056a9e10fd1bc7f408a4f198e8f8db6..7a3edee0a7a816d1e3f04878680f180fa952f6e6 100644 (file)
--- a/sic.c
+++ b/sic.c
@@ -8,8 +8,10 @@
 #include <time.h>
 #include <unistd.h>
 
-static char *host = "irc.oftc.net";
-static char *port = "6667";
+#include "config.h"
+
+static char *host = DEFAULT_HOST;
+static char *port = DEFAULT_PORT;
 static char *password;
 static char nick[32];
 static char bufin[4096];
@@ -22,7 +24,7 @@ static FILE *srv;
 
 static void
 pout(char *channel, char *fmt, ...) {
-       static char timestr[18];
+       static char timestr[80];
        time_t t;
        va_list ap;
 
@@ -30,7 +32,7 @@ pout(char *channel, char *fmt, ...) {
        vsnprintf(bufout, sizeof bufout, fmt, ap);
        va_end(ap);
        t = time(NULL);
-       strftime(timestr, sizeof timestr, "%D %R", localtime(&t));
+       strftime(timestr, sizeof timestr, TIMESTAMP_FORMAT, localtime(&t));
        fprintf(stdout, "%-12s: %s %s\n", channel, timestr, bufout);
 }