Portability patches for GNU/Hurd

Portability patches for GNU/Hurd

[Thomas Schwinge]

Hi!

The subject says is all.  :-)


Grüße,
 Thomas

[PATCH] test_pager: Repair build for non-Linux.

[Thomas Schwinge]

Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
---
 lib/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index aed0ecd..01b59dc 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -27,6 +27,7 @@ test_blkdev_SOURCES = blkdev.c
 test_ismounted_SOURCES = ismounted.c
 test_wholedisk_SOURCES = wholedisk.c
 test_mangle_SOURCES = mangle.c
+test_pager_SOURCES = pager.c
 
 test_at_SOURCES = at.c
 test_at_CFLAGS = -DTEST_PROGRAM_AT
@@ -38,7 +39,6 @@ test_procutils_SOURCES = procutils.c
 if LINUX
 test_cpuset_SOURCES = cpuset.c
 test_sysfs_SOURCES = sysfs.c at.c
-test_pager_SOURCES = pager.c
 test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS
 
 test_loopdev_SOURCES = \
-- 
1.7.9

Re: [PATCH] test_pager: Repair build for non-Linux.

[Karel Zak]

On Fri, May 25, 2012 at 08:13:41PM +0200, Thomas Schwinge wrote:
>  lib/Makefile.am |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

[PATCH 1/7] kill, raw, rename: Don't explicitly enable for --enable-most-builds.

[Thomas Schwinge]

They're already dealt with in the default configuration.

Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
---
 configure.ac |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index eb67ada..76f73a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -631,12 +631,9 @@ if test "x$enable_most_builds" = xyes; then
   enable_arch=yes
   enable_ddate=yes
   enable_elvtune=yes
-  enable_kill=yes
   enable_last=yes
   enable_line=yes
   enable_mesg=yes
-  enable_raw=yes
-  enable_rename=yes
   enable_reset=yes
   enable_login_utils=yes
   enable_write=yes
-- 
1.7.9

[PATCH 2/7] arch, eject, elvtune: Gracefully disable on non-Linux platforms.

[Thomas Schwinge]

Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
---
 configure.ac |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 76f73a1..cd8fa4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -628,9 +628,9 @@ AC_ARG_ENABLE([most-builds],
   [], enable_most_builds=no
 )
 if test "x$enable_most_builds" = xyes; then
-  enable_arch=yes
+  enable_arch=check
   enable_ddate=yes
-  enable_elvtune=yes
+  enable_elvtune=check
   enable_last=yes
   enable_line=yes
   enable_mesg=yes
@@ -862,7 +862,7 @@ AC_SUBST([ruman1dir])
 
 AC_ARG_ENABLE([eject],
   AS_HELP_STRING([--disable-eject], [do not build eject]),
-  [], enable_eject=yes
+  [], enable_eject=check
 )
 UL_BUILD_INIT([eject])
 UL_REQUIRES_LINUX([eject])
-- 
1.7.9

Re: [PATCH 2/7] arch, eject, elvtune: Gracefully disable on non-Linux platforms.

[Karel Zak]

On Fri, May 25, 2012 at 08:16:13PM +0200, Thomas Schwinge wrote:
>  configure.ac |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

[PATCH 3/7] last, login, write: Provide a fallback for MAXHOSTNAMELEN, as elsewhere.

[Thomas Schwinge]

Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
---
 login-utils/last.c  |    8 ++++++++
 login-utils/login.c |    8 ++++++++
 term-utils/write.c  |    8 ++++++++
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/login-utils/last.c b/login-utils/last.c
index 1b1bee1..4d09c4b 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -62,6 +62,14 @@
 #include "xalloc.h"
 #include "c.h"
 
+#ifndef MAXHOSTNAMELEN
+# ifdef HOST_NAME_MAX
+#  define MAXHOSTNAMELEN HOST_NAME_MAX
+# else
+#  define MAXHOSTNAMELEN 64
+# endif
+#endif
+
 #define	SECDAY	(24*60*60)			/* seconds in a day */
 #define	NO	0				/* false/no */
 #define	YES	1				/* true/yes */
diff --git a/login-utils/login.c b/login-utils/login.c
index 7b4f8b5..f459b79 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -71,6 +71,14 @@
 
 #include "logindefs.h"
 
+#ifndef MAXHOSTNAMELEN
+# ifdef HOST_NAME_MAX
+#  define MAXHOSTNAMELEN HOST_NAME_MAX
+# else
+#  define MAXHOSTNAMELEN 64
+# endif
+#endif
+
 #define is_pam_failure(_rc)	((_rc) != PAM_SUCCESS)
 
 #define LOGIN_MAX_TRIES        3
diff --git a/term-utils/write.c b/term-utils/write.c
index 2a94792..c8aca7e 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -65,6 +65,14 @@
 #include "closestream.h"
 #include "nls.h"
 
+#ifndef MAXHOSTNAMELEN
+# ifdef HOST_NAME_MAX
+#  define MAXHOSTNAMELEN HOST_NAME_MAX
+# else
+#  define MAXHOSTNAMELEN 64
+# endif
+#endif
+
 static void __attribute__ ((__noreturn__)) usage(FILE * out);
 void search_utmp(char *, char *, char *, uid_t);
 void do_write(char *, char *, uid_t);
-- 
1.7.9

Re: [PATCH 3/7] last, login, write: Provide a fallback for MAXHOSTNAMELEN, as elsewhere.

[Karel Zak]

On Fri, May 25, 2012 at 08:16:14PM +0200, Thomas Schwinge wrote:
> Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
> ---
>  login-utils/last.c  |    8 ++++++++
>  login-utils/login.c |    8 ++++++++
>  term-utils/write.c  |    8 ++++++++
>  3 files changed, 24 insertions(+), 0 deletions(-)

 I have moved the fallback for MAXHOSTNAMELEN to c.h, it seems better
 than duplicate the code.  Thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 3/7] last, login, write: Provide a fallback for MAXHOSTNAMELEN, as elsewhere.

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 623 bytes --]

Hi!

On Tue, 29 May 2012 10:10:25 +0200, Karel Zak <kzak@redhat.com> wrote:
> On Fri, May 25, 2012 at 08:16:14PM +0200, Thomas Schwinge wrote:
> > Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
> > ---
> >  login-utils/last.c  |    8 ++++++++
> >  login-utils/login.c |    8 ++++++++
> >  term-utils/write.c  |    8 ++++++++
> >  3 files changed, 24 insertions(+), 0 deletions(-)
> 
>  I have moved the fallback for MAXHOSTNAMELEN to c.h, it seems better
>  than duplicate the code.  Thanks.

Yes, of course that makes even more sense.  Thanks also for applying the
others.


Grüße,
 Thomas

[-- Attachment #2: Type: application/pgp-signature, Size: 489 bytes --]

[PATCH 4/7] login: Include <linux/major.h> only if it exists.

[Thomas Schwinge]

It isn't required on non-Linux systems.

Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
---
 login-utils/login.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/login-utils/login.c b/login-utils/login.c
index f459b79..7384940 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -49,7 +49,9 @@
 #include <stdlib.h>
 #include <sys/syslog.h>
 #include <sys/sysmacros.h>
-#include <linux/major.h>
+#ifdef HAVE_LINUX_MAJOR_H
+# include <linux/major.h>
+#endif
 #include <netdb.h>
 #include <lastlog.h>
 #include <security/pam_appl.h>
-- 
1.7.9

[PATCH 5/7] write: Use PATH_MAX instead of MAXPATHLEN, as elsewhere.

[Thomas Schwinge]

Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
---
 term-utils/write.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/term-utils/write.c b/term-utils/write.c
index c8aca7e..901ddc4 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 	time_t atime;
 	uid_t myuid;
 	int msgsok, myttyfd, c;
-	char tty[MAXPATHLEN], *mytty;
+	char tty[PATH_MAX], *mytty;
 
 	static const struct option longopts[] = {
 		{"version", no_argument, NULL, 'V'},
@@ -296,7 +296,7 @@ void search_utmp(char *user, char *tty, char *mytty, uid_t myuid)
 int term_chk(char *tty, int *msgsokP, time_t * atimeP, int showerror)
 {
 	struct stat s;
-	char path[MAXPATHLEN];
+	char path[PATH_MAX];
 
 	if (strlen(tty) + 6 > sizeof(path))
 		return 1;
@@ -321,7 +321,7 @@ void do_write(char *tty, char *mytty, uid_t myuid)
 	char *login, *pwuid, *nows;
 	struct passwd *pwd;
 	time_t now;
-	char path[MAXPATHLEN], host[MAXHOSTNAMELEN], line[512];
+	char path[PATH_MAX], host[MAXHOSTNAMELEN], line[512];
 
 	/* Determine our login name(s) before the we reopen() stdout */
 	if ((pwd = getpwuid(myuid)) != NULL)
-- 
1.7.9

Re: [PATCH 5/7] write: Use PATH_MAX instead of MAXPATHLEN, as elsewhere.

[Karel Zak]

On Fri, May 25, 2012 at 08:16:16PM +0200, Thomas Schwinge wrote:
>  term-utils/write.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

[PATCH 6/7] write: Don't explicitly include <asm/param.h>.

[Thomas Schwinge]

It doesn't exist on some systems, but will come in via <sys/param.h> on the
others.

Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
---
 term-utils/write.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/term-utils/write.c b/term-utils/write.c
index 901ddc4..9964e08 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -57,7 +57,6 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <paths.h>
-#include <asm/param.h>
 #include <getopt.h>
 
 #include "c.h"
-- 
1.7.9

Re: [PATCH 6/7] write: Don't explicitly include <asm/param.h>.

[Karel Zak]

On Fri, May 25, 2012 at 08:16:17PM +0200, Thomas Schwinge wrote:
>  term-utils/write.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

[PATCH 7/7] setsid: Include <sys/ioctl.h> instead of <termio.h>.

[Thomas Schwinge]

Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
---
 sys-utils/setsid.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c
index 6d1eeda..52ad38f 100644
--- a/sys-utils/setsid.c
+++ b/sys-utils/setsid.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <termio.h>
+#include <sys/ioctl.h>
 
 #include "c.h"
 #include "nls.h"
-- 
1.7.9

Re: [PATCH 7/7] setsid: Include <sys/ioctl.h> instead of <termio.h>.

[Karel Zak]

On Fri, May 25, 2012 at 08:16:18PM +0200, Thomas Schwinge wrote:
>  sys-utils/setsid.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 1/7] kill, raw, rename: Don't explicitly enable for --enable-most-builds.

[Karel Zak]

On Fri, May 25, 2012 at 08:16:12PM +0200, Thomas Schwinge wrote:
>  configure.ac |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com