[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/lib-src/emacsclient.c
diff -c emacs/lib-src/emacsclient.c:1.59.2.1 
emacs/lib-src/emacsclient.c:1.59.2.2
*** emacs/lib-src/emacsclient.c:1.59.2.1        Fri Apr 16 12:49:44 2004
--- emacs/lib-src/emacsclient.c Mon Jun 28 07:28:22 2004
***************
*** 44,52 ****
  char *getenv (), *getwd ();
  char *getcwd ();
  
- /* This is defined with -D from the compilation command,
-    which extracts it from ../lisp/version.el.  */
- 
  #ifndef VERSION
  #define VERSION "unspecified"
  #endif
--- 44,49 ----
***************
*** 131,137 ****
  
        case 'V':
          printf ("emacsclient %s\n", VERSION);
!         exit (0);
          break;
  
        case 'H':
--- 128,134 ----
  
        case 'V':
          printf ("emacsclient %s\n", VERSION);
!         exit (EXIT_SUCCESS);
          break;
  
        case 'H':
***************
*** 140,146 ****
  
        default:
          fprintf (stderr, "Try `%s --help' for more information\n", progname);
!         exit (1);
          break;
        }
      }
--- 137,143 ----
  
        default:
          fprintf (stderr, "Try `%s --help' for more information\n", progname);
!         exit (EXIT_FAILURE);
          break;
        }
      }
***************
*** 166,172 ****
                          Editor to fallback to if the server is not running\n\
  \n\
  Report bugs to address@hidden", progname);
!   exit (0);
  }
  
  /* In NAME, insert a & before each &, each space, each newline, and
--- 163,169 ----
                          Editor to fallback to if the server is not running\n\
  \n\
  Report bugs to address@hidden", progname);
!   exit (EXIT_SUCCESS);
  }
  
  /* In NAME, insert a & before each &, each space, each newline, and
***************
*** 221,227 ****
    if (result == NULL)
    {
      perror ("malloc");
!     exit (1);
    }
    return result;
  }
--- 218,224 ----
    if (result == NULL)
    {
      perror ("malloc");
!     exit (EXIT_FAILURE);
    }
    return result;
  }
***************
*** 243,249 ****
      }
    else
      {
!       exit (1);
      }
  }
  
--- 240,246 ----
      }
    else
      {
!       exit (EXIT_FAILURE);
      }
  }
  
***************
*** 314,320 ****
      {
        fprintf (stderr, "%s: file name or argument required\n", progname);
        fprintf (stderr, "Try `%s --help' for more information\n", progname);
!       exit (1);
      }
  
    /*
--- 311,317 ----
      {
        fprintf (stderr, "%s: file name or argument required\n", progname);
        fprintf (stderr, "Try `%s --help' for more information\n", progname);
!       exit (EXIT_FAILURE);
      }
  
    /*
***************
*** 356,362 ****
        {
        fprintf (stderr, "%s: socket-name %s too long",
                 argv[0], socket_name);
!       exit (1);
        }
  
      /* See if the socket exists, and if it's owned by us. */
--- 353,359 ----
        {
        fprintf (stderr, "%s: socket-name %s too long",
                 argv[0], socket_name);
!       exit (EXIT_FAILURE);
        }
  
      /* See if the socket exists, and if it's owned by us. */
***************
*** 391,397 ****
                  {
                    fprintf (stderr, "%s: socket-name %s too long",
                             argv[0], socket_name);
!                   exit (1);
                  }
  
                sock_status = socket_status (server.sun_path);
--- 388,394 ----
                  {
                    fprintf (stderr, "%s: socket-name %s too long",
                             argv[0], socket_name);
!                   exit (EXIT_FAILURE);
                  }
  
                sock_status = socket_status (server.sun_path);
***************
*** 522,534 ****
        }
        fprintf (out, " ");
      }
!   
    fprintf (out, "\n");
    fflush (out);
  
    /* Maybe wait for an answer.   */
    if (nowait)
!     return 0;
  
    if (!eval)
      {
--- 519,531 ----
        }
        fprintf (out, " ");
      }
! 
    fprintf (out, "\n");
    fflush (out);
  
    /* Maybe wait for an answer.   */
    if (nowait)
!     return EXIT_SUCCESS;
  
    if (!eval)
      {
***************
*** 550,556 ****
      printf ("\n");
    fflush (stdout);
  
!   return 0;
  }
  
  #endif /* HAVE_SOCKETS */
--- 547,553 ----
      printf ("\n");
    fflush (stdout);
  
!   return EXIT_SUCCESS;
  }
  
  #endif /* HAVE_SOCKETS */
***************
*** 572,574 ****
--- 569,573 ----
  
  /* arch-tag: f39bb9c4-73eb-477e-896d-50832e2ca9a7
     (do not change this comment) */
+ 
+ /* emacsclient.c ends here */