rhel: Fix use of $< in ordinary Make rules.

[sliver-openvswitch.git] / utilities / ovs-appctl.c

diff --git a/utilities/ovs-appctl.c b/utilities/ovs-appctl.c
index 7a3d91e..88ecfe3 100644 (file)
--- a/utilities/ovs-appctl.c
+++ b/utilities/ovs-appctl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,6 @@ main(int argc, char *argv[])
     int i;
 
     set_program_name(argv[0]);
-    time_init();
 
     /* Parse command line and connect to target. */
     target = parse_command_line(argc, argv);
@@ -66,6 +65,7 @@ main(int argc, char *argv[])
         ovs_fatal(error, "%s: transaction error", target);
     }
     if (code / 100 != 2) {
+        fputs(reply, stderr);
         ovs_error(0, "%s: server returned reply code %03d", target, code);
         exit(2);
     }
@@ -85,7 +85,7 @@ usage(void)
            "usage: %s [TARGET] COMMAND [ARG...]\n"
            "Targets:\n"
            "  -t, --target=TARGET  pidfile or socket to contact\n"
-           "Common commands:"
+           "Common commands:\n"
            "  help               List commands supported by the target\n"
            "  vlog/list          List current logging levels\n"
            "  vlog/set MODULE[:FACILITY[:LEVEL]]\n"
@@ -109,7 +109,7 @@ parse_command_line(int argc, char *argv[])
         {"execute", no_argument, NULL, 'e'},
         {"help", no_argument, NULL, 'h'},
         {"version", no_argument, NULL, 'V'},
-        {0, 0, 0, 0},
+        {NULL, 0, NULL, 0},
     };
     const char *target;
     int e_options;
@@ -176,14 +176,14 @@ connect_to_target(const char *target)
         char *pidfile_name;
         pid_t pid;
 
-        pidfile_name = xasprintf("%s/%s.pid", ovs_rundir, target);
+        pidfile_name = xasprintf("%s/%s.pid", ovs_rundir(), target);
         pid = read_pidfile(pidfile_name);
         if (pid < 0) {
             ovs_fatal(-pid, "cannot read pidfile \"%s\"", pidfile_name);
         }
         free(pidfile_name);
         socket_name = xasprintf("%s/%s.%ld.ctl",
-                                ovs_rundir, target, (long int) pid);
+                                ovs_rundir(), target, (long int) pid);
     } else {
         socket_name = xstrdup(target);
     }