Rename getaddrsfromfd into getaddrsfromfile to reflect code change

diff --git a/include/getaddrsfromfd.h b/include/getaddrsfromfile.h
similarity index 82%
rename from include/getaddrsfromfd.h
rename to include/getaddrsfromfile.h
index 58c0073de1043dedb4c3b6d80e5918e7dd757239..8aafe9010df4955c3b06ea14dd22d461da4eeb1c 100644 (file)
--- a/include/getaddrsfromfd.h
+++ b/include/getaddrsfromfile.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2005 Mads Martin Joergensen <mmj at mmj.dk>
- *
- * $Id$
+/*
+ * Copyright (C) 2005 Mads Martin Joergensen <mmj at mmj.dk>
+ * Copyright (C) 2022 Baptiste Daroussin <bapt@FreeBSD.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -21,12 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef GETADDRSFROMFD_H
-#define GETADDRSFROMFD_H
+#pragma once
 
-#include <sys/types.h>
+#include <stdio.h>
 #include "mlmmj.h"
 
-int getaddrsfromfd(struct strlist *slist, FILE *f, int max);
-
-#endif /* GETADDRSFROMFD_H */
+int getaddrsfromfile(struct strlist *slist, FILE *f, int max);

diff --git a/src/Makefile.am b/src/Makefile.am
index f087759125b982a8a9f6bdb7c644ff016de7fabd..0fe7ade09792c4cf3c9bd5ac3ae99a49c5de31f6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = mlmmj-make-ml
 libmlmmj_a_SOURCES=    mail-functions.c chomp.c incindexfile.c \
                        checkwait_smtpreply.c init_sockfd.c strgen.c \
                        random-int.c print-version.c log_error.c mygetline.c \
-                       getaddrsfromfd.c readn.c \
+                       getaddrsfromfile.c readn.c \
                        subscriberfuncs.c find_email_adr.c dumpfd2fd.c \
                        listcontrol.c send_help.c prepstdreply.c \
                        do_all_the_voodoo_here.c log_oper.c send_list.c \

diff --git a/src/getaddrsfromfd.c b/src/getaddrsfromfile.c
similarity index 86%
rename from src/getaddrsfromfd.c
rename to src/getaddrsfromfile.c
index 3ee4cc59d66a308b69a9de5a8f19a7ec3a9e891c..dfc6a2e13b03b6aeed9c2b5bc9d1827e454e57de 100644 (file)
--- a/src/getaddrsfromfd.c
+++ b/src/getaddrsfromfile.c
@@ -2,11 +2,11 @@
 
 #include "xmalloc.h"
 #include "mlmmj.h"
-#include "getaddrsfromfd.h"
+#include "getaddrsfromfile.h"
 #include "chomp.h"
 
 int
-getaddrsfromfd(struct strlist *slist, FILE *f, int max)
+getaddrsfromfile(struct strlist *slist, FILE *f, int max)
 {
        char *line = NULL;
        size_t linecap = 0;

diff --git a/src/mlmmj-send.c b/src/mlmmj-send.c
index 27c6c2a8cb8330d4ecf015d7a5c3ab966f0c4b54..b56f341d40c6af7a320da1f7b9cd96de97793a18 100644 (file)
--- a/src/mlmmj-send.c
+++ b/src/mlmmj-send.c
@@ -62,7 +62,7 @@
 #include "statctrl.h"
 #include "ctrlvalue.h"
 #include "stdbool.h"
-#include "getaddrsfromfd.h"
+#include "getaddrsfromfile.h"
 #include "utils.h"
 #include "send_mail.h"
 
@@ -290,7 +290,7 @@ int send_mail_many_fd(int sockfd, struct mail *mail, int subfd,
        stl.count = 0;
 
        do {
-               res = getaddrsfromfd(&stl, f, maxverprecips);
+               res = getaddrsfromfile(&stl, f, maxverprecips);
                if(stl.count == maxverprecips) {
                        ret = send_mail_many_list(sockfd, mail, &stl,
                                        listaddr, listdelim, archivefilename,
@@ -891,7 +891,7 @@ int main(int argc, char **argv)
                        }
                        do {
                                i = stl.count;
-                               res = getaddrsfromfd(&stl, f,
+                               res = getaddrsfromfile(&stl, f,
                                                maxverprecips);
                                if(omit != NULL) {
                                        while(i < stl.count) {

diff --git a/tests/mlmmj.c b/tests/mlmmj.c
index 4ab982b6b4cf41056f7ad16ba7c20f2a5117ed80..5823ef7e64b530ae51e8649fa95a870980d102af 100644 (file)
--- a/tests/mlmmj.c
+++ b/tests/mlmmj.c
@@ -54,7 +54,7 @@
 #include "getlistaddr.h"
 #include "statctrl.h"
 #include "subscriberfuncs.h"
-#include "getaddrsfromfd.h"
+#include "getaddrsfromfile.h"
 
 ATF_TC_WITHOUT_HEAD(random_int);
 ATF_TC_WITHOUT_HEAD(chomp);
@@ -106,7 +106,7 @@ ATF_TC_WITHOUT_HEAD(getlistdelim);
 ATF_TC_WITHOUT_HEAD(getlistaddr);
 ATF_TC_WITHOUT_HEAD(statctrl);
 ATF_TC_WITHOUT_HEAD(is_subbed_in);
-ATF_TC_WITHOUT_HEAD(getaddrsfromfd);
+ATF_TC_WITHOUT_HEAD(getaddrsfromfile);
 
 #ifndef NELEM
 #define NELEM(array)    (sizeof(array) / sizeof((array)[0]))
@@ -1635,44 +1635,44 @@ ATF_TC_BODY(is_subbed_in, tc)
        atf_utils_wait(p, EXIT_FAILURE, "", "");
 }
 
-ATF_TC_BODY(getaddrsfromfd, tc)
+ATF_TC_BODY(getaddrsfromfile, tc)
 {
        struct strlist stl = {};
-       ATF_REQUIRE_EQ(getaddrsfromfd(&stl, NULL, 2), -1);
+       ATF_REQUIRE_EQ(getaddrsfromfile(&stl, NULL, 2), -1);
        fclose(fopen("list", "w+"));
        FILE *fp;
        fp = fopen("list", "r");
-       ATF_REQUIRE_EQ(getaddrsfromfd(&stl, fp, 2), 0);
+       ATF_REQUIRE_EQ(getaddrsfromfile(&stl, fp, 2), 0);
        fclose(fp);
        FILE *f = fopen("list", "w+");
        fprintf(f,"\n");
        fclose(f);
        fp = fopen("list", "r");
-       ATF_REQUIRE_EQ(getaddrsfromfd(&stl, fp, 2), 0);
+       ATF_REQUIRE_EQ(getaddrsfromfile(&stl, fp, 2), 0);
        f = fopen("list", "w+");
        fprintf(f,"mail1@fqdn\n");
        fclose(f);
        fp = fopen("list", "r");
-       ATF_REQUIRE_EQ(getaddrsfromfd(&stl, fp, 2), 0);
+       ATF_REQUIRE_EQ(getaddrsfromfile(&stl, fp, 2), 0);
        fclose(fp);
        ATF_REQUIRE_EQ_MSG(stl.count, 1, "%d is not 1", stl.count);
        ATF_REQUIRE_STREQ(stl.strs[0], "mail1@fqdn");
        free(stl.strs[0]);
        stl.count = 0;
        fp = fopen("list", "r");
-       ATF_REQUIRE_EQ(getaddrsfromfd(&stl, fp, 0), -1);
+       ATF_REQUIRE_EQ(getaddrsfromfile(&stl, fp, 0), -1);
        f = fopen("list", "w+");
        fprintf(f,"mail1@fqdn\nmail2@fqdn\nmail3@fqdn");
        fclose(f);
        fp = fopen("list", "r");
-       ATF_REQUIRE(getaddrsfromfd(&stl, fp, 2) > 0);
+       ATF_REQUIRE(getaddrsfromfile(&stl, fp, 2) > 0);
        ATF_REQUIRE_EQ(stl.count, 2);
        ATF_REQUIRE_STREQ(stl.strs[0], "mail1@fqdn");
        ATF_REQUIRE_STREQ(stl.strs[1], "mail2@fqdn");
        free(stl.strs[0]);
        free(stl.strs[1]);
        stl.count = 0;
-       ATF_REQUIRE_EQ(getaddrsfromfd(&stl, fp, 2), 0);
+       ATF_REQUIRE_EQ(getaddrsfromfile(&stl, fp, 2), 0);
        ATF_REQUIRE_EQ_MSG(stl.count, 1, "%d is not 1", stl.count);
        ATF_REQUIRE_STREQ(stl.strs[0], "mail3@fqdn");
        fclose(fp);
@@ -1730,7 +1730,7 @@ ATF_TP_ADD_TCS(tp)
        ATF_TP_ADD_TC(tp, getlistaddr);
        ATF_TP_ADD_TC(tp, statctrl);
        ATF_TP_ADD_TC(tp, is_subbed_in);
-       ATF_TP_ADD_TC(tp, getaddrsfromfd);
+       ATF_TP_ADD_TC(tp, getaddrsfromfile);
 
        return (atf_no_error());
 }