debug_print_socket(): output formatting

(cherry picked from exim-4.94+fixes, commit 73b748711caf8a4b18dd1c0d7c662b5d57798dfe)

diff --git a/src/src/debug.c b/src/src/debug.c
index acc723a29ef4d590a3311d54a54fe02089a2fc6c..6d6132e39c71eb999d851689846b4a8d524377d7 100644 (file)
--- a/src/src/debug.c
+++ b/src/src/debug.c
@@ -338,7 +338,7 @@ if (fstat(fd, &s) == 0 && (s.st_mode & S_IFMT) == S_IFSOCK)
     switch (a.ss_family)
       {
       case AF_INET:
     switch (a.ss_family)
       {
       case AF_INET:

-       g = string_cat(g, US" domain AF_INET");
+       g = string_cat(g, US"domain AF_INET");

        g = string_fmt_append(g, " lcl [%s]:%u",
          inet_ntoa(sinp->sin_addr), ntohs(sinp->sin_port));
        alen = sizeof(*sinp);
        g = string_fmt_append(g, " lcl [%s]:%u",
          inet_ntoa(sinp->sin_addr), ntohs(sinp->sin_port));
        alen = sizeof(*sinp);


@@ -349,7 +349,7 @@ if (fstat(fd, &s) == 0 && (s.st_mode & S_IFMT) == S_IFSOCK)
       case AF_INET6:
        {
        uschar buf[46];
       case AF_INET6:
        {
        uschar buf[46];

-       g = string_cat(g, US" domain AF_INET6");
+       g = string_cat(g, US"domain AF_INET6");

        g = string_fmt_append(g, " lcl [%s]:%u",
          inet_ntop(AF_INET6, &sin6p->sin6_addr, CS buf, sizeof(buf)),
          ntohs(sin6p->sin6_port));
        g = string_fmt_append(g, " lcl [%s]:%u",
          inet_ntop(AF_INET6, &sin6p->sin6_addr, CS buf, sizeof(buf)),
          ntohs(sin6p->sin6_port));


@@ -373,7 +373,7 @@ if (fstat(fd, &s) == 0 && (s.st_mode & S_IFMT) == S_IFSOCK)
             sunp->sun_path[0] ? sunp->sun_path : sunp->sun_path+1);
         break;
       default:
             sunp->sun_path[0] ? sunp->sun_path : sunp->sun_path+1);
         break;
       default:

-       g = string_fmt_append(g, " domain %u", sinp->sin_family);
+       g = string_fmt_append(g, "domain %u", sinp->sin_family);

        break;
       }
   if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &val, &vlen) == 0)
        break;
       }
   if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &val, &vlen) == 0)


@@ -388,7 +388,7 @@ if (fstat(fd, &s) == 0 && (s.st_mode & S_IFMT) == S_IFSOCK)
     {
     struct protoent * p = getprotobynumber(val);
     g = p
     {
     struct protoent * p = getprotobynumber(val);
     g = p

-      ? string_fmt_append(g, " proto %s\n", p->p_name)
+      ? string_fmt_append(g, " proto %s", p->p_name)

       : string_fmt_append(g, " proto %d", val);
     }
 #endif
       : string_fmt_append(g, " proto %d", val);
     }
 #endif