comparison lib-src/emacsclient.c @ 83603:54df157e987d

(emacs_socket): Rename from s. Move definition below includes it depends on. (SEND_STRING, SEND_QUOTED): Remove obfuscation macros. (quote_argument, set_tcp_socket, handle_sigcont, handle_sigtstp): (main): Expand removed macros inline.

83602:8ea0b74f4daa

#ifndef VERSION
#define VERSION "unspecified"
#endif

#define SEND_STRING(data) (send_to_emacs (emacs_socket, (data)))
#define SEND_QUOTED(data) (quote_argument (emacs_socket, (data)))

#ifndef EXIT_SUCCESS
#define EXIT_SUCCESS 0
#endif

	  *q++ = *p++;
	}
    }
  *q++ = 0;

  SEND_STRING (copy);

  free (copy);
}

  /*
   * Send the authentication
   */
  auth_string[AUTH_KEY_LENGTH] = '\0';

  SEND_STRING ("-auth ");
  SEND_STRING (auth_string);
  SEND_STRING ("\n");

  return s;
}

  int old_errno = errno;

  if (tcgetpgrp (1) == getpgrp ())
    {
      /* We are in the foreground. */
      SEND_STRING ("-resume \n");
    }
  else
    {
      /* We are in the background; cancel the continue. */
      kill (getpid (), SIGSTOP);

{
  int old_errno = errno;
  sigset_t set;
  
  if (s)
    SEND_STRING ("-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);

#ifdef WINDOWSNT
  w32_give_focus ();
#endif

  /* First of all, send our version number for verification. */
  SEND_STRING ("-version ");
  SEND_STRING (VERSION);
  SEND_STRING (" ");

  /* Send over our environment. */
  if (!current_frame)
    {
      extern char **environ;
      int i;
      for (i = 0; environ[i]; i++)
        {
          char *name = xstrdup (environ[i]);
          char *value = strchr (name, '=');
          SEND_STRING ("-env ");
          SEND_QUOTED (environ[i]);
          SEND_STRING (" ");
        }
    }

  /* Send over our current directory. */
  if (!current_frame)
    {
      SEND_STRING ("-dir ");          
      SEND_QUOTED (cwd);
      SEND_STRING ("/");
      SEND_STRING (" ");
    }

 retry:
  if (nowait)
    SEND_STRING ("-nowait ");

  if (current_frame)
    SEND_STRING ("-current-frame ");
  
  if (display)
    {
      SEND_STRING ("-display ");
      SEND_QUOTED (display);
      SEND_STRING (" ");
    }

  if (tty)
    {
      char *tty_name = NULL;

        }
#if !defined (NO_SOCKETS_IN_FILE_SYSTEM)
      init_signals ();
#endif

      SEND_STRING ("-tty ");
      SEND_QUOTED (tty_name);
      SEND_STRING (" ");
      SEND_QUOTED (type);
      SEND_STRING (" ");
    }

  if (window_system)
    SEND_STRING ("-window-system ");

  if ((argc - optind > 0))
    {
      for (i = optind; i < argc; i++)
	{
          int relative = 0;

	  if (eval)
            {
              /* Don't prepend cwd or anything like that.  */
              SEND_STRING ("-eval ");
              SEND_QUOTED (argv[i]);
              SEND_STRING (" ");
              continue;
            }

          if (*argv[i] == '+')
            {
	      char *p = argv[i] + 1;
	      while (isdigit ((unsigned char) *p) || *p == ':') p++;
	      if (*p == 0)
                {
                  SEND_STRING ("-position ");
                  SEND_QUOTED (argv[i]);
                  SEND_STRING (" ");
                  continue;
                }
              else
                relative = 1;
            }
          else if (! file_name_absolute_p (argv[i]))
            relative = 1;

          SEND_STRING ("-file ");
          if (relative)
            {
              SEND_QUOTED (cwd);
              SEND_STRING ("/");
            }
          SEND_QUOTED (argv[i]);
          SEND_STRING (" ");
        }
    }
  else
    {
      if (!tty && !window_system)
        {
          while ((str = fgets (string, BUFSIZ, stdin)))
            {
              if (eval)
                SEND_STRING ("-eval ");
              else
                SEND_STRING ("-file ");
              SEND_QUOTED (str);
            }
          SEND_STRING (" ");
        }
    }

  SEND_STRING ("\n");

  /* Wait for an answer. */
  if (!eval && !tty && !nowait)
    {
      printf ("Waiting for Emacs...");

83603:54df157e987d

#ifndef VERSION
#define VERSION "unspecified"
#endif


#ifndef EXIT_SUCCESS
#define EXIT_SUCCESS 0
#endif

	  *q++ = *p++;
	}
    }
  *q++ = 0;

  send_to_emacs (s, copy);

  free (copy);
}

  /*
   * Send the authentication
   */
  auth_string[AUTH_KEY_LENGTH] = '\0';

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

  return s;
}

  int old_errno = errno;

  if (tcgetpgrp (1) == getpgrp ())
    {
      /* We are in the foreground. */
      send_to_emacs (emacs_socket, "-resume \n");
    }
  else
    {
      /* We are in the background; cancel the continue. */
      kill (getpid (), SIGSTOP);

{
  int old_errno = errno;
  sigset_t set;
  
  if (s)
    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);

#ifdef WINDOWSNT
  w32_give_focus ();
#endif

  /* First of all, send our version number for verification. */
  send_to_emacs (emacs_socket, "-version ");
  send_to_emacs (emacs_socket, VERSION);
  send_to_emacs (emacs_socket, " ");

  /* Send over our environment. */
  if (!current_frame)
    {
      extern char **environ;
      int i;
      for (i = 0; environ[i]; i++)
        {
          char *name = xstrdup (environ[i]);
          char *value = strchr (name, '=');
          send_to_emacs (emacs_socket, "-env ");
          quote_argument (emacs_socket, environ[i]);
          send_to_emacs (emacs_socket, " ");
        }
    }

  /* Send over our current directory. */
  if (!current_frame)
    {
      send_to_emacs (emacs_socket, "-dir ");
      quote_argument (emacs_socket, cwd);
      send_to_emacs (emacs_socket, "/");
      send_to_emacs (emacs_socket, " ");
    }

 retry:
  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, " ");
    }

  if (tty)
    {
      char *tty_name = NULL;

        }
#if !defined (NO_SOCKETS_IN_FILE_SYSTEM)
      init_signals ();
#endif

      send_to_emacs (emacs_socket, "-tty ");
      quote_argument (emacs_socket, tty_name);
      send_to_emacs (emacs_socket, " ");
      quote_argument (emacs_socket, type);
      send_to_emacs (emacs_socket, " ");
    }

  if (window_system)
    send_to_emacs (emacs_socket, "-window-system ");

  if ((argc - optind > 0))
    {
      for (i = optind; i < argc; i++)
	{
          int relative = 0;

	  if (eval)
            {
              /* Don't prepend cwd or anything like that.  */
              send_to_emacs (emacs_socket, "-eval ");
              quote_argument (emacs_socket, argv[i]);
              send_to_emacs (emacs_socket, " ");
              continue;
            }

          if (*argv[i] == '+')
            {
	      char *p = argv[i] + 1;
	      while (isdigit ((unsigned char) *p) || *p == ':') p++;
	      if (*p == 0)
                {
                  send_to_emacs (emacs_socket, "-position ");
                  quote_argument (emacs_socket, argv[i]);
                  send_to_emacs (emacs_socket, " ");
                  continue;
                }
              else
                relative = 1;
            }
          else if (! file_name_absolute_p (argv[i]))
            relative = 1;

          send_to_emacs (emacs_socket, "-file ");
          if (relative)
            {
              quote_argument (emacs_socket, cwd);
              send_to_emacs (emacs_socket, "/");
            }
          quote_argument (emacs_socket, argv[i]);
          send_to_emacs (emacs_socket, " ");
        }
    }
  else
    {
      if (!tty && !window_system)
        {
          while ((str = fgets (string, BUFSIZ, stdin)))
            {
              if (eval)
                send_to_emacs (emacs_socket, "-eval ");
              else
                send_to_emacs (emacs_socket, "-file ");
              quote_argument (emacs_socket, str);
            }
          send_to_emacs (emacs_socket, " ");
        }
    }

  send_to_emacs (emacs_socket, "\n");

  /* Wait for an answer. */
  if (!eval && !tty && !nowait)
    {
      printf ("Waiting for Emacs...");