diff options
author | Alexander Larsson <alexl@redhat.com> | 2012-08-21 12:50:33 +0200 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2012-08-21 12:50:33 +0200 |
commit | 9657df70f35d52e7fad5f2ddfc63efe910bb51ca (patch) | |
tree | b065d03bc1a22feabf221205338f2a9ac539b704 | |
parent | 288e9153f1f6efdb1243ad4d8589519326f3ec94 (diff) | |
download | gvfs-9657df70f35d52e7fad5f2ddfc63efe910bb51ca.tar.gz |
Remove unused gsysutils files
-rw-r--r-- | client/gvfsdaemondbus.c | 1 | ||||
-rw-r--r-- | common/Makefile.am | 1 | ||||
-rw-r--r-- | common/gsysutils.c | 181 | ||||
-rw-r--r-- | common/gsysutils.h | 39 |
4 files changed, 0 insertions, 222 deletions
diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c index 767d9c60..837d7860 100644 --- a/client/gvfsdaemondbus.c +++ b/client/gvfsdaemondbus.c @@ -36,7 +36,6 @@ #include "gvfsdaemondbus.h" #include <gvfsdaemonprotocol.h> #include <gdaemonvfs.h> -#include "gsysutils.h" #include <gvfsdbus.h> /* Extra vfs-specific data for GDBusConnections */ diff --git a/common/Makefile.am b/common/Makefile.am index 1346ef8e..5eada63f 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -19,7 +19,6 @@ $(dbus_built_sources) : Makefile.am org.gtk.vfs.xml $(NULL) libgvfscommon_la_SOURCES = \ - gsysutils.c gsysutils.h \ gmountspec.c gmountspec.h \ gmountoperationdbus.c gmountoperationdbus.h \ gmountsource.c gmountsource.h \ diff --git a/common/gsysutils.c b/common/gsysutils.c deleted file mode 100644 index db43574f..00000000 --- a/common/gsysutils.c +++ /dev/null @@ -1,181 +0,0 @@ -/* GIO - GLib Input, Output and Streaming Library - * - * Copyright (C) 2006-2007 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - * Author: Alexander Larsson <alexl@redhat.com> - */ - -#include <config.h> - -#if defined(HAVE_SYS_PARAM_H) -#include <sys/param.h> -#endif -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#include <sys/socket.h> -#include <sys/un.h> -#include <stdio.h> -#include <string.h> -#include <strings.h> -#include <errno.h> -#include <unistd.h> -#ifdef HAVE_SYS_UIO_H -#include <sys/uio.h> -#endif -#include <gio/gio.h> - -#include <glib/gi18n-lib.h> - -#include "gsysutils.h" - -int -_g_socket_send_fd (int connection_fd, - int fd) -{ - struct msghdr msg; - struct iovec vec[1]; - char buf[1] = {'x'}; - char ccmsg[CMSG_SPACE (sizeof (fd))]; - struct cmsghdr *cmsg; - int ret; - - msg.msg_name = NULL; - msg.msg_namelen = 0; - - vec[0].iov_base = buf; - vec[0].iov_len = 1; - msg.msg_iov = vec; - msg.msg_iovlen = 1; - msg.msg_control = ccmsg; - msg.msg_controllen = sizeof (ccmsg); - cmsg = CMSG_FIRSTHDR (&msg); - cmsg->cmsg_level = SOL_SOCKET; - cmsg->cmsg_type = SCM_RIGHTS; - cmsg->cmsg_len = CMSG_LEN (sizeof(fd)); - *(int*)CMSG_DATA (cmsg) = fd; - msg.msg_controllen = cmsg->cmsg_len; - msg.msg_flags = 0; - - ret = sendmsg (connection_fd, &msg, 0); - return ret; -} - -/* receive a file descriptor over file descriptor fd */ -int -_g_socket_receive_fd (int socket_fd) -{ - struct msghdr msg; - struct iovec iov[1]; - char buf[1]; - int rv; - char ccmsg[CMSG_SPACE (sizeof(int))]; - struct cmsghdr *cmsg; - - iov[0].iov_base = buf; - iov[0].iov_len = 1; - msg.msg_name = NULL; - msg.msg_namelen = 0; - msg.msg_iov = iov; - msg.msg_iovlen = 1; - msg.msg_control = ccmsg; - msg.msg_controllen = sizeof (ccmsg); - - rv = recvmsg (socket_fd, &msg, 0); - if (rv == -1) - { - perror ("recvmsg"); - return -1; - } - - cmsg = CMSG_FIRSTHDR (&msg); - if (cmsg == NULL) - return -1; - - if (!cmsg->cmsg_type == SCM_RIGHTS) { - g_warning("got control message of unknown type %d", - cmsg->cmsg_type); - return -1; - } - - return *(int*)CMSG_DATA(cmsg); -} - -int -_g_socket_connect (const char *address, - GError **error) -{ - int fd; - const char *path; - size_t path_len; - struct sockaddr_un addr; - gboolean abstract; - - fd = socket (PF_UNIX, SOCK_STREAM, 0); - if (fd == -1) - { - int errsv = errno; - - g_set_error (error, G_IO_ERROR, - g_io_error_from_errno (errsv), - _("Error creating socket: %s"), - g_strerror (errsv)); - return -1; - } - - if (g_str_has_prefix (address, "unix:abstract=")) - { - path = address + strlen ("unix:abstract="); - abstract = TRUE; - } - else - { - path = address + strlen ("unix:path="); - abstract = FALSE; - } - - memset (&addr, 0, sizeof (addr)); - addr.sun_family = AF_UNIX; - path_len = strlen (path); - - if (abstract) - { - addr.sun_path[0] = '\0'; /* this is what says "use abstract" */ - path_len++; /* Account for the extra nul byte added to the start of sun_path */ - - strncpy (&addr.sun_path[1], path, path_len); - } - else - { - strncpy (addr.sun_path, path, path_len); - } - - if (connect (fd, (const struct sockaddr*) &addr, G_STRUCT_OFFSET (struct sockaddr_un, sun_path) + path_len) < 0) - { - int errsv = errno; - - g_set_error (error, G_IO_ERROR, - g_io_error_from_errno (errsv), - _("Error connecting to socket: %s"), - g_strerror (errsv)); - close (fd); - return -1; - } - - return fd; -} diff --git a/common/gsysutils.h b/common/gsysutils.h deleted file mode 100644 index d7e0f218..00000000 --- a/common/gsysutils.h +++ /dev/null @@ -1,39 +0,0 @@ -/* GIO - GLib Input, Output and Streaming Library - * - * Copyright (C) 2006-2007 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - * Author: Alexander Larsson <alexl@redhat.com> - */ - -#ifndef __G_SYS_UTILS_H__ -#define __G_SYS_UTILS_H__ - -#include <glib.h> - -G_BEGIN_DECLS - -int _g_socket_send_fd (int socket_fd, - int fd); -int _g_socket_receive_fd (int socket_fd); -int _g_socket_connect (const char *address, - GError **error); - -G_END_DECLS - - -#endif /* __G_SYS_UTILS_H__ */ |