From 9fc7b5b51f671ed1d2583c2043aa782be122a5b0 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 29 Oct 2018 20:36:01 +0000 Subject: [PATCH] Fix installation of locales-all Dirty hack to fix installation of locales-all: instead of just locking the archive extension (which is not supported on hurd-i386), lock it all. Gbp-Pq: Topic hurd-i386 Gbp-Pq: Name tg-locarchive.diff --- locale/programs/locarchive.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index ca332a345..e91323e1d 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -453,7 +453,16 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) } /* Lock the new file. */ +#ifdef __GNU__ + struct flock fl; + fl.l_whence = SEEK_SET; + fl.l_start = 0; + fl.l_len = 0; + fl.l_type = F_WRLCK; + if (fcntl(fd, F_SETLKW, &fl) != 0) +#else if (lockf64 (fd, F_LOCK, total) != 0) +#endif { int errval = errno; unlink (fname); @@ -613,7 +622,16 @@ open_archive (struct locarhandle *ah, bool readonly) error (EXIT_FAILURE, errno, _("cannot stat locale archive \"%s\""), archivefname); +#ifdef __GNU__ + struct flock fl; + fl.l_whence = SEEK_SET; + fl.l_start = 0; + fl.l_len = 0; + fl.l_type = F_WRLCK; + if (!readonly && fcntl(fd, F_SETLKW, &fl) == -1) +#else if (!readonly && lockf64 (fd, F_LOCK, sizeof (struct locarhead)) == -1) +#endif { close (fd); -- 2.30.2