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].

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d36646065e1afff6bb6bf924b9665be6550464d6..0a6b4b35bee927d1ffaaf161657ab227c8d6f71b 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,12 @@
+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.

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 943053b3c0fd44a11a3da53fc9dcc4a4b3997cfc..b3a5180653c51cf7af863b70a75d43980879c285 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -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 */
 \f
 /*
  * 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;