delete ipc socket when exiting, cleanup tmpdir

fixes #1253
This commit is contained in:
Michael Stapelberg 2014-06-08 22:13:43 +02:00
parent 617afc67a2
commit 26460c091a
3 changed files with 55 additions and 1 deletions

View File

@ -1649,6 +1649,8 @@ void cmd_layout_toggle(I3_CMD, char *toggle_mode) {
*/ */
void cmd_exit(I3_CMD) { void cmd_exit(I3_CMD) {
LOG("Exiting due to user command.\n"); LOG("Exiting due to user command.\n");
ipc_shutdown();
unlink(config.ipc_socket_path);
xcb_disconnect(conn); xcb_disconnect(conn);
exit(0); exit(0);

View File

@ -722,7 +722,6 @@ int main(int argc, char *argv[]) {
if (ipc_socket == -1) { if (ipc_socket == -1) {
ELOG("Could not create the IPC socket, IPC disabled\n"); ELOG("Could not create the IPC socket, IPC disabled\n");
} else { } else {
free(config.ipc_socket_path);
struct ev_io *ipc_io = scalloc(sizeof(struct ev_io)); struct ev_io *ipc_io = scalloc(sizeof(struct ev_io));
ev_io_init(ipc_io, ipc_new_client, ipc_socket, EV_READ); ev_io_init(ipc_io, ipc_new_client, ipc_socket, EV_READ);
ev_io_start(main_loop, ipc_io); ev_io_start(main_loop, ipc_io);

View File

@ -0,0 +1,53 @@
#!perl
# vim:ts=4:sw=4:expandtab
#
# Please read the following documents before working on tests:
# • http://build.i3wm.org/docs/testsuite.html
# (or docs/testsuite)
#
# • http://build.i3wm.org/docs/lib-i3test.html
# (alternatively: perldoc ./testcases/lib/i3test.pm)
#
# • http://build.i3wm.org/docs/ipc.html
# (or docs/ipc)
#
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
# (unless you are already familiar with Perl)
#
# Makes sure i3 deletes its temporary directory when exiting.
# Ticket: #1253
# Bug still in: 4.7.2-186-g617afc6
use i3test i3_autostart => 0;
use File::Basename;
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
# ensure XDG_RUNTIME_DIR is not set
delete $ENV{XDG_RUNTIME_DIR};
my $pid = launch_with_config($config, dont_add_socket_path => 1, dont_create_temp_dir => 1);
my $socketpath = get_socket_path(0);
my $tmpdir = dirname($socketpath);
ok(-d $tmpdir, "tmpdir $tmpdir exists");
# Clear the error logfile. The testsuite runs in an environment where RandR is
# not supported, so there always is a message about xinerama in the error
# logfile.
my @errorlogfiles = <$tmpdir/errorlog.*>;
for my $fn (@errorlogfiles) {
open(my $fh, '>', $fn);
close($fh);
}
exit_gracefully($pid);
ok(! -d $tmpdir, "tmpdir $tmpdir was cleaned up");
if (-d $tmpdir) {
diag('contents = ' . Dumper(<$tmpdir/*>));
}
done_testing;