Implement feature for getting quotes from an external process

Makefile

@@ -1,7 +1,7 @@
 # Makefile
 #
 # qotd - A simple QOTD daemon.
-# Copyright (c) 2015-2016 Emmie Smith
+# Copyright (c) 2015-2024 Emmie Smith
 #
 # qotd is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

man/Makefile

@@ -1,7 +1,7 @@
 # Makefile
 #
 # qotd - A simple QOTD daemon.
-# Copyright (c) 2015-2016 Emmie Smith
+# Copyright (c) 2015-2024 Emmie Smith
 #
 # qotd is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

man/qotd.conf.5

@@ -1,4 +1,4 @@
-.TH QOTD.CONF 5 2016-01-29 "qotd 0.12.0" "System Manager's Manual"
+.TH QOTD.CONF 5 2024-01-29 "qotd 0.12.0" "System Manager's Manual"
 .\" %%%LICENSE_START(GPLv2+_DOC_FULL)
 .\" This is free documentation; you can redistribute it and/or
 .\" modify it under the terms of the GNU General Public License as

man/qotdd.8

@@ -1,4 +1,4 @@
-.TH QOTDD 8 2016-01-29 "qotd 0.12.0" "System Manager's Manual"
+.TH QOTDD 8 2024-01-29 "qotd 0.12.0" "System Manager's Manual"
 .\" %%%LICENSE_START(GPLv2+_DOC_FULL)
 .\" This is free documentation; you can redistribute it and/or
 .\" modify it under the terms of the GNU General Public License as

misc/local-bg.conf

@@ -18,4 +18,3 @@ PadQuotes yes
 
 DailyQuotes yes
 AllowBigQuotes no
-

misc/local-file.conf

@@ -17,4 +17,3 @@ PadQuotes yes
 
 DailyQuotes yes
 AllowBigQuotes no
-

misc/local.conf

@@ -17,4 +17,3 @@ PadQuotes yes
 
 DailyQuotes yes
 AllowBigQuotes no
-

misc/qotd.conf

@@ -66,4 +66,3 @@ DailyQuotes yes
 # option is set to 'yes', this limit is ignored. Otherwise, quotes are
 # automatically truncated to meet the byte limit.
 AllowBigQuotes no
-

src/Makefile

@@ -1,7 +1,7 @@
 # Makefile
 #
 # qotd - A simple QOTD daemon.
-# Copyright (c) 2015-2016 Emmie Smith
+# Copyright (c) 2015-2024 Emmie Smith
 #
 # qotd is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/arguments.c

@@ -2,7 +2,7 @@
  * arguments.c
  *
  * qotd - A simple QOTD daemon.
