Print port number in the connection error message

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 18dd4b541e5dcdf1176c6be8cd7085f2518aa072..fe531ac286e8703100253f6878b711b6de8eff2f 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -5,9 +5,18 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/utils.h>
-#include <h/signals.h>
+#include "h/mh.h"
+#include "read_yes_or_no_if_tty.h"
+#include "concat.h"
+#include "r1bindex.h"
+#include "context_foil.h"
+#include "context_replace.h"
+#include "context_read.h"
+#include "context_find.h"
+#include "print_help.h"
+#include "error.h"
+#include "h/utils.h"
+#include "h/signals.h"

 #include "m_mktemp.h"
 #include "makedir.h"
 #include <fcntl.h>
 #include "m_mktemp.h"
 #include "makedir.h"
 #include <fcntl.h>


@@ -28,7 +37,8 @@ const char plurals[] = "s";
 #define MAXMSGS 256
 
 /* Call malloc(3), exiting on NULL return. */
 #define MAXMSGS 256
 
 /* Call malloc(3), exiting on NULL return. */

-void *mh_xmalloc(size_t size)
+void *
+mh_xmalloc(size_t size)

 {
     void *p;
 
 {
     void *p;
 


@@ -42,7 +52,8 @@ void *mh_xmalloc(size_t size)
 }
 
 /* Call realloc(3), exiting on NULL return. */
 }
 
 /* Call realloc(3), exiting on NULL return. */

-void *mh_xrealloc(void *ptr, size_t size)
+void *
+mh_xrealloc(void *ptr, size_t size)

 {
     void *new;
 
 {
     void *new;
 


@@ -62,7 +73,8 @@ void *mh_xrealloc(void *ptr, size_t size)
 }
 
 /* Call calloc(3), exiting on NULL return. */
 }
 
 /* Call calloc(3), exiting on NULL return. */

-void *mh_xcalloc(size_t nelem, size_t elsize)
+void *
+mh_xcalloc(size_t nelem, size_t elsize)

 {
     void *p;
 
 {
     void *p;
 


@@ -77,7 +89,8 @@ void *mh_xcalloc(size_t nelem, size_t elsize)
 }
 
 /* Duplicate a NUL-terminated string, exit on failure. */
 }
 
 /* Duplicate a NUL-terminated string, exit on failure. */

