|
 |
e38f15 |
From a646775da81a6a80c25b8bc5b26c465786ddfa38 Mon Sep 17 00:00:00 2001
|
|
|
e38f15 |
From: Roger Wolff <R.E.Wolff@BitWizard.nl>
|
|
|
e38f15 |
Date: Wed, 3 Jul 2013 12:00:28 +0200
|
|
|
e38f15 |
Subject: [PATCH 1/4] fixed default hostname
|
|
|
e38f15 |
|
|
|
e38f15 |
---
|
|
|
e38f15 |
mtr.c | 10 +++++++---
|
|
|
e38f15 |
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
e38f15 |
|
|
|
e38f15 |
diff --git a/mtr.c b/mtr.c
|
|
|
e38f15 |
index 75a3b06..fd4705d 100644
|
|
|
e38f15 |
--- a/mtr.c
|
|
|
e38f15 |
+++ b/mtr.c
|
|
|
e38f15 |
@@ -141,7 +141,8 @@ append_to_names(const char* progname, const char* item) {
|
|
|
e38f15 |
fprintf(stderr, "%s: memory allocation failure\n", progname);
|
|
|
e38f15 |
exit(EXIT_FAILURE);
|
|
|
e38f15 |
}
|
|
|
e38f15 |
- name->name = strdup(item);
|
|
|
e38f15 |
+ // prepared for adding NULL name, but decided against that in the end.
|
|
|
e38f15 |
+ name->name = item?strdup(item):item;
|
|
|
e38f15 |
name->next = names;
|
|
|
e38f15 |
names = name;
|
|
|
e38f15 |
}
|
|
|
e38f15 |
@@ -581,13 +582,16 @@ int main(int argc, char **argv)
|
|
|
e38f15 |
}
|
|
|
e38f15 |
|
|
|
e38f15 |
time_t now = time(NULL);
|
|
|
e38f15 |
+
|
|
|
e38f15 |
+ if (!names) append_to_names (argv[0], "localhost"); // default: localhost.
|
|
|
e38f15 |
+
|
|
|
e38f15 |
names_t* head = names;
|
|
|
e38f15 |
while (names != NULL) {
|
|
|
e38f15 |
|
|
|
e38f15 |
Hostname = names->name;
|
|
|
e38f15 |
- if (Hostname == NULL) Hostname = "localhost";
|
|
|
e38f15 |
+ // if (Hostname == NULL) Hostname = "localhost"; // no longer necessary.
|
|
|
e38f15 |
if (gethostname(LocalHostname, sizeof(LocalHostname))) {
|
|
|
e38f15 |
- strcpy(LocalHostname, "UNKNOWNHOST");
|
|
|
e38f15 |
+ strcpy(LocalHostname, "UNKNOWNHOST");
|
|
|
e38f15 |
}
|
|
|
e38f15 |
|
|
|
e38f15 |
if (net_preopen_result != 0) {
|
|
|
e38f15 |
--
|
|
|
e38f15 |
1.8.3.1
|
|
|
e38f15 |
|