- * Copyright (c) 2015-2016 Emmie Smith
+ * Copyright (c) 2015-2024 Emmie Smith
  *
  * qotd is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -189,8 +189,9 @@ static void parse_short_options(const char *argument,
 {
 	size_t i;
 
-	if (DEBUG)
+	if (DEBUG) {
 		journal("Parsing options in \"-%s\":\n", argument);
+	}
 
 	for (i = 0; argument[i]; i++) {
 #if DEBUG
@@ -429,8 +430,9 @@ void parse_args(struct options *const opt,
 	opt->strict = flags.strict;
 
 	if (flags.conf_file) {
-		if (flags.conf_file[0] != '/')
+		if (flags.conf_file[0] != '/') {
 			opt->chdir_root = 0;
+		}
 		parse_config(opt, flags.conf_file);
 	}
 	if (flags.pid_file) {

src/arguments.h

@@ -2,7 +2,7 @@
  * arguments.h
  *
  * qotd - A simple QOTD daemon.
- * Copyright (c) 2015-2016 Emmie Smith
+ * Copyright (c) 2015-2024 Emmie Smith
  *
  * qotd is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/config.c

@@ -2,7 +2,7 @@
  * configuration.c
  *
  * qotd - A simple QOTD daemon.
- * Copyright (c) 2015-2016 Emmie Smith
+ * Copyright (c) 2015-2024 Emmie Smith
  *
  * qotd is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,8 +57,9 @@ static int caseless_eq(const struct string *x,
 	size_t i;
 	char c1, c2;
 
-	if (x->length != y_len)
+	if (x->length != y_len) {
 		return 0;
+	}
 	for (i = 0; i < y_len; i++) {
 		c1 = tolower(x->ptr[i]);
 		c2 = tolower(y[i]);
@@ -72,8 +73,9 @@ static void print_str(FILE *out, const struct string *s)
 {
 	size_t i;
 
-	for (i = 0; i < s->length; i++)
+	for (i = 0; i < s->length; i++) {
 		putc(s->ptr[i], out);
+	}
 	putc('\n', out);
 }
 
@@ -82,8 +84,9 @@ static char *dup_str(const struct string *s)
 	char *buf;
 
 	buf = malloc(s->length + 1);
-	if (unlikely(!buf))
+	if (unlikely(!buf)) {
 		return NULL;
+	}
 
 	memcpy(buf, s->ptr, s->length);
 	buf[s->length] = '\0';
@@ -193,12 +196,13 @@ static int str_to_bool(const struct string *s,
 {
 	if (caseless_eq(s, "yes", 3) ||
 	    caseless_eq(s, "true", 4) ||
-	    caseless_eq(s, "1", 1))
+	    caseless_eq(s, "1", 1)) {
 		return 1;
-	else if (caseless_eq(s, "no", 2) ||
+	} else if (caseless_eq(s, "no", 2) ||
 		 caseless_eq(s, "false", 5) ||
-		 caseless_eq(s, "0", 1))
+		 caseless_eq(s, "0", 1)) {
 		return 0;
+	}
 
 	fprintf(stderr, "%s:%u: not a boolean value: ",
 		filename, lineno);
@@ -236,8 +240,9 @@ static int process_line(struct options *opt,
 	struct string key, val;
 	int n;
 
-	if (read_kv(conf_file, lineno, line, &key, &val))
+	if (read_kv(conf_file, lineno, line, &key, &val)) {
 		return key.ptr != NULL;
+	}
 
 	if (DEBUG) {
 		fputs("\tKey: ", stdout);
@@ -249,8 +254,9 @@ static int process_line(struct options *opt,
 	/* Check each possible option */
 	if (caseless_eq(&key, "Daemonize", 9)) {
 		n = str_to_bool(&val, conf_file, lineno);
-		if (unlikely(NOT_BOOL(n)))
+		if (unlikely(NOT_BOOL(n))) {
 			return -1;
+		}
 		opt->daemonize = n;
 	} else if (caseless_eq(&key, "TransportProtocol", 17)) {
 		if (caseless_eq(&val, "tcp", 3)) {
@@ -278,18 +284,21 @@ static int process_line(struct options *opt,
 		}
 	} else if (caseless_eq(&key, "Port", 4)) {
 		n = get_port(&val, conf_file, lineno);
-		if (unlikely(n < 0))
+		if (unlikely(n < 0)) {
 			return -1;
+		}
 		opt->port = n;
 	} else if (caseless_eq(&key, "StrictChecking", 14)) {
 		n = str_to_bool(&val, conf_file, lineno);
-		if (unlikely(NOT_BOOL(n)))
+		if (unlikely(NOT_BOOL(n))) {
 			return -1;
+		}
 		opt->strict = n;
 	} else if (caseless_eq(&key, "DropPrivileges", 14)) {
 		n = str_to_bool(&val, conf_file, lineno);
-		if (unlikely(NOT_BOOL(n)))
+		if (unlikely(NOT_BOOL(n))) {
 			return -1;
+		}
 		opt->drop_privileges = n;
 	} else if (caseless_eq(&key, "PidFile", 7)) {
 		if (caseless_eq(&val, "none", 4)) {
@@ -304,8 +313,9 @@ static int process_line(struct options *opt,
 		}
 	} else if (caseless_eq(&key, "RequirePidFile", 14)) {
 		n = str_to_bool(&val, conf_file, lineno);
-		if (unlikely(NOT_BOOL(n)))
+		if (unlikely(NOT_BOOL(n))) {
 			return -1;
+		}
 		opt->require_pidfile = n;
 	} else if (caseless_eq(&key, "JournalFile", 11)) {
 		if (caseless_eq(&val, "-", 1)) {
@@ -338,18 +348,21 @@ static int process_line(struct options *opt,
 		}
 	} else if (caseless_eq(&key, "PadQuotes", 9)) {
 		n = str_to_bool(&val, conf_file, lineno);
-		if (unlikely(NOT_BOOL(n)))
+		if (unlikely(NOT_BOOL(n))) {
 			return -1;
+		}
 		opt->pad_quotes = n;
 	} else if (caseless_eq(&key, "DailyQuotes", 11)) {
 		n = str_to_bool(&val, conf_file, lineno);
-		if (unlikely(NOT_BOOL(n)))
+		if (unlikely(NOT_BOOL(n))) {
 			return -1;
+		}
 		opt->is_daily = n;
 	} else if (caseless_eq(&key, "AllowBigQuotes", 14)) {
 		n = str_to_bool(&val, conf_file, lineno);
-		if (unlikely(NOT_BOOL(n)))
+		if (unlikely(NOT_BOOL(n))) {
 			return -1;
+		}
 		opt->allow_big = n;
 	} else {
 		fprintf(stderr, "%s:%u: unknown config option: ",
@@ -369,8 +382,9 @@ void parse_config(struct options *opt, const char *conf_file)
 	/* Journal hasn't been opened yet */
 	printf("Reading configuration file at \"%s\"...\n", conf_file);
 
-	if (opt->strict)
+	if (opt->strict) {
 		security_conf_file_check(conf_file);
+	}
 
 	fh = fopen(conf_file, "r");
 	if (!fh) {
@@ -385,8 +399,9 @@ void parse_config(struct options *opt, const char *conf_file)
 	lineno = 1;
 	errors = 0;
 	while (!read_line(fh, conf_file, &lineno, &line)) {
-		if (process_line(opt, conf_file, lineno, &line))
+		if (process_line(opt, conf_file, lineno, &line)) {
 			errors++;
+		}
 		lineno++;
 	}
 	fclose(fh);

src/config.h

@@ -2,7 +2,7 @@
  * config.h
  *
  * qotd - A simple QOTD daemon.
- * Copyright (c) 2015-2016 Emmie Smith
+ * Copyright (c) 2015-2024 Emmie Smith
  *
  * qotd is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/core.c

@@ -2,7 +2,7 @@
  * core.h
  *
  * qotd - A simple QOTD daemon.
- * Copyright (c) 2015-2016 Emmie Smith
+ * Copyright (c) 2015-2024 Emmie Smith
  *
  * qotd is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/core.h

@@ -2,7 +2,7 @@
  * core.h
  *
  * qotd - A simple QOTD daemon.
- * Copyright (c) 2015-2016 Emmie Smith
+ * Copyright (c) 2015-2024 Emmie Smith
  *
  * qotd is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -125,6 +125,10 @@
 # define NORETURN
 #endif /* __GNUC__ || __clang__ */
 
+/* Constants */
+
+#define QUOTE_SIZE				512  /* Set by RFC 865 */
+
 /* Functions */
 
 void print_version(void);

src/daemon.c

@@ -2,7 +2,7 @@
  * daemon.c
  *
  * qotd - A simple QOTD daemon.
- * Copyright (c) 2015-2016 Emmie Smith
+ * Copyright (c) 2015-2024 Emmie Smith
  *
  * qotd is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,9 +32,9 @@
 #include "journal.h"
 #include "network.h"
 #include "pid_file.h"
-#include "quotes.h"
+#include "quotes_file.h"
 #include "security.h"
-#include "signal_hndl.h"
+#include "signal_handler.h"
 
 static struct options opt;
 
@@ -70,8 +70,9 @@ static int main_loop(void)
 		cleanup(EXIT_INTERNAL, 1);
 	}
 
-	if (opt.drop_privileges)
+	if (opt.drop_privileges) {
 		drop_privileges();
+	}
 
 	switch (opt.tproto) {
 	case PROTOCOL_TCP:
@@ -88,8 +89,9 @@ static int main_loop(void)
 		return -1;
 	}
 
-	for (;;)
+	for (;;) {
 		accept_connection();
+	}
 }
 
 static int daemonize(void)
@@ -121,24 +123,27 @@ static int daemonize(void)
 
 int main(const int argc, const char *const argv[])
 {
-	if (DEBUG)
+	if (DEBUG) {
 		printf("(Running in debug mode)\n");
+	}
 
-	signal_hndl_init();
+	signal_handler_init();
 	load_config(argc, argv);
 	open_journal(opt.journal_file);
 
 	/* Check security settings */
-	if (opt.strict)
+	if (opt.strict) {
 		security_options_check(&opt);
+	}
 
 	return opt.daemonize ? daemonize() : main_loop();
 }
 
 void cleanup(int ret, int quiet)
 {
-	if (!quiet)
+	if (!quiet) {
 		journal("Quitting with exit code %d.\n", ret);
+	}
 
 	pidfile_remove(&opt);
 	destroy_quote_buffers();

src/daemon.h

@@ -2,7 +2,7 @@
  * daemon.h
  *
  * qotd - A simple QOTD daemon.
- * Copyright (c) 2015-2016 Emmie Smith
+ * Copyright (c) 2015-2024 Emmie Smith
  *
  * qotd is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by