Changeset 959d2ec in mainline for uspace/app

Timestamp:

2013-05-08T10:29:45Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d242cb6

Parents:

9f029aa

Message:

Return canonical name to caller.

Location:

uspace/app

Files:

• dnsres/dnsres.c (modified) (3 diffs)
• ping/ping.c (modified) (1 diff)

uspace/app/dnsres/dnsres.c

@@ -50 +50 @@
         int rc;
         dnsr_hostinfo_t *hinfo;
+        char *hname;
         char *saddr;
 
@@ -57 +58 @@
         }
 
-        rc = dnsr_name2host(argv[1], &hinfo);
+        hname = argv[1];
+
+        rc = dnsr_name2host(hname, &hinfo);
         if (rc != EOK) {
                 printf(NAME ": Error resolving '%s'.\n", argv[1]);
@@ -70 +73 @@
         }
 
-        printf("Host name: %s address: %s\n", hinfo->name, saddr);
+        printf("Host name: %s\n", hname);
+        if (str_cmp(hname, hinfo->cname) != 0)
+                printf("Canonical name: %s\n", hinfo->cname);
+        printf("Address: %s\n", saddr);
+
         dnsr_hostinfo_destroy(hinfo);
         free(saddr);

uspace/app/ping/ping.c

@@ -234 +234 @@
 
         if (hinfo != NULL) {
-                rc = asprintf(&sdest, "%s (%s)", hinfo->name, adest);
+                rc = asprintf(&sdest, "%s (%s)", hinfo->cname, adest);
                 if (rc < 0) {
                         printf(NAME ": Out of memory.\n");