Re: [Bug-gnulib] 4-gary-version-etc-full-author-string.patch

[Jim Meyering]

Bruno Haible <address@hidden> wrote:
> Gary V. Vaughan wrote:
>>     #define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Kaveh Ghazi"
>>
>>     ...
>>     version_etc (stdout, "foo", 0, "0.0.1a", AUTHORS, NULL)

How about this (just checked in to coreutils)?
I'm not too confident about portability, yet;
I've tested it only on Linux/GNU.

The coreutils/src/*.c changes weren't bad, but I
haven't yet checked all of those in yet.

2003-09-18  Jim Meyering  <address@hidden>

        This lets translators provide better translations for the
        `Written by ...' part of --version output.
        * version-etc.c: Include stdarg.h, stdlib.h, string.h, and xalloc.h.
        (version_etc): Make this function variadic,
        with a NULL-terminated list of author name strings.
        (version_etc_va): New function.
        Suggestion from Gary V. Vaughan.
        * version-etc.h (version_etc_va): Declare it.

        * long-options.c: Include stdarg.h.
        (parse_long_options): Make this function variadic (authors), too.
        Call version_etc_va, not version_etc.
        * long-options.h (parse_long_options): Update prototype.

Index: version-etc.c
===================================================================
RCS file: /fetish/cu/lib/version-etc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -u -r1.12 -r1.13
--- version-etc.c       4 Jan 2003 10:51:31 -0000       1.12
+++ version-etc.c       18 Sep 2003 18:09:44 -0000      1.13
@@ -21,9 +21,13 @@
 # include <config.h>
 #endif
 
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "unlocked-io.h"
 #include "version-etc.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -35,26 +39,77 @@ char* version_etc_copyright =
   "Copyright (C) 2003 Free Software Foundation, Inc.";
 
 
-/* Display the --version information the standard way.
-
-   If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of
-   the program.  The formats are therefore:
+/* Like version_etc, below, but with the NULL-terminated author list
+   provided via a variable of type va_list.  */
+void
+version_etc_va (FILE *stream,
+               char const *command_name, char const *package,
+               char const *version, va_list authors)
+{
+  unsigned int n_authors;
+  va_list saved_authors;
 
-   PACKAGE VERSION
+#ifdef __va_copy
+  __va_copy (saved_authors, authors);
+#else
+  saved_authors = authors;
+#endif
+
+  for (n_authors = 0; va_arg (authors, char const *); ++n_authors)
+    {
+      /* empty */
+    }
+  va_end (authors);
 
-   or
+  if (n_authors == 0)
+    abort ();
 
-   COMMAND_NAME (PACKAGE) VERSION.  */
-void
-version_etc (FILE *stream,
-            const char *command_name, const char *package,
-            const char *version, const char *authors)
-{
   if (command_name)
     fprintf (stream, "%s (%s) %s\n", command_name, package, version);
   else
     fprintf (stream, "%s %s\n", package, version);
-  fprintf (stream, _("Written by %s.\n"), authors);
+
+  switch (n_authors)
+    {
+    case 1:
+      vfprintf (stream, _("Written by %s.\n"), saved_authors);
+      break;
+    case 2:
+      vfprintf (stream, _("Written by %s and %s.\n"), saved_authors);
+      break;
+    case 3:
+      vfprintf (stream, _("Written by %s, %s, and %s.\n"), saved_authors);
+      break;
+    case 4:
+      vfprintf (stream, _("Written by %s, %s, %s, and %s.\n"), saved_authors);
+      break;
+    default:
+      {
+
+       /* Note that the following must have one `%s' and one `%%s'. */
+#define FMT_TEMPLATE _("Written by %sand %%s.\n")
+
+       /* for the string "%s, %s, ..., %s, "  */
+       size_t s_len = (n_authors - 1) * strlen ("%s, ");
+       char *s_fmt = xmalloc (s_len + 1);
+
+       /* This could be a few bytes tighter, but don't bother because
+          that'd just make it a little more fragile.  */
+       char *full_fmt = xmalloc (strlen (FMT_TEMPLATE) + s_len + 1);
+
+       unsigned int i;
+       char *s = s_fmt;
+       for (i = 0; i < n_authors - 1; i++)
+         s = stpcpy (s, "%s, ");
+       sprintf (full_fmt, FMT_TEMPLATE, s_fmt);
+       free (s_fmt);
+
+       vfprintf (stream, full_fmt, saved_authors);
+       free (full_fmt);
+      }
+      break;
+    }
+  va_end (saved_authors);
   putc ('\n', stream);
 
   fputs (version_etc_copyright, stream);
@@ -65,3 +120,28 @@ This is free software; see the source fo
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR 
PURPOSE.\n"),
         stream);
 }
