comparison lib-src/emacsclient.c @ 91367:c70e45a7acfd

Merge from emacs--devo--0 Revision: [e-mail]/emacs--unicode--0--patch-324

91366:86f3a8f0a3a6

  { "alternate-editor", required_argument, NULL, 'a' },
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
  { "socket-name",	required_argument, NULL, 's' },
#endif
  { "server-file",	required_argument, NULL, 'f' },
  { "display",	required_argument, NULL, 'd' },
  { 0, 0, 0, 0 }
};


/* Like malloc but get fatal error if memory is exhausted.  */

#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))
#endif


/* Return the current working directory.  Returns NULL on errors.
   Any other returned value must be freed with free. This is used
   only when get_current_dir_name is not defined on the system.  */
char*
get_current_dir_name ()
{
  char *buf;

decode_options (argc, argv)
     int argc;
     char **argv;
{
  alternate_editor = egetenv ("ALTERNATE_EDITOR");
  display = egetenv ("DISPLAY");
  if (display && strlen (display) == 0)
    display = NULL;

  while (1)
    {
      int opt = getopt_long (argc, argv,
#ifndef NO_SOCKETS_IN_FILE_SYSTEM

	case 'f':
	  server_file = optarg;
	  break;

	case 'd':
	  display = optarg;
	  break;

	case 'n':
	  nowait = 1;
	  break;

	  message (TRUE, "Try `%s --help' for more information\n", progname);
	  exit (EXIT_FAILURE);
	  break;
	}
    }

  if (!tty && display)
    window_system = 1;
#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
  else

-H, --help    		Print this usage information message\n\
-t, --tty    		Open a new Emacs frame on the current terminal\n\
-c, --create-frame    	Create a new frame instead of trying to\n\
			use the current Emacs frame\n\
-e, --eval    		Evaluate the FILE arguments as ELisp expressions\n\
-n, --no-wait		Don't wait for the server to return\n\
-d, --display=DISPLAY	Visit the file in the given display\n"
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
"-s, --socket-name=FILENAME\n\
			Set filename of the UNIX socket for communication\n"
#endif
"-f, --server-file=FILENAME\n\

{
  WSADATA wsaData;

  if (WSAStartup (MAKEWORD (2, 0), &wsaData))
    {
      message (TRUE, "%s: error initializing WinSock2", progname);
      exit (EXIT_FAILURE);
    }

  atexit (close_winsock);
}

      *port++ = '\0';
      *pid++  = '\0';
    }
  else
    {
      message (TRUE, "%s: invalid configuration info", progname);
      exit (EXIT_FAILURE);
    }

  server->sin_family = AF_INET;
  server->sin_addr.s_addr = inet_addr (dotted);
  server->sin_port = htons (atoi (port));

  if (! fread (authentication, AUTH_KEY_LENGTH, 1, config))
    {
      message (TRUE, "%s: cannot read authentication info", progname);
      exit (EXIT_FAILURE);
    }

  fclose (config);

   */
  auth_string[AUTH_KEY_LENGTH] = '\0';

  send_to_emacs (s, "-auth ");
  send_to_emacs (s, auth_string);
  send_to_emacs (s, "\n");

  return s;
}

  sigset_t set;

  if (emacs_socket)
    send_to_emacs (emacs_socket, "-suspend \n");

  /* Unblock this signal and call the default handler by temprarily
     changing the handler and resignalling. */
  sigprocmask (SIG_BLOCK, NULL, &set);
  sigdelset (&set, signalnum);
  signal (signalnum, SIG_DFL);
  kill (getpid (), signalnum);

    if (strlen (socket_name) < sizeof (server.sun_path))
      strcpy (server.sun_path, socket_name);
    else
      {
        message (TRUE, "%s: socket-name %s too long",
                 progname, socket_name);
        fail ();
      }

    /* See if the socket exists, and if it's owned by us. */

		if (strlen (socket_name) < sizeof (server.sun_path))
		  strcpy (server.sun_path, socket_name);
		else
		  {
		    message (TRUE, "%s: socket-name %s too long",
			     progname, socket_name);
		    exit (EXIT_FAILURE);
		  }

		sock_status = socket_status (server.sun_path);

  if (socket_name)
    {
      s = set_local_socket ();
      if ((s != INVALID_SOCKET) || alternate_editor)
	return s;
      message (TRUE, "%s: error accessing socket \"%s\"",
	       progname, socket_name);
      exit (EXIT_FAILURE);
    }
#endif

    {
      s = set_tcp_socket ();
      if ((s != INVALID_SOCKET) || alternate_editor)
	return s;

      message (TRUE, "%s: error accessing server file \"%s\"",
	       progname, server_file);
      exit (EXIT_FAILURE);
    }

#ifndef NO_SOCKETS_IN_FILE_SYSTEM

91367:c70e45a7acfd

  { "alternate-editor", required_argument, NULL, 'a' },
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
  { "socket-name",	required_argument, NULL, 's' },
#endif
  { "server-file",	required_argument, NULL, 'f' },