-char *mh_xstrdup(const char *src)
+char *
+mh_xstrdup(const char *src)

 {
     size_t n;
     char *dest;
 {
     size_t n;
     char *dest;


@@ -164,7 +177,7 @@ char *
 addlist (char *list, const char *item)
 {
     if (list)
 addlist (char *list, const char *item)
 {
     if (list)

-       list = add (", ", list);
+       list = add (", ", list);

 
     return add (item, list);
 }
 
     return add (item, list);
 }


@@ -173,7 +186,8 @@ addlist (char *list, const char *item)
  * folder_exists
  *      Check to see if a folder exists.
  */
  * folder_exists
  *      Check to see if a folder exists.
  */

-int folder_exists(const char *folder)
+int
+folder_exists(const char *folder)

 {
     struct stat st;
 
 {
     struct stat st;
 


@@ -185,7 +199,8 @@ int folder_exists(const char *folder)
  *      Check to see if a folder exists, if not, prompt the user to create
  *      it.
  */
  *      Check to see if a folder exists, if not, prompt the user to create
  *      it.
  */

-void create_folder(char *folder, int autocreate, void (*done_callback)(int))
+void
+create_folder(char *folder, int autocreate, void (*done_callback)(int))

 {
     struct stat st;
     extern int errno;
 {
     struct stat st;
     extern int errno;


@@ -330,7 +345,7 @@ nmh_strcasestr (const char *s1, const char *s2)
 }
 
 
 }
 
 

-/* truncpy copies at most size - 1 chars from non-NULL src to non-NULL,
+/* trunccpy copies at most size-1 chars from non-NULL src to non-NULL,

  * non-overlapping, dst, and ensures dst is NUL terminated.  If size is
  * zero then it aborts as dst cannot be NUL terminated.
  *
  * non-overlapping, dst, and ensures dst is NUL terminated.  If size is
  * zero then it aborts as dst cannot be NUL terminated.
  *


@@ -338,7 +353,8 @@ nmh_strcasestr (const char *s1, const char *s2)
  * reporting a possibly very long external string back to the user.  One
  * of its advantages over strncpy(3) is it doesn't pad in the common
  * case of no truncation. */
  * reporting a possibly very long external string back to the user.  One
  * of its advantages over strncpy(3) is it doesn't pad in the common
  * case of no truncation. */

-void trunccpy(char *dst, const char *src, size_t size)
+void
+trunccpy(char *dst, const char *src, size_t size)

 {
     if (!size) {
         inform("trunccpy: zero-length destination: \"%.20s\"",
 {
     if (!size) {
         inform("trunccpy: zero-length destination: \"%.20s\"",


@@ -356,7 +372,8 @@ void trunccpy(char *dst, const char *src, size_t size)
 
 
 /* has_prefix returns true if non-NULL s starts with non-NULL prefix. */
 
 
 /* has_prefix returns true if non-NULL s starts with non-NULL prefix. */

-bool has_prefix(const char *s, const char *prefix)
+bool
+has_prefix(const char *s, const char *prefix)

 {
     while (*s && *s == *prefix) {
         s++;
 {
     while (*s && *s == *prefix) {
         s++;


@@ -368,7 +385,8 @@ bool has_prefix(const char *s, const char *prefix)
 
 
 /* has_suffix returns true if non-NULL s ends with non-NULL suffix. */
 
 
 /* has_suffix returns true if non-NULL s ends with non-NULL suffix. */

-bool has_suffix(const char *s, const char *suffix)
+bool
+has_suffix(const char *s, const char *suffix)

 {
     size_t ls, lsuf;
 
 {
     size_t ls, lsuf;
 


@@ -381,7 +399,8 @@ bool has_suffix(const char *s, const char *suffix)
 
 /* has_suffix_c returns true if non-NULL string s ends with a c before the
  * terminating NUL. */
 
 /* has_suffix_c returns true if non-NULL string s ends with a c before the
  * terminating NUL. */

-bool has_suffix_c(const char *s, int c)
+bool
+has_suffix_c(const char *s, int c)

 {
     return *s && s[strlen(s) - 1] == c;
 }
 {
     return *s && s[strlen(s) - 1] == c;
 }


@@ -389,7 +408,8 @@ bool has_suffix_c(const char *s, int c)
 
 /* trim_suffix_c deletes c from the end of non-NULL string s if it's
  * present, shortening s by 1.  Only one instance of c is removed. */
 
 /* trim_suffix_c deletes c from the end of non-NULL string s if it's
  * present, shortening s by 1.  Only one instance of c is removed. */

-void trim_suffix_c(char *s, int c)
+void
+trim_suffix_c(char *s, int c)

 {
     if (!*s)
         return;
 {
     if (!*s)
         return;


@@ -401,7 +421,8 @@ void trim_suffix_c(char *s, int c)
 
 
 /* to_lower runs all of s through tolower(3). */
 
 
 /* to_lower runs all of s through tolower(3). */

-void to_lower(char *s)
+void
+to_lower(char *s)

 {
     unsigned char *b;
 
 {
     unsigned char *b;
 


@@ -411,7 +432,8 @@ void to_lower(char *s)
 
 
 /* to_upper runs all of s through toupper(3). */
 
 
 /* to_upper runs all of s through toupper(3). */

-void to_upper(char *s)
+void
+to_upper(char *s)

 {
     unsigned char *b;
 
 {
     unsigned char *b;
 


@@ -420,7 +442,8 @@ void to_upper(char *s)
 }
 
 
 }
 
 

-int nmh_init(const char *argv0, bool read_context, bool check_version)
+int
+nmh_init(const char *argv0, bool read_context, bool check_version)

 {
     int status = OK;
     char *locale;
 {
     int status = OK;
     char *locale;


@@ -536,7 +559,8 @@ nmh_version_changed (int older)
  * isascii(3), i.e. is outside [0, 0x7f].  If start is NULL it returns
  * false.  Bytes are examined until a NUL byte, or, if end is not NULL,
  * whilst start is before end. */
  * isascii(3), i.e. is outside [0, 0x7f].  If start is NULL it returns
  * false.  Bytes are examined until a NUL byte, or, if end is not NULL,
  * whilst start is before end. */

-bool contains8bit(const char *start, const char *end)
+bool
+contains8bit(const char *start, const char *end)

 {
     const char *p;
     char c;
 {
     const char *p;
     char c;