~jamesodhunt/upstart/bug-1197225

Viewing changes to extra/upstart-file-bridge.c

Committer: James Hunt
Date: 2013-07-03 08:26:23 UTC
Revision ID: james.hunt@ubuntu.com-20130703082623-3zpymf1mb9uv7vvg

https://launchpad.net/bugs/1197225

* extra/upstart-dbus-bridge.c: main(): Check nih_str_split() return.
* extra/upstart-event-bridge.c: main(): Check nih_str_split() return.
* extra/upstart-file-bridge.c: main():
- Check nih_str_split() return.
- Only attempt to extract PID from UPSTART_SESSION in user mode.

files modified:
ChangeLog

extra/upstart-dbus-bridge.c

extra/upstart-event-bridge.c

extra/upstart-file-bridge.c

Show diffs side-by-side

added added

removed removed

extra/upstart-file-bridge.c

547

* the Upstart instance (last part of the DBus path) in the filename.

548

549

550

/* Extract PID from UPSTART_SESSION */

551

user_session_path = nih_str_split (NULL, user_session_addr, "/", TRUE);

552

for (int i = 0; user_session_path[i] != NULL; i++)

553

path_element = user_session_path[i];

554

555

if (! path_element) {

556

nih_fatal (_("Invalid value for UPSTART_SESSION"));

557

exit (1);

558

}

559

560

pidfile_path = getenv ("XDG_RUNTIME_DIR");

561

if (! pidfile_path)

562

pidfile_path = getenv ("HOME");

563

564

if (pidfile_path) {

565

NIH_MUST (nih_strcat_sprintf (&pidfile, NULL, "%s/upstart-file-bridge.%s.pid",

566

pidfile_path, path_element));

567

nih_main_set_pidfile (pidfile);

550

if (user) {

551

552