From 4631b52d11b483f9a344198a0581f4e8ce127ef6 Mon Sep 17 00:00:00 2001 From: Thibault Godouet Date: Sat, 24 Aug 2024 23:27:47 +0100 Subject: [PATCH] Rename option displayname to maildisplayname. --- Makefile.in | 76 ++++++++++++++++++++-------------------- configure.in | 7 ++-- doc/en/fcron.conf.5.sgml | 4 +-- doc/fcron-doc.mod.in | 2 +- fcronconf.c | 12 +++---- fcronconf.h | 2 +- files/fcron.conf.in | 4 +-- job.c | 6 ++-- mail.c | 2 +- mail.h | 2 +- script/gen-in.pl | 2 +- test/mailbox_addr.c | 18 +++++----- 12 files changed, 69 insertions(+), 68 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4c046dc..c82582f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,42 +20,42 @@ SRCDIR := @srcdir@ DESTDIR := # Where should we install it ? -prefix = @prefix@ -exec_prefix = @exec_prefix@ -DESTSBIN = @sbindir@ -DESTBIN = @bindir@ -ETC = @sysconfdir@ -FCRONTABS = @FCRONTABS@ -PIDDIR = @PIDDIR@ -FIFODIR = @FIFODIR@ -PIDFILE = @PIDFILE@ -REBOOT_LOCK = @REBOOT_LOCK@ -SUSPEND_FILE = @SUSPEND_FILE@ -FIFOFILE = @FIFOFILE@ -FCRON_SHELL = @FCRON_SHELL@ -SENDMAIL = @SENDMAIL@ -FCRON_EDITOR = @FCRON_EDITOR@ -OPTIM := @CFLAGS@ -LDFLAGS := @LDFLAGS@ -CPPFLAGS := @CPPFLAGS@ -I. -I${SRCDIR} -LIBS := @LIBS@ -LIBOBJS := @LIBOBJS@ -DEFS := @DEFS@ -CC := @CC@ -INSTALL := @INSTALL@ -STRIP := @STRIP@ -ROOTNAME := @ROOTNAME@ -ROOTGROUP := @ROOTGROUP@ -USERNAME := @USERNAME@ -GROUPNAME := @GROUPNAME@ -SYSFCRONTAB := @SYSFCRONTAB@ -DEBUG := @DEBUG@ -BOOTINSTALL := @BOOTINSTALL@ -ANSWERALL := @ANSWERALL@ -USEPAM := @USEPAM@ -FCRONDYN := @FCRONDYN@ -SYSTEMD_DIR := @SYSTEMD_DIR@ -DISPLAYNAME := @DISPLAYNAME@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +DESTSBIN = @sbindir@ +DESTBIN = @bindir@ +ETC = @sysconfdir@ +FCRONTABS = @FCRONTABS@ +PIDDIR = @PIDDIR@ +FIFODIR = @FIFODIR@ +PIDFILE = @PIDFILE@ +REBOOT_LOCK = @REBOOT_LOCK@ +SUSPEND_FILE = @SUSPEND_FILE@ +FIFOFILE = @FIFOFILE@ +FCRON_SHELL = @FCRON_SHELL@ +SENDMAIL = @SENDMAIL@ +FCRON_EDITOR = @FCRON_EDITOR@ +OPTIM := @CFLAGS@ +LDFLAGS := @LDFLAGS@ +CPPFLAGS := @CPPFLAGS@ -I. -I${SRCDIR} +LIBS := @LIBS@ +LIBOBJS := @LIBOBJS@ +DEFS := @DEFS@ +CC := @CC@ +INSTALL := @INSTALL@ +STRIP := @STRIP@ +ROOTNAME := @ROOTNAME@ +ROOTGROUP := @ROOTGROUP@ +USERNAME := @USERNAME@ +GROUPNAME := @GROUPNAME@ +SYSFCRONTAB := @SYSFCRONTAB@ +DEBUG := @DEBUG@ +BOOTINSTALL := @BOOTINSTALL@ +ANSWERALL := @ANSWERALL@ +USEPAM := @USEPAM@ +FCRONDYN := @FCRONDYN@ +SYSTEMD_DIR := @SYSTEMD_DIR@ +MAILDISPLAYNAME := @MAILDISPLAYNAME@ # Options # -DDEBUG even more verbose @@ -127,7 +127,7 @@ exe_list_test: exe_list.o u_list.o exe_list_test.o log.o subs.o -DFCRONTABS="\"${FCRONTABS}\"" \ -DFCRON_ALLOW="\"${FCRON_ALLOW}\"" -DFCRON_DENY="\"${FCRON_DENY}\"" \ -DFCRON_SHELL="\"${FCRON_SHELL}\"" -DSENDMAIL="\"${SENDMAIL}\"" \ - -DFCRON_EDITOR="\"${FCRON_EDITOR}\"" \-DDISPLAYNAME="\"${DISPLAYNAME}\"" -DBINDIREX="\"${DESTBIN}\"" \ + -DFCRON_EDITOR="\"${FCRON_EDITOR}\"" \-DMAILDISPLAYNAME="\"${MAILDISPLAYNAME}\"" -DBINDIREX="\"${DESTBIN}\"" \ -c $< initscripts: @@ -140,7 +140,7 @@ documentation: $(MAKE) -C doc doc-if-none .PHONY: test -test: +test: fcron $(MAKE) -C test tests diff --git a/configure.in b/configure.in index b2c7977..374f19c 100644 --- a/configure.in +++ b/configure.in @@ -181,9 +181,10 @@ AC_ARG_ENABLE(checks, esac ]) -DISPLAYNAME= -AC_MSG_RESULT([$DISPLAYNAME]) -AC_SUBST([DISPLAYNAME]) +MAILDISPLAYNAME="" +AC_MSG_CHECKING([mail display name]) +AC_MSG_RESULT([$MAILDISPLAYNAME]) +AC_SUBST([MAILDISPLAYNAME]) dnl --------------------------------------------------------------------- diff --git a/doc/en/fcron.conf.5.sgml b/doc/en/fcron.conf.5.sgml index 8f1d00d..afc25fe 100644 --- a/doc/en/fcron.conf.5.sgml +++ b/doc/en/fcron.conf.5.sgml @@ -154,8 +154,8 @@ A copy of the license is included in gfdl.sgml. - displayname=string - () + maildisplayname=string + () diff --git a/doc/fcron-doc.mod.in b/doc/fcron-doc.mod.in index 74344b9..8a5b21a 100644 --- a/doc/fcron-doc.mod.in +++ b/doc/fcron-doc.mod.in @@ -42,7 +42,7 @@ - + diff --git a/fcronconf.c b/fcronconf.c index d743ea6..bf32711 100644 --- a/fcronconf.c +++ b/fcronconf.c @@ -45,7 +45,7 @@ char *fcrondeny = NULL; char *shell = NULL; char *sendmail = NULL; char *editor = NULL; -char *displayname = NULL; +char *maildisplayname = NULL; void init_conf(void) @@ -68,7 +68,7 @@ init_conf(void) sendmail = strdup2(SENDMAIL); #endif editor = strdup2(FCRON_EDITOR); - displayname = strdup2(DISPLAYNAME); + maildisplayname = strdup2(MAILDISPLAYNAME); } void @@ -85,7 +85,7 @@ free_conf(void) Free_safe(shell); Free_safe(sendmail); Free_safe(editor); - Free_safe(displayname); + Free_safe(maildisplayname); } void @@ -192,9 +192,9 @@ read_conf(void) else if (strncmp(ptr1, "editor", namesize) == 0) { Set(editor, ptr2); } - else if (strncmp(ptr1, "displayname", namesize) == 0) { - char *output = format_displayname(ptr2); - Set(displayname, output ? output : ""); + else if (strncmp(ptr1, "maildisplayname", namesize) == 0) { + char *output = format_maildisplayname(ptr2); + Set(maildisplayname, output ? output : ""); Free_safe(output); } else diff --git a/fcronconf.h b/fcronconf.h index d3b03ce..d9a93e6 100644 --- a/fcronconf.h +++ b/fcronconf.h @@ -43,7 +43,7 @@ extern char *fifofile; extern char *editor; extern char *shell; extern char *sendmail; -extern char *displayname; +extern char *maildisplayname; /* end of global variables */ /* functions prototypes */ diff --git a/files/fcron.conf.in b/files/fcron.conf.in index 108696a..68b0935 100644 --- a/files/fcron.conf.in +++ b/files/fcron.conf.in @@ -29,7 +29,7 @@ editor = @@FCRON_EDITOR@ # was added -- not RFC5322-compliant, though. # The default will soon be the sane RFC5322-compliant: # -# displayname = Fcron Daemon +# maildisplayname = Fcron Daemon # # Please read fcron.conf(5) before setting it! -displayname = @@DISPLAYNAME@ +maildisplayname = @@MAILDISPLAYNAME@ diff --git a/job.c b/job.c index f956fb4..9afddfa 100644 --- a/job.c +++ b/job.c @@ -320,10 +320,10 @@ create_mail(cl_t * line, char *subject, char *content_type, char *encoding, hostname[0] = '\0'; #endif /* HAVE_GETHOSTNAME */ - /* write mail header. Global 'displayname' comes from fcronconf.h */ - if (displayname[0] != '\0'){ + /* write mail header. Global 'maildisplayname' comes from fcronconf.h */ + if (maildisplayname[0] != '\0'){ /* New behavior -- RFC-compliant */ - mailbox_addr = make_mailbox_addr(displayname, mailfrom, hostname_from); + mailbox_addr = make_mailbox_addr(maildisplayname, mailfrom, hostname_from); if (! mailbox_addr) { warn("could not make the mailbox address"); } diff --git a/mail.c b/mail.c index e42a5ca..9596861 100644 --- a/mail.c +++ b/mail.c @@ -26,7 +26,7 @@ #include "mail.h" char -*format_displayname(char *displayname_conf) +*format_maildisplayname(char *displayname_conf) /* Format the input string `conf_value` according to RFC5322 sec. 3.2.3. * . * Returns: either the formatted displayname (possibly unchanged or empty) diff --git a/mail.h b/mail.h index ff16064..d9157a2 100644 --- a/mail.h +++ b/mail.h @@ -29,7 +29,7 @@ #define FROM_HEADER_KEY "From: " #define MAIL_FROM_VALUE_LEN_MAX (MAIL_LINE_LEN_MAX - sizeof(FROM_HEADER_KEY)) -extern char *format_displayname(char *displayname_conf); +extern char *format_maildisplayname(char *displayname_conf); extern char *make_mailbox_addr(char *displayname_conf, char *mail_from, char *hostname); #endif /* __MAIL_H__ */ diff --git a/script/gen-in.pl b/script/gen-in.pl index 5bc4de9..574e7fe 100755 --- a/script/gen-in.pl +++ b/script/gen-in.pl @@ -30,7 +30,7 @@ close(CONFIG); open(MAKEFILE, "$ARGV[2]/Makefile") or print "error while opening Makefile: $!\n" and exit; while ( ) { - if ( /^\s*?(\w+?)\s*?=\s*?([^\s]+)\s/ ) { + if ( /^\s*?(\w+?)\s*?:?=\s*?([^\s].+?)\s*$/ ) { $name = $1; $value = $2; diff --git a/test/mailbox_addr.c b/test/mailbox_addr.c index c2603b4..c529b7f 100644 --- a/test/mailbox_addr.c +++ b/test/mailbox_addr.c @@ -32,7 +32,7 @@ mode_t saved_umask; uid_t rootuid = 0; char *tmp_path = ""; -char *format_displayname(char *displayname); +char *format_maildisplayname(char *displayname); char *make_mailbox_addr(char *displayname, char *mail_from, char *hostname); @@ -40,7 +40,7 @@ void _test_format_displayname(char *test_desc, char *arg, char *expected) { char *output = NULL; - output = format_displayname(arg); + output = format_maildisplayname(arg); printf("%s: format_displayname('%s'): '%s' ?= '%s'\n", test_desc, arg, output, expected); assert(strcmp(output, expected) == 0); @@ -65,7 +65,7 @@ int main(int argc, char* argv[]) char *displayname = NULL; char *output = NULL; - /* Mind that format_displayname() might modify input displayname, thus all + /* Mind that format_maildisplayname() might modify input displayname, thus all special characters must be tested */ _test_format_displayname("empty displayname", "", ""); _test_format_displayname("displayname with no special char", @@ -120,24 +120,24 @@ int main(int argc, char* argv[]) memset(displayname, 'a', MAIL_FROM_VALUE_LEN_MAX*2); - printf("=== format_displayname: one-char overflow with no expansion...\n"); + printf("=== format_maildisplayname: one-char overflow with no expansion...\n"); displayname[MAIL_FROM_VALUE_LEN_MAX+1] = '\0'; - output = format_displayname(displayname); + output = format_maildisplayname(displayname); AssertEq("format_displayname: overflow with no expansion", output, NULL); Free_safe(output); - printf("=== format_displayname: max size with no special char...\n"); + printf("=== format_maildisplayname: max size with no special char...\n"); displayname[MAIL_FROM_VALUE_LEN_MAX] = '\0'; - output = format_displayname(displayname); + output = format_maildisplayname(displayname); _test_format_displayname("format_displayname: max size with no special chars", output, displayname); printf("format_displayname: max size with no special char: len(output)=%lu, MAIL_FROM_VALUE_LEN_MAX=%lu\n", strlen(output), MAIL_FROM_VALUE_LEN_MAX); Free_safe(output); - printf("=== format_displayname: overflow on max size with special char...\n"); + printf("=== format_maildisplayname: overflow on max size with special char...\n"); displayname[0] = DQUOTE; - output = format_displayname(displayname); + output = format_maildisplayname(displayname); AssertEq("format_displayname: overflow on max size with special char", output, NULL); Free_safe(output); -- 2.47.2