Changeset 98abd40 in mainline for uspace/app/dnscfg/dnscfg.c

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/dnscfg/dnscfg.c (modified) (3 diffs)

uspace/app/dnscfg/dnscfg.c

@@ -49 +49 @@
 static void print_syntax(void)
 {
-        printf("syntax:\n");
-        printf("\t" NAME " set-ns <server-addr>\n");
-        printf("\t" NAME " unset-ns\n");
+        printf("Syntax:\n");
+        printf("\t%s get-ns\n", NAME);
+        printf("\t%s set-ns <server-addr>\n", NAME);
+        printf("\t%s unset-ns\n", NAME);
 }
 
 static int dnscfg_set_ns(int argc, char *argv[])
 {
-        char *srv_addr;
-        inet_addr_t addr;
-        int rc;
-
         if (argc < 1) {
-                printf(NAME ": Missing arguments.\n");
+                printf("%s: Missing arguments.\n", NAME);
                 print_syntax();
                 return EINVAL;
         }
-
+        
         if (argc > 1) {
-                printf(NAME ": Too many arguments.\n");
+                printf("%s: Too many arguments.\n", NAME);
                 print_syntax();
                 return EINVAL;
         }
-
-        srv_addr = argv[0];
-
-        rc = inet_addr_parse(srv_addr, &addr);
+        
+        char *srv_addr  = argv[0];
+        
+        inet_addr_t addr;
+        int rc = inet_addr_parse(srv_addr, &addr);
+        
         if (rc != EOK) {
-                printf(NAME ": Invalid address format '%s'.\n", srv_addr);
-                return EINVAL;
+                printf("%s: Invalid address format '%s'.\n", NAME, srv_addr);
+                return rc;
         }
-
+        
         rc = dnsr_set_srvaddr(&addr);
         if (rc != EOK) {
-                printf(NAME ": Failed setting server address '%s' (%s)\n",
-                    srv_addr, str_error(rc));
-                return EIO;
+                printf("%s: Failed setting nameserver address '%s' (%s)\n",
+                    NAME, srv_addr, str_error(rc));
+                return rc;
         }
-
+        
         return EOK;
 }
 
-static int dnscfg_unset_ns(int argc, char *argv[])
+static int dnscfg_unset_ns(void)
 {
         inet_addr_t addr;
-        int rc;
-
-        if (argc > 0) {
-                printf(NAME ": Too many arguments.\n");
-                print_syntax();
-                return EINVAL;
+        inet_addr_any(&addr);
+        
+        int rc = dnsr_set_srvaddr(&addr);
+        if (rc != EOK) {
+                printf("%s: Failed unsetting server address (%s)\n",
+                    NAME, str_error(rc));
+                return rc;
         }
-
-        addr.ipv4 = 0;
-        rc = dnsr_set_srvaddr(&addr);
-        if (rc != EOK) {
-                printf(NAME ": Failed unsetting server address (%s)\n",
-                    str_error(rc));
-                return EIO;
-        }
-
+        
         return EOK;
 }
@@ -115 +107 @@
 {
         inet_addr_t addr;
-        char *addr_str;
-        int rc;
-
-        rc = dnsr_get_srvaddr(&addr);
+        int rc = dnsr_get_srvaddr(&addr);
         if (rc != EOK) {
-                printf(NAME ": Failed getting DNS server address.\n");
+                printf("%s: Failed getting DNS server address.\n", NAME);
                 return rc;
         }
-
+        
+        char *addr_str;
         rc = inet_addr_format(&addr, &addr_str);
         if (rc != EOK) {
-                printf(NAME ": Out of memory.\n");
+                printf("%s: Out of memory.\n", NAME);
                 return rc;
         }
-
-        printf("Server: %s\n", addr_str);
+        
+        printf("Nameserver: %s\n", addr_str);
         free(addr_str);
         return EOK;
@@ -137 +127 @@
 int main(int argc, char *argv[])
 {
-        int rc;
-
-        if (argc < 2) {
-                rc = dnscfg_print();
-                if (rc != EOK)
-                        return 1;
-                return 0;
-        }
-
-        if (str_cmp(argv[1], "set-ns") == 0) {
-                rc = dnscfg_set_ns(argc - 2, argv + 2);
-                if (rc != EOK)
-                        return 1;
-        } else if (str_cmp(argv[1], "unset-ns") == 0) {
-                rc = dnscfg_unset_ns(argc - 2, argv + 2);
-                if (rc != EOK)
-                        return 1;
-        } else {
-                printf(NAME ": Unknown command '%s'.\n", argv[1]);
+        if ((argc < 2) || (str_cmp(argv[1], "get-ns") == 0))
+                return dnscfg_print();
+        else if (str_cmp(argv[1], "set-ns") == 0)
+                return dnscfg_set_ns(argc - 2, argv + 2);
+        else if (str_cmp(argv[1], "unset-ns") == 0)
+                return dnscfg_unset_ns();
+        else {
+                printf("%s: Unknown command '%s'.\n", NAME, argv[1]);
                 print_syntax();
                 return 1;
         }
-
-
+        
         return 0;
 }