Message ID | 1464781579-12968-1-git-send-email-pboca@cloudbasesolutions.com |
---|---|
State | Changes Requested |
Headers | show |
From the commit message it is hard to understand what are you trying to fix or why. Are you trying to get the absolute path if "name" is missing ":" ? Please state what are you trying to achieve and why, in the commit message. Thanks, Alin. > -----Mesaj original----- > De la: dev [mailto:dev-bounces@openvswitch.org] În numele Paul Boca > Trimis: Wednesday, June 1, 2016 2:46 PM > Către: dev@openvswitch.org > Subiect: [ovs-dev] [PATCH V2 2/4] ovs-ofctl: Fixed PID file naming on > windows > > If the --pidfile option doesn't contain ":" then the PID file name is always ovs- > ofctl.pid > > Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com> > --- > lib/daemon-windows.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/lib/daemon-windows.c b/lib/daemon-windows.c index > ac71aa1..8cf0fea 100644 > --- a/lib/daemon-windows.c > +++ b/lib/daemon-windows.c > @@ -485,8 +485,12 @@ daemon_become_new_user(bool access_datapath > OVS_UNUSED) char * make_pidfile_name(const char *name) { > - if (name && strchr(name, ':')) { > - return xstrdup(name); > + if (name) { > + if (strchr(name, ':')) { > + return xstrdup(name); > + } else { > + return xasprintf("%s/%s", ovs_rundir(), name); > + } > } else { > return xasprintf("%s/%s.pid", ovs_rundir(), program_name); > } > -- > 2.7.2.windows.1 > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
diff --git a/lib/daemon-windows.c b/lib/daemon-windows.c index ac71aa1..8cf0fea 100644 --- a/lib/daemon-windows.c +++ b/lib/daemon-windows.c @@ -485,8 +485,12 @@ daemon_become_new_user(bool access_datapath OVS_UNUSED) char * make_pidfile_name(const char *name) { - if (name && strchr(name, ':')) { - return xstrdup(name); + if (name) { + if (strchr(name, ':')) { + return xstrdup(name); + } else { + return xasprintf("%s/%s", ovs_rundir(), name); + } } else { return xasprintf("%s/%s.pid", ovs_rundir(), program_name); }
If the --pidfile option doesn't contain ":" then the PID file name is always ovs-ofctl.pid Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com> --- lib/daemon-windows.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)