Commit e35fc962 authored by Juanma Barranquero's avatar Juanma Barranquero

Fixes to emacsclient.c for GNU/Linux.

[!WINDOWSNT] <top level>: Include <netinet/in.h> and <sys/ioctl.h>.
(INVALID_SOCKET): Define.
(initialize_sockets): Put #endif at the right place.
(set_local_socket): Use progname, not argv[0].
parent 6ceb8058
2006-10-31 Tim Van Holder <tim.vanholder@gmail.com> (tiny change)
Fixes to emacsclient.c for GNU/Linux.
* emacsclient.c [!WINDOWSNT] <top level>: Include <netinet/in.h> and
<sys/ioctl.h>.
(INVALID_SOCKET): Define.
(initialize_sockets): Put #endif at the right place.
(set_local_socket): Use progname, not argv[0].
2006-10-31 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in (ALL): Add emacsclient.
......@@ -32,6 +41,7 @@
set_local_socket. Use set_socket. Get answers from server.el with
recv(), not file stream functions.
2006-10-09 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (../src/config.h): Fix error message.
......
......@@ -38,6 +38,9 @@ Boston, MA 02110-1301, USA. */
# define INITIALIZE() (initialize_sockets ())
typedef unsigned long IOCTL_BOOL_ARG;
#else
# include <netinet/in.h>
# include <sys/ioctl.h>
# define INVALID_SOCKET -1
# define HSOCKET int
# define CLOSE_SOCKET close
# define IOCTL ioctl
......@@ -390,8 +393,8 @@ void initialize_sockets ()
}
atexit (close_winsock);
#endif /* WINDOWSNT */
}
#endif /* WINDOWSNT */
/*
* Read the information needed to set up a TCP comm channel with
......@@ -618,7 +621,7 @@ set_local_socket ()
we are root. */
if (0 != geteuid ())
{
fprintf (stderr, "%s: Invalid socket owner\n", argv[0]);
fprintf (stderr, "%s: Invalid socket owner\n", progname);
return INVALID_SOCKET;
}
break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment