/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
return 1;
}
+/* does not unlink socket on errors */
static int audiod_get_socket(void)
{
struct sockaddr_un unix_addr;
- int fd;
+ int ret, fd;
if (conf.socket_given)
socket_name = para_strdup(conf.socket_arg);
PARA_NOTICE_LOG("local socket: %s\n", socket_name);
if (conf.force_given)
unlink(socket_name);
- fd = create_local_socket(socket_name, &unix_addr,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
- if (fd < 0) {
- PARA_EMERG_LOG("can not connect to socket\n");
- exit(EXIT_FAILURE); /* do not unlink socket */
- }
+ ret = create_local_socket(socket_name, &unix_addr,
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+ if (ret < 0)
+ goto err;
+ fd = ret;
if (listen(fd , 5) < 0) {
- PARA_EMERG_LOG("can not listen on socket\n");
- exit(EXIT_FAILURE); /* do not unlink socket */
+ ret = -ERRNO_TO_PARA_ERROR(errno);
+ goto err;
}
- mark_fd_nonblocking(fd);
+ ret = mark_fd_nonblocking(fd);
+ if (ret < 0)
+ goto err;
return fd;
+err:
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+ exit(EXIT_FAILURE);
}
static void signal_event_handler(struct task *t)