ovs-vsctl: simply vsctl_parent_process_info()

Use ds_get_line() instead of hand rolling it. Rearrange the logic to removes some duplication. Signed-off-by: Andy Zhou <[email protected]> Acked-by: Ben Pfaff <[email protected]> Acked-by: William Tu <[email protected]>
grizax · Aug 10, 2016 · ed29f22 · ed29f22
1 parent 0693531
commit ed29f22
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
@@ -2488,26 +2488,16 @@ vsctl_parent_process_info(void)
         procfile = xasprintf("/proc/%d/cmdline", parent_pid);
 
         f = fopen(procfile, "r");
-        if (!f) {
-            free(procfile);
-            return NULL;
-        }
         free(procfile);
-
-        for (;;) {
-            int c = getc(f);
-            if (!c || c == EOF) {
-            break;
-            }
-            ds_put_char(&s, c);
+        if (f) {
+            ds_get_line(&s, f);
+            fclose(f);
         }
-        fclose(f);
     } else {
         ds_put_cstr(&s, "init");
     }
 
     ds_put_format(&s, " (pid %d)", parent_pid);
-
     return ds_steal_cstr(&s);
 #else
     return NULL;