comparison lib-src/emacsclient.c @ 83624:3b1222f7b28a

(print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was lost in the merge.

83623:85ebbe91c285

    window_system = 1;
#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
  else
    tty = 1;
#endif
  
  /* --no-wait implies --current-frame on ttys when there are file
       arguments or expressions given.  */
  if (nowait && tty && argc - optind > 0)
    current_frame = 1;


void
print_help_and_exit ()
{
  message (FALSE,
	   "Usage: %s [OPTIONS] FILE...\n\
Tell the Emacs server to visit the specified files.\n\
Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\
\n\
The following OPTIONS are accepted:\n\
-V, --version           Just print version info and return\n\
-H, --help              Print this usage information message\n\
-t, --tty               Open a new Emacs frame on the current terminal\n\
-c, --current-frame	Do not create a new frame; 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\
                        Set filename of the TCP authentication file\n\
-a, --alternate-editor=EDITOR\n\
                        Editor to fallback to if the server is not running\n\
\n\
Report bugs to [e-mail].\n", progname);
  exit (EXIT_SUCCESS);
}

{
  main_argc = argc;
  main_argv = argv;
  progname = argv[0];
  message (TRUE, "%s: Sorry, the Emacs server is supported only\n"
	   "on systems with Berkeley sockets.\n", 
	   argv[0]);
  fail ();
}

#else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */

SIGTYPE
handle_sigtstp (int signalnum)
{
  int old_errno = errno;
  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. */

HSOCKET
set_socket ()
{
  HSOCKET s;
  
  INITIALIZE ();
  
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
  /* Explicit --socket-name argument.  */
  if (socket_name)
    {
      s = set_local_socket ();

  if (server_file)
    {
      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
  /* Implicit local socket.  */
  s = set_local_socket ();
  if (s != INVALID_SOCKET)
    return s;

  if (nowait)
    send_to_emacs (emacs_socket, "-nowait ");

  if (current_frame)
    send_to_emacs (emacs_socket, "-current-frame ");
  
  if (display)
    {
      send_to_emacs (emacs_socket, "-display ");
      quote_argument (emacs_socket, display);
      send_to_emacs (emacs_socket, " ");

83624:3b1222f7b28a

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

  /* --no-wait implies --current-frame on ttys when there are file
       arguments or expressions given.  */
  if (nowait && tty && argc - optind > 0)
    current_frame = 1;


void
print_help_and_exit ()
{
  /* Spaces and tabs are significant in this message; they're chosen so the
     message aligns properly both in a tty and in a Windows message box.
     Please try to preserve them; otherwise the output is very hard to read
     when using emacsclientw.  */
  message (FALSE,
	   "Usage: %s [OPTIONS] FILE...\n\
Tell the Emacs server to visit the specified files.\n\
Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\
\n\
The following OPTIONS are accepted:\n\
-V, --version		Just print version info and return\n\
-H, --help    		Print this usage information message\n\
-t, --tty    		Open a new Emacs frame on the current terminal\n\
-c, --current-frame  	Do not create a new frame;\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\
			Set filename of the TCP authentication file\n\
-a, --alternate-editor=EDITOR\n\
			Editor to fallback to if the server is not running\n\
\n\
Report bugs to [e-mail].\n", progname);
  exit (EXIT_SUCCESS);
}

{
  main_argc = argc;
  main_argv = argv;
  progname = argv[0];
  message (TRUE, "%s: Sorry, the Emacs server is supported only\n"
	   "on systems with Berkeley sockets.\n",
	   argv[0]);
  fail ();
}

#else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */

SIGTYPE
handle_sigtstp (int signalnum)
{
  int old_errno = errno;
  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. */

HSOCKET
set_socket ()
{
  HSOCKET s;

  INITIALIZE ();

#ifndef NO_SOCKETS_IN_FILE_SYSTEM
  /* Explicit --socket-name argument.  */
  if (socket_name)
    {
      s = set_local_socket ();

  if (server_file)
    {
      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
  /* Implicit local socket.  */
  s = set_local_socket ();
  if (s != INVALID_SOCKET)
    return s;

  if (nowait)
    send_to_emacs (emacs_socket, "-nowait ");

  if (current_frame)
    send_to_emacs (emacs_socket, "-current-frame ");

  if (display)
    {
      send_to_emacs (emacs_socket, "-display ");
      quote_argument (emacs_socket, display);
      send_to_emacs (emacs_socket, " ");