Print port number in the connection error message

[nmh] / uip / dist.c

diff --git a/uip/dist.c b/uip/dist.c
index d42cfef5e64d2fb7f379d989f06b16a111cc3113..e6720ae71886db99f90692f604faf51309c1210c 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -5,11 +5,36 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "whatnowproc.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/read_switch_multiword.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/showfile.h"
+#include "sbr/smatch.h"
+#include "sbr/refile.h"
+#include "sbr/cpydata.h"
+#include "sbr/m_draft.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/utils.h"

 #include "sbr/m_maildir.h"
 #include <fcntl.h>
 #include "h/done.h"
 #include "sbr/m_maildir.h"
 #include <fcntl.h>
 #include "h/done.h"

+#include "forwsbr.h"

 
 #define DIST_SWITCHES \
     X("annotate", 0, ANNOSW) \
 
 #define DIST_SWITCHES \
     X("annotate", 0, ANNOSW) \


@@ -175,30 +200,30 @@ main (int argc, char **argv)
 
                case FROMSW:
                    if (!(cp = *argp++) || *cp == '-')
 
                case FROMSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       die("missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    from = addlist(from, cp);
                    continue;
                case TOSW:
                    if (!(cp = *argp++) || *cp == '-')
                    from = addlist(from, cp);
                    continue;
                case TOSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       die("missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    to = addlist(to, cp);
                    continue;
                case CCSW:
                    if (!(cp = *argp++) || *cp == '-')
                    to = addlist(to, cp);
                    continue;
                case CCSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       die("missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    cc = addlist(cc, cp);
                    continue;
                case FCCSW:
                    if (!(cp = *argp++) || *cp == '-')
                    cc = addlist(cc, cp);
                    continue;
                case FCCSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       die("missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    fcc = addlist(fcc, cp);
                    continue;
 
                case WIDTHSW:
                    if (!(cp = *argp++) || *cp == '-')
                    fcc = addlist(fcc, cp);
                    continue;
 
                case WIDTHSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       die("missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    if ((outputlinelen = atoi(cp)) < 10)
                    if ((outputlinelen = atoi(cp)) < 10)

-                       die("impossible width %d", outputlinelen);
+                       die("impossible width %d", outputlinelen);

                    continue;
 
                case ATFILESW:
                    continue;
 
                case ATFILESW:


@@ -303,7 +328,7 @@ try_it_again:
     dat[4] = 0;
 
     if (!form)
     dat[4] = 0;
 
     if (!form)

-       form = distcomps;
+       form = distcomps;

 
     in = build_form(form, NULL, dat, from, to, cc, fcc, NULL, msgnam);
 
 
     in = build_form(form, NULL, dat, from, to, cc, fcc, NULL, msgnam);