#ifndef WINDOWSNT
  { "display",	required_argument, NULL, 'd' },
#endif
  { 0, 0, 0, 0 }
};


/* Like malloc but get fatal error if memory is exhausted.  */

#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))
#endif


/* Return the current working directory.  Returns NULL on errors.
   Any other returned value must be freed with free.  This is used
   only when get_current_dir_name is not defined on the system.  */
char*
get_current_dir_name ()
{
  char *buf;

decode_options (argc, argv)
     int argc;
     char **argv;
{
  alternate_editor = egetenv ("ALTERNATE_EDITOR");

  /* We used to set `display' to $DISPLAY by default, but this changed the
     default behavior and is sometimes inconvenient.  So instead of forcing
     users to say "--display ''" when they want to use Emacs's existing tty
     or display connection, we force them to use "--display $DISPLAY" if
     they want Emacs to connect to their current display.  */
#if 0
  display = egetenv ("DISPLAY");
#endif

  while (1)
    {
      int opt = getopt_long (argc, argv,
#ifndef NO_SOCKETS_IN_FILE_SYSTEM

	case 'f':
	  server_file = optarg;
	  break;

	  /* We used to disallow this argument in w32, but it seems better
	     to allow it, for the occasional case where the user is
	     connecting with a w32 client to a server compiled with X11
	     support.  */
#if 1 /* !defined WINDOWS */
	case 'd':
	  display = optarg;
	  break;
#endif

	case 'n':
	  nowait = 1;
	  break;

	  message (TRUE, "Try `%s --help' for more information\n", progname);
	  exit (EXIT_FAILURE);
	  break;
	}
    }

  if (display && strlen (display) == 0)
    display = NULL;

  if (!tty && display)
    window_system = 1;
#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
  else

-H, --help    		Print this usage information message\n\
-t, --tty    		Open a new Emacs frame on the current terminal\n\
-c, --create-frame    	Create a new frame instead of trying to\n\
			use the current Emacs frame\n\
-e, --eval    		Evaluate the FILE arguments as ELisp expressions\n\
-n, --no-wait		Don't wait for the server to return\n"
#ifndef WINDOWSNT
"-d, --display=DISPLAY	Visit the file in the given display\n"
#endif
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
"-s, --socket-name=FILENAME\n\
			Set filename of the UNIX socket for communication\n"
#endif
"-f, --server-file=FILENAME\n\

{
  WSADATA wsaData;

  if (WSAStartup (MAKEWORD (2, 0), &wsaData))
    {
      message (TRUE, "%s: error initializing WinSock2\n", progname);
      exit (EXIT_FAILURE);
    }

  atexit (close_winsock);
}

      *port++ = '\0';
      *pid++  = '\0';
    }
  else
    {
      message (TRUE, "%s: invalid configuration info\n", progname);
      exit (EXIT_FAILURE);
    }

  server->sin_family = AF_INET;
  server->sin_addr.s_addr = inet_addr (dotted);
  server->sin_port = htons (atoi (port));

  if (! fread (authentication, AUTH_KEY_LENGTH, 1, config))
    {
      message (TRUE, "%s: cannot read authentication info\n", progname);
      exit (EXIT_FAILURE);
    }

  fclose (config);

   */
  auth_string[AUTH_KEY_LENGTH] = '\0';

  send_to_emacs (s, "-auth ");
  send_to_emacs (s, auth_string);
  send_to_emacs (s, " ");

  return s;
}

  sigset_t set;

  if (emacs_socket)
    send_to_emacs (emacs_socket, "-suspend \n");

  /* Unblock this signal and call the default handler by temporarily
     changing the handler and resignalling. */
  sigprocmask (SIG_BLOCK, NULL, &set);
  sigdelset (&set, signalnum);
  signal (signalnum, SIG_DFL);
  kill (getpid (), signalnum);

    if (strlen (socket_name) < sizeof (server.sun_path))
      strcpy (server.sun_path, socket_name);
    else
      {
        message (TRUE, "%s: socket-name %s too long\n",
                 progname, socket_name);
        fail ();
      }

    /* See if the socket exists, and if it's owned by us. */

		if (strlen (socket_name) < sizeof (server.sun_path))
		  strcpy (server.sun_path, socket_name);
		else
		  {
		    message (TRUE, "%s: socket-name %s too long\n",
			     progname, socket_name);
		    exit (EXIT_FAILURE);
		  }

		sock_status = socket_status (server.sun_path);

  if (socket_name)
    {
      s = set_local_socket ();
      if ((s != INVALID_SOCKET) || alternate_editor)
	return s;
      message (TRUE, "%s: error accessing socket \"%s\"\n",
	       progname, socket_name);
      exit (EXIT_FAILURE);
    }
#endif

    {
      s = set_tcp_socket ();
      if ((s != INVALID_SOCKET) || alternate_editor)
	return s;

      message (TRUE, "%s: error accessing server file \"%s\"\n",
	       progname, server_file);
      exit (EXIT_FAILURE);
    }

#ifndef NO_SOCKETS_IN_FILE_SYSTEM