Re: coreutils 7.6 doesn't build on arm

[Jim Meyering]

Lluís Batlle wrote:

> I'm using glibc 2.9, and gcc 4.3.4, and I can't build coreutils 7.6.
> Should I be able to build it?
>
> I get this build error:
> gcc -std=gnu99  -I.      -g -O2 -c -o mkstemp.o mkstemp.cc
> mkstemp.c: In function 'rpl_mkstemp':
> mkstemp.c:43: error: too many arguments to function 'gen_tempname'

Thanks for the report.
That is a portability problem
due to changes in gnulib that did not propagate back to
coreutils' copy of the tempname module in it's gl/ hierarchy.

Here's a totally untested patch:
As I type this, I see at least one thing wrong: leading TABs.
Let me know if you'd like a snapshot tarball.


>From ff4559c1be30ac77c28a4bf7d14069bd13f96466 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 18 Sep 2009 23:05:59 +0200
Subject: [PATCH] rebase local copy of tempname module

---
 gl/lib/tempname.c |   25 +++++++++----------------
 gl/lib/tempname.h |    5 +++--
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/gl/lib/tempname.c b/gl/lib/tempname.c
index 0171516..877ae51 100644
--- a/gl/lib/tempname.c
+++ b/gl/lib/tempname.c
@@ -41,8 +41,7 @@
 # define TMP_MAX 238328
 #endif
 #ifndef __GT_FILE
-# define __GT_FILE     0
-# define __GT_BIGFILE  1
+# define __GT_FILE     1
 # define __GT_DIR      2
 # define __GT_NOCREATE 3
 #endif
@@ -61,12 +60,9 @@

 #if _LIBC
 # define struct_stat64 struct stat64
-# define small_open __open
-# define large_open __open64
 #else
 # define struct_stat64 struct stat
-# define small_open open
-# define large_open open
+# define __open open
 # define __gen_tempname gen_tempname
 # define __getpid getpid
 # define __gettimeofday gettimeofday
@@ -171,13 +167,12 @@ static const char letters[] =
    __GT_NOCREATE:      simply verify that the name does not exist
                         at the time of the call.
    __GT_FILE:          create the file using open(O_CREAT|O_EXCL)
-                        and return a read-write fd.  The file is mode 0600.
-   __GT_BIGFILE:       same as __GT_FILE but use open64().
+                       and return a read-write fd.  The file is mode 0600.
    __GT_DIR:           create a directory, which will be mode 0700.

    We use a clever algorithm to get hard-to-predict names. */
 int
-gen_tempname_len (char *tmpl, int kind, size_t x_suffix_len)
+gen_tempname_len (char *tmpl, int flags, int kind, size_t x_suffix_len)
 {
   size_t len;
   char *XXXXXX;
@@ -230,11 +225,9 @@ gen_tempname_len (char *tmpl, int kind, size_t 
x_suffix_len)
       switch (kind)
         {
         case __GT_FILE:
-          fd = small_open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-          break;
-
-        case __GT_BIGFILE:
-          fd = large_open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+         fd = __open (tmpl,
+                      (flags & ~0777) | O_RDWR | O_CREAT | O_EXCL,
+                      S_IRUSR | S_IWUSR);
           break;

         case __GT_DIR:
@@ -295,7 +288,7 @@ gen_tempname_len (char *tmpl, int kind, size_t x_suffix_len)
 }

 int
-__gen_tempname (char *tmpl, int kind)
+__gen_tempname (char *tmpl, int flags, int kind)
 {
-  return gen_tempname_len (tmpl, kind, 6);
+  return gen_tempname_len (tmpl, flags, kind, 6);
 }
diff --git a/gl/lib/tempname.h b/gl/lib/tempname.h
index ee34aca..a942f07 100644
--- a/gl/lib/tempname.h
+++ b/gl/lib/tempname.h
@@ -37,5 +37,6 @@

    We use a clever algorithm to get hard-to-predict names. */
 #include <stddef.h>
-extern int gen_tempname (char *tmpl, int kind);
-extern int gen_tempname_len (char *tmpl, int kind, size_t x_suffix_len);
+extern int gen_tempname (char *tmpl, int flags, int kind);
+extern int gen_tempname_len (char *tmpl, int flags, int kind,
+                             size_t x_suffix_len);
--
1.6.5.rc1.192.g63b0