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].
This commit is contained in:
Juanma Barranquero 2006-10-31 09:08:24 +00:00
parent 6ceb805857
commit e35fc9628c
2 changed files with 15 additions and 2 deletions

View file

@ -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;