+
+
+/* Display the --version information the standard way.
+
+   If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of
+   the program.  The formats are therefore:
+
+   PACKAGE VERSION
+
+   or
+
+   COMMAND_NAME (PACKAGE) VERSION.
+
+   There must be one or more author names (each as a separate string)
+   after the VERSION argument, and the final argument must be `NULL'.  */
+void
+version_etc (FILE *stream,
+            char const *command_name, char const *package,
+            char const *version, ...)
+{
+  va_list authors;
+
+  va_start (authors, version);
+  version_etc_va (stream, command_name, package, version, authors);
+}
Index: version-etc.h
===================================================================
RCS file: /fetish/cu/lib/version-etc.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -u -r1.6 -r1.7
--- version-etc.h       18 Aug 2003 09:44:49 -0000      1.6
+++ version-etc.h       18 Sep 2003 18:10:22 -0000      1.7
@@ -24,8 +24,12 @@
 
 extern char *version_etc_copyright;
 
+void version_etc_va (FILE *stream,
+                    char const *command_name, char const *package,
+                    char const *version, va_list authors);
+
 void version_etc (FILE *stream,
-                 const char *command_name, const char *package,
-                 const char *version, const char *authors);
+                 char const *command_name, char const *package,
+                 char const *version, ...);
 
 #endif /* VERSION_ETC_H */
Index: long-options.c
===================================================================
RCS file: /fetish/cu/lib/long-options.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -u -r1.19 -r1.20
--- long-options.c      10 Sep 2003 08:49:38 -0000      1.19
+++ long-options.c      18 Sep 2003 18:13:18 -0000      1.20
@@ -25,9 +25,10 @@
 
 #include "long-options.h"
 
+#include <stdarg.h>
 #include <stdio.h>
-#include <getopt.h>
 #include <stdlib.h>
+#include <getopt.h>
 
 #include "version-etc.h"
 
@@ -47,8 +48,8 @@ parse_long_options (int argc,
                    const char *command_name,
                    const char *package,
                    const char *version,
-                   const char *authors,
-                   void (*usage_func)())
+                   void (*usage_func)(),
+                   ...)
 {
   int c;
   int saved_opterr;
@@ -67,8 +68,12 @@ parse_long_options (int argc,
          (*usage_func) (0);
 
        case 'v':
-         version_etc (stdout, command_name, package, version, authors);
-         exit (0);
+         {
+           va_list args;
+           va_start (args, usage_func);
+           version_etc_va (stdout, command_name, package, version, args);
+           exit (0);
+         }
 
        default:
          /* Don't process any other long-named options.  */
Index: long-options.h
===================================================================
RCS file: /fetish/cu/lib/long-options.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -u -r1.14 -r1.15
--- long-options.h      18 Aug 2003 09:44:49 -0000      1.14
+++ long-options.h      18 Sep 2003 18:13:44 -0000      1.15
@@ -22,5 +22,5 @@ void parse_long_options (int _argc,
                         const char *_command_name,
                         const char *_package,
                         const char *_version,
-                        const char *_authors,
-                        void (*_usage) (int));
+                        void (*_usage) (int),
+                        ...);