0019-hostname-Avoid-a-trailing-space.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. From 81dd35bac7b9b526a44d5299387740953a9f5d5b Mon Sep 17 00:00:00 2001
  2. From: Mats Erik Andersson <gnu@gisladisker.se>
  3. Date: Mon, 23 May 2016 23:06:47 +0200
  4. Subject: [PATCH 19/60] hostname: Avoid a trailing space.
  5. Suppress the space character after the last presented IP number.
  6. ---
  7. ChangeLog | 10 ++++++++++
  8. src/hostname.c | 5 ++++-
  9. 2 files changed, 14 insertions(+), 1 deletion(-)
  10. diff --git a/ChangeLog b/ChangeLog
  11. index f01a330c..f0289780 100644
  12. --- a/ChangeLog
  13. +++ b/ChangeLog
  14. @@ -1,3 +1,13 @@
  15. +2016-05-23 Mats Erik Andersson <gnu@gisladisker.se>
  16. +
  17. + hostname: Avoid a trailing space.
  18. + Suppress the space character after the last presented IP number.
  19. + Problem reported by Terje Strand in
  20. + http://lists.gnu.org/archive/html/bug-inetutils/2016-04/msg00001.html
  21. +
  22. + * src/hostname.c (get_ip_addresses): Emit a space character
  23. + only in case a further IP address will be printed.
  24. +
  25. 2016-02-16 Mats Erik Andersson <gnu@gisladisker.se>
  26. traceroute: Subprivileged use case.
  27. diff --git a/src/hostname.c b/src/hostname.c
  28. index e6a90f76..6837fd5a 100644
  29. --- a/src/hostname.c
  30. +++ b/src/hostname.c
  31. @@ -337,7 +337,10 @@ get_ip_addresses (const char *const host_name)
  32. }
  33. strcat (addresses, address);
  34. - strcat (addresses, " ");
  35. +
  36. + /* Insert a separating space character. */
  37. + if (ht->h_addr_list[i+1] != NULL)
  38. + strcat (addresses, " ");
  39. }
  40. }
  41. --
  42. 2.26.0.292.g33ef6b2f38