nexthop: Fix Deletion display

[mirror_iproute2.git] / ip / ipvrf.c

diff --git a/ip/ipvrf.c b/ip/ipvrf.c
index 0094cf8557cd7627846e075875db68427867b381..b9a43675cbd6cab6ddc338b747a914f830a6b20b 100644 (file)
--- a/ip/ipvrf.c
+++ b/ip/ipvrf.c
@@ -36,10 +36,11 @@ static struct link_filter vrf_filter;
 
 static void usage(void)
 {
-       fprintf(stderr, "Usage: ip vrf show [NAME] ...\n");
-       fprintf(stderr, "       ip vrf exec [NAME] cmd ...\n");
-       fprintf(stderr, "       ip vrf identify [PID]\n");
-       fprintf(stderr, "       ip vrf pids [NAME]\n");
+       fprintf(stderr,
+               "Usage: ip vrf show [NAME] ...\n"
+               "       ip vrf exec [NAME] cmd ...\n"
+               "       ip vrf identify [PID]\n"
+               "       ip vrf pids [NAME]\n");
 
        exit(-1);
 }
@@ -74,7 +75,7 @@ static int vrf_identify(pid_t pid, char *name, size_t len)
                        if (end)
                                *end = '\0';
 
-                       strncpy(name, vrf, len - 1);
+                       strlcpy(name, vrf, len);
                        break;
                }
        }
@@ -336,8 +337,7 @@ static int vrf_path(char *vpath, size_t len)
                if (vrf)
                        *vrf = '\0';
 
-               strncpy(vpath, start, len - 1);
-               vpath[len - 1] = '\0';
+               strlcpy(vpath, start, len);
 
                /* if vrf path is just / then return nothing */
                if (!strcmp(vpath, "/"))
@@ -372,12 +372,12 @@ static int vrf_switch(const char *name)
 
        /* -1 on length to add '/' to the end */
        if (ipvrf_get_netns(netns, sizeof(netns) - 1) < 0)
-               return -1;
+               goto out;
 
        if (vrf_path(vpath, sizeof(vpath)) < 0) {
                fprintf(stderr, "Failed to get base cgroup path: %s\n",
                        strerror(errno));
-               return -1;
+               goto out;
        }
 
        /* if path already ends in netns then don't add it again */
@@ -428,17 +428,27 @@ static int vrf_switch(const char *name)
        snprintf(pid, sizeof(pid), "%d", getpid());
        if (write(fd, pid, strlen(pid)) < 0) {
                fprintf(stderr, "Failed to join cgroup\n");
-               goto out;
+               goto out2;
        }
 
        rc = 0;
+out2:
+       close(fd);
 out:
        free(mnt);
-       close(fd);
+
+       drop_cap();
 
        return rc;
 }
 
+static int do_switch(void *arg)
+{
+       char *vrf = arg;
+
+       return vrf_switch(vrf);
+}
+
 static int ipvrf_exec(int argc, char **argv)
 {
        if (argc < 1) {
@@ -450,10 +460,7 @@ static int ipvrf_exec(int argc, char **argv)
                return -1;
        }
 
-       if (vrf_switch(argv[0]))
-               return -1;
-
-       return -cmd_exec(argv[1], argv + 1, !!batch_mode);
+       return -cmd_exec(argv[1], argv + 1, !!batch_mode, do_switch, argv[0]);
 }
 
 /* reset VRF association of current process to default VRF;
@@ -559,9 +566,12 @@ static int ipvrf_print(struct nlmsghdr *n)
                return 0;
        }
 
-       printf("%-16s %5u", name, tb_id);
+       open_json_object(NULL);
+       print_string(PRINT_ANY, "name", "%-16s", name);
+       print_uint(PRINT_ANY, "table", " %5u", tb_id);
+       print_string(PRINT_FP, NULL, "%s", "\n");
+       close_json_object();
 
-       printf("\n");
        return 1;
 }
 
@@ -587,18 +597,24 @@ static int ipvrf_show(int argc, char **argv)
                return 0;
        }
 
-       if (ip_linkaddr_list(0, ipvrf_filter_req, &linfo, NULL) == 0) {
+       if (ip_link_list(ipvrf_filter_req, &linfo) == 0) {
                struct nlmsg_list *l;
                unsigned nvrf = 0;
-               int n;
 
-               n = printf("%-16s  %5s\n", "Name", "Table");
-               printf("%.*s\n", n-1, "-----------------------");
+               new_json_obj(json);
+
+               print_string(PRINT_FP, NULL, "%-16s", "Name");
+               print_string(PRINT_FP, NULL, "  %5s\n", "Table");
+               print_string(PRINT_FP, NULL, "%s\n",
+                            "-----------------------");
+
                for (l = linfo.head; l; l = l->next)
                        nvrf += ipvrf_print(&l->h);
 
                if (!nvrf)
-                       printf("No VRF has been configured\n");
+                       print_string(PRINT_FP, NULL, "%s\n",
+                                    "No VRF has been configured");
+               delete_json_obj();
        } else
                rc = 1;