emacsclient.c build on FreeBSD

emacsclient.c build on FreeBSD

[Giorgos Keramidas]

Hi Dan,

This change:

: 2008-12-10  Dan Nicolaescu  <dann@ics.uci.edu>
:
:         * emacsclient.c (print_help_and_exit): Describe what an empty
:         string argument does for --alternate-editor.
:         (set_socket): Make it possible to not exit in case of an error.
:         (start_daemon_and_retry_set_socket): New function.
:         (main): Use it.  Restore the NULL value for socket_name and
:         server_file after the set_socket call.

needs a small patch to build on FreeBSD/i386:

%%%
diff -r 1d6f7d6431ac lib-src/emacsclient.c
--- a/lib-src/emacsclient.c     Sun Dec 14 02:39:37 2008 +0200
+++ b/lib-src/emacsclient.c     Sun Dec 14 02:58:31 2008 +0200
@@ -42,6 +42,7 @@
 #else /* !WINDOWSNT */

 # include <sys/types.h>
+# include <sys/wait.h>

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

The WUNTRACED macro referenced by the new code in the patch is defined
in <sys/wait.h> on FreeBSD, and without this include the build of Emacs
fails.  I looked for a HAVE_SYS_WAIT_H macro but couldn't find one.  If
<sys/wait.h> is not available on GNU/Linux we can definitely add a check
in configure.in too :)

Re: emacsclient.c build on FreeBSD

[Giorgos Keramidas]

On Sun, 14 Dec 2008 03:02:12 +0200, Giorgos Keramidas <keramida@ceid.upatras.gr> wrote:
> Hi Dan,
>
> This change:
>
> : 2008-12-10  Dan Nicolaescu  <dann@ics.uci.edu>
> :
> :         * emacsclient.c (print_help_and_exit): Describe what an empty
> :         string argument does for --alternate-editor.
> :         (set_socket): Make it possible to not exit in case of an error.
> :         (start_daemon_and_retry_set_socket): New function.
> :         (main): Use it.  Restore the NULL value for socket_name and
> :         server_file after the set_socket call.
>
> needs a small patch to build on FreeBSD/i386:

A more complete patch, including a ChangeLog entry is:

%%%
diff -r 1d6f7d6431ac lib-src/ChangeLog
--- a/lib-src/ChangeLog	Sun Dec 14 02:39:37 2008 +0200
+++ b/lib-src/ChangeLog	Sun Dec 14 03:06:52 2008 +0200
@@ -1,3 +1,8 @@
+2008-12-14  Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change)
+
+	* lib-src/emacsclient.c: Add <sys/wait.h> to pull in a definition of
+	WUNTRACED on FreeBSD.
+
 2008-12-11  dhruva <dhruvakm@gmail.com> (tiny change)
 
 	* emacsclient.c (WCONTINUED): New compatibility define for older systems.
diff -r 1d6f7d6431ac lib-src/emacsclient.c
--- a/lib-src/emacsclient.c	Sun Dec 14 02:39:37 2008 +0200
+++ b/lib-src/emacsclient.c	Sun Dec 14 03:06:52 2008 +0200
@@ -42,6 +42,7 @@
 #else /* !WINDOWSNT */
 
 # include <sys/types.h>
+# include <sys/wait.h>
 
 # ifdef HAVE_INET_SOCKETS
 #  include <netinet/in.h>
%%%

Re: emacsclient.c build on FreeBSD

[Dan Nicolaescu]

Giorgos Keramidas <keramida@ceid.upatras.gr> writes:

  > Hi Dan,
  > 
  > This change:
  > 
  > : 2008-12-10  Dan Nicolaescu  <dann@ics.uci.edu>
  > :
  > :         * emacsclient.c (print_help_and_exit): Describe what an empty
  > :         string argument does for --alternate-editor.
  > :         (set_socket): Make it possible to not exit in case of an error.
  > :         (start_daemon_and_retry_set_socket): New function.
  > :         (main): Use it.  Restore the NULL value for socket_name and
  > :         server_file after the set_socket call.
  > 
  > needs a small patch to build on FreeBSD/i386:
  > 
  > %%%
  > diff -r 1d6f7d6431ac lib-src/emacsclient.c
  > --- a/lib-src/emacsclient.c     Sun Dec 14 02:39:37 2008 +0200
  > +++ b/lib-src/emacsclient.c     Sun Dec 14 02:58:31 2008 +0200
  > @@ -42,6 +42,7 @@
  >  #else /* !WINDOWSNT */
  > 
  >  # include <sys/types.h>
  > +# include <sys/wait.h>

Thanks for the bug report.  Instead I included syswait.h that includes
both the above files.

Re: emacsclient.c build on FreeBSD

[Giorgos Keramidas]

On Sat, 13 Dec 2008 19:28:26 -0800 (PST), Dan Nicolaescu <dann@ics.uci.edu> wrote:
> Giorgos Keramidas <keramida@ceid.upatras.gr> writes:
>
>   > Hi Dan,
>   >
>   > This change:
>   >
>   > : 2008-12-10  Dan Nicolaescu  <dann@ics.uci.edu>
>   > :
>   > :         * emacsclient.c (print_help_and_exit): Describe what an empty
>   > :         string argument does for --alternate-editor.
>   > :         (set_socket): Make it possible to not exit in case of an error.
>   > :         (start_daemon_and_retry_set_socket): New function.
>   > :         (main): Use it.  Restore the NULL value for socket_name and
>   > :         server_file after the set_socket call.
>   >
>   > needs a small patch to build on FreeBSD/i386:
>   >
>   > %%%
>   > diff -r 1d6f7d6431ac lib-src/emacsclient.c
>   > --- a/lib-src/emacsclient.c     Sun Dec 14 02:39:37 2008 +0200
>   > +++ b/lib-src/emacsclient.c     Sun Dec 14 02:58:31 2008 +0200
>   > @@ -42,6 +42,7 @@
>   >  #else /* !WINDOWSNT */
>   >
>   >  # include <sys/types.h>
>   > +# include <sys/wait.h>
>
> Thanks for the bug report.  Instead I included syswait.h that includes
> both the above files.

Excellent!  I missed syswait.h when I ran `find emacs -name wait.h'.

Now that this works fine again, I can update the editors/emacs-devel
port of FreeBSD in a few hours, to include Eli's info fixes, because the
latest update of the package runs fine but only opens `/usr/local/info/dir'
even when Emacs is compiled with --prefix=<non standard path>.

Thanks :)