Eric Blake wrote:
...
> diff --git a/src/system.h b/src/system.h
> index ce71148..f3e26a8 100644
> --- a/src/system.h
> +++ b/src/system.h
> @@ -107,8 +107,10 @@ you must include <sys/types.h> before including this file
> /* Exit statuses for programs like 'env' that exec other programs. */
> enum
> {
> - EXIT_CANNOT_INVOKE = 126,
> - EXIT_ENOENT = 127
> + EXIT_TIMEDOUT = 124, /* Time expired before child completed. */
> + EXIT_CANCELED = 125, /* Internal error prior to exec attempt. */
> + EXIT_CANNOT_INVOKE = 126, /* Program located, but not usable. */
> + EXIT_ENOENT = 127 /* Could not find program to exec. */
Ok. I do see the advantage to consolidating.
>>From 4deeb0f5bf8291d79d53ba7aeb5c1e7811c19c54 Mon Sep 17 00:00:00 2001
> From: Eric Blake <e...@byu.net>
> Date: Thu, 8 Oct 2009 09:35:51 -0600
> Subject: [PATCH 2/3] maint: remove unused macros and declarations
>
> * src/system.h (EDQUOT, EISDIR, ENOSYS, EOVERFLOW, F_OK, X_OK)
> (W_OK, R_OK): Delete; macros provided by gnulib.
> (includes): Gnulib guarantees both <time.h> and <sys/time.h>, in
> either order.
> (free, malloc, memchr, realloc, getenv, lseek): Delete, gnulib
> guarantees these declarations.
> * m4/check-decl.m4 (gl_CHECK_DECLS): Delete checks now done by
> gnulib.
This is fine, now.
>>From 46f5683629e9d361db0427eb4f0ac7eec247b103 Mon Sep 17 00:00:00 2001
> From: Eric Blake <e...@byu.net>
> Date: Thu, 8 Oct 2009 08:35:55 -0600
> Subject: [PATCH 3/3] maint: use X2NREALLOC in more places
>
> * src/chroot.c (set_additional_groups): Use X2NREALLOC rather than
> x2nrealloc.
> * src/factor.c (emit_factor): Likewise.
> * src/setuidgid.c (main): Likewise.
Same as before.
Push at will.
