comparison lib-src/emacsclient.c @ 73617:7af864af10b6

[WINDOWSNT]: Define HAVE_INET_SOCKETS. [!WINDOWSNT]: Include <netinet/in.h> if available. [HAVE_SOCKETS]: Also require HAVE_INET_SOCKETS. (IOCTL, IOCTL_BOOL_ARG): Remove. (set_tcp_socket): Don't set the socket in blocking mode. Remove c_arg.

73616:a81e38c24e22

# include <malloc.h>
# include <stdlib.h>

# define HAVE_SOCKETS
# define NO_SOCKETS_IN_FILE_SYSTEM

# define HSOCKET SOCKET
# define CLOSE_SOCKET closesocket
# define IOCTL ioctlsocket
# define INITIALIZE() (initialize_sockets ())
typedef unsigned long IOCTL_BOOL_ARG;

#else /* !WINDOWSNT */

#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
# include <netinet/in.h>
# include <sys/ioctl.h>

# define INVALID_SOCKET -1
# define HSOCKET int
# define CLOSE_SOCKET close
# define IOCTL ioctl
# define INITIALIZE()
typedef int IOCTL_BOOL_ARG;

#endif /* !WINDOWSNT */

#undef signal

    }
  exit (EXIT_FAILURE);
}


#if !defined (HAVE_SOCKETS)

int
main (argc, argv)
     int argc;
     char **argv;

  fprintf (stderr, "on systems with Berkeley sockets.\n");

  fail (argc, argv);
}

#else /* HAVE_SOCKETS */

#ifdef WINDOWSNT
# include <winsock2.h>
#else
# include <sys/types.h>

HSOCKET
set_tcp_socket ()
{
  HSOCKET s;
  struct sockaddr_in server;
  IOCTL_BOOL_ARG c_arg = 0;
  struct linger l_arg = {1, 1};
  char auth_string[AUTH_KEY_LENGTH + 1];

  INITIALIZE ();

      fprintf (stderr, "%s: ", progname);
      perror ("connect");
      return INVALID_SOCKET;
    }

#ifdef O_NONBLOCK
  IOCTL (s, O_NONBLOCK, &c_arg);
#else
#ifdef O_NDELAY
  IOCTL (s, O_NDELAY, &c_arg);
#else
  IOCTL (s, FIONBIO, &c_arg);
#endif
#endif
  setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg);

  /*
   * Send the authentication
   */

  CLOSE_SOCKET (s);
  return EXIT_SUCCESS;
}

#endif /* HAVE_SOCKETS */

#ifndef HAVE_STRERROR
char *
strerror (errnum)
     int errnum;

73617:7af864af10b6

# include <malloc.h>
# include <stdlib.h>

# define HAVE_SOCKETS
# define HAVE_INET_SOCKETS
# define NO_SOCKETS_IN_FILE_SYSTEM

# define HSOCKET SOCKET
# define CLOSE_SOCKET closesocket
# define INITIALIZE() (initialize_sockets ())

#else /* !WINDOWSNT */

# ifdef HAVE_INET_SOCKETS
#  include <netinet/in.h>
# endif

# define INVALID_SOCKET -1
# define HSOCKET int
# define CLOSE_SOCKET close
# define INITIALIZE()

#endif /* !WINDOWSNT */

#undef signal

    }
  exit (EXIT_FAILURE);
}


#if !defined (HAVE_SOCKETS) || !defined (HAVE_INET_SOCKETS)

int
main (argc, argv)
     int argc;
     char **argv;

  fprintf (stderr, "on systems with Berkeley sockets.\n");

  fail (argc, argv);
}

#else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */

#ifdef WINDOWSNT
# include <winsock2.h>
#else
# include <sys/types.h>

HSOCKET
set_tcp_socket ()
{
  HSOCKET s;
  struct sockaddr_in server;
  struct linger l_arg = {1, 1};
  char auth_string[AUTH_KEY_LENGTH + 1];

  INITIALIZE ();

      fprintf (stderr, "%s: ", progname);
      perror ("connect");
      return INVALID_SOCKET;
    }

  setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg);

  /*
   * Send the authentication
   */

  CLOSE_SOCKET (s);
  return EXIT_SUCCESS;
}

#endif /* HAVE_SOCKETS && HAVE_INET_SOCKETS */

#ifndef HAVE_STRERROR
char *
strerror (errnum)
     int errnum;