iAvoid global variables for version strings. - enscript - GNU Enscript Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/enscript.git URL:git://thinkerwim.org/enscript.git thinkerwim.org 70 1Log /git/enscript/log.gph thinkerwim.org 70 1Files /git/enscript/files.gph thinkerwim.org 70 1Refs /git/enscript/refs.gph thinkerwim.org 70 1README /git/enscript/file/README.gph thinkerwim.org 70 1LICENSE /git/enscript/file/COPYING.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit 29a03491ca822d25ed6eadbaf009945460d3713a /git/enscript/commit/29a03491ca822d25ed6eadbaf009945460d3713a.gph thinkerwim.org 70 1parent 8292547f80c4311052b11cb62a621aaa1b3ea355 /git/enscript/commit/8292547f80c4311052b11cb62a621aaa1b3ea355.gph thinkerwim.org 70 hAuthor: Tim Retout URL:mailto:diocles@gnu.org thinkerwim.org 70 iDate: Sun, 7 Mar 2010 02:42:33 +0000 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iAvoid global variables for version strings. Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iSigned-off-by: Tim Retout Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M ChangeLog | 8 ++++++++ Err thinkerwim.openbsd.amsterdam 70 i M src/gsint.h | 2 -- Err thinkerwim.openbsd.amsterdam 70 i M src/main.c | 29 ++++++++--------------------- Err thinkerwim.openbsd.amsterdam 70 i M src/psgen.c | 9 ++++++++- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i4 files changed, 24 insertions(+), 24 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/ChangeLog b/ChangeLog /git/enscript/file/ChangeLog.gph thinkerwim.org 70 i@@ -1,3 +1,11 @@ Err thinkerwim.openbsd.amsterdam 70 i+2010-03-07 Tim Retout Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ * src/gsint.h: Remove version_string and ps_version_string. Err thinkerwim.openbsd.amsterdam 70 i+ * src/main.c: Likewise. Err thinkerwim.openbsd.amsterdam 70 i+ * src/main.c (version): Update copyright and licensing Err thinkerwim.openbsd.amsterdam 70 i+ information. Use autoconf variables instead of hardcoded strings. Err thinkerwim.openbsd.amsterdam 70 i+ * src/psgen.c (dump_ps_header): Set ps_version_string here. Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i 2010-03-06 Tim Retout Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i * configure.ac: Set version to 1.6.5.1. Err thinkerwim.openbsd.amsterdam 70 1diff --git a/src/gsint.h b/src/gsint.h /git/enscript/file/src/gsint.h.gph thinkerwim.org 70 i@@ -326,8 +326,6 @@ typedef struct cached_font_info_st CachedFontInfo; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i extern char *program; Err thinkerwim.openbsd.amsterdam 70 i extern FILE *ofp; Err thinkerwim.openbsd.amsterdam 70 i-extern char *version_string; Err thinkerwim.openbsd.amsterdam 70 i-extern char *ps_version_string; Err thinkerwim.openbsd.amsterdam 70 i extern char *date_string; Err thinkerwim.openbsd.amsterdam 70 i extern struct tm run_tm; Err thinkerwim.openbsd.amsterdam 70 i extern struct tm mod_tm; Err thinkerwim.openbsd.amsterdam 70 1diff --git a/src/main.c b/src/main.c /git/enscript/file/src/main.c.gph thinkerwim.org 70 i@@ -58,8 +58,6 @@ static void version (); Err thinkerwim.openbsd.amsterdam 70 i char *program; /* Program's name, used for messages. */ Err thinkerwim.openbsd.amsterdam 70 i FILE *ofp = NULL; /* Output file. */ Err thinkerwim.openbsd.amsterdam 70 i void *printer_context; /* Context for the printer. */ Err thinkerwim.openbsd.amsterdam 70 i-char *version_string = NULL; /* Enscript's version string. */ Err thinkerwim.openbsd.amsterdam 70 i-char *ps_version_string = NULL; /* Version string for PS procsets. */ Err thinkerwim.openbsd.amsterdam 70 i char *date_string = NULL; /* Preformatted time string. */ Err thinkerwim.openbsd.amsterdam 70 i struct tm run_tm; /* Time when program is run. */ Err thinkerwim.openbsd.amsterdam 70 i struct tm mod_tm; /* Last modification time for current file. */ Err thinkerwim.openbsd.amsterdam 70 i@@ -946,19 +944,6 @@ main (int argc, char *argv[]) Err thinkerwim.openbsd.amsterdam 70 i /* Make getopt_long() to use our modified programname. */ Err thinkerwim.openbsd.amsterdam 70 i argv[0] = program; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- /* Create version strings. */ Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i- buffer_clear (&buffer); Err thinkerwim.openbsd.amsterdam 70 i- buffer_append (&buffer, "GNU "); Err thinkerwim.openbsd.amsterdam 70 i- buffer_append (&buffer, PACKAGE); Err thinkerwim.openbsd.amsterdam 70 i- buffer_append (&buffer, " "); Err thinkerwim.openbsd.amsterdam 70 i- buffer_append (&buffer, VERSION); Err thinkerwim.openbsd.amsterdam 70 i- version_string = buffer_copy (&buffer); Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i- ps_version_string = xstrdup (VERSION); Err thinkerwim.openbsd.amsterdam 70 i- cp = strrchr (ps_version_string, '.'); Err thinkerwim.openbsd.amsterdam 70 i- *cp = ' '; Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i /* Create the default TOC format string. Wow, this is cool! */ Err thinkerwim.openbsd.amsterdam 70 i /* xgettext:no-c-format */ Err thinkerwim.openbsd.amsterdam 70 i toc_fmt_string = _("$3v $-40N $3% pages $4L lines $E $C"); Err thinkerwim.openbsd.amsterdam 70 i@@ -2651,10 +2636,12 @@ static void Err thinkerwim.openbsd.amsterdam 70 i version () Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i printf ("%s\n\ Err thinkerwim.openbsd.amsterdam 70 i-Copyright (C) 2003 Markku Rossi.\n\ Err thinkerwim.openbsd.amsterdam 70 i-GNU enscript comes with NO WARRANTY, to the extent permitted by law.\n\ Err thinkerwim.openbsd.amsterdam 70 i-You may redistribute copies of GNU enscript under the terms of the GNU\n\ Err thinkerwim.openbsd.amsterdam 70 i-General Public License. For more information about these matters, see\n\ Err thinkerwim.openbsd.amsterdam 70 i-the files named COPYING.\n", Err thinkerwim.openbsd.amsterdam 70 i- version_string); Err thinkerwim.openbsd.amsterdam 70 i+Copyright (C) 1995-2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.\n\ Err thinkerwim.openbsd.amsterdam 70 i+%s comes with NO WARRANTY, to the extent permitted by law.\n\ Err thinkerwim.openbsd.amsterdam 70 i+You may redistribute copies of %s under the terms of the GNU\n\ Err thinkerwim.openbsd.amsterdam 70 i+General Public License, version 3 or, at your option, any later version.\n\ Err thinkerwim.openbsd.amsterdam 70 i+For more information about these matters, see the files named COPYING.\n", Err thinkerwim.openbsd.amsterdam 70 i+ PACKAGE_STRING, Err thinkerwim.openbsd.amsterdam 70 i+ PACKAGE_NAME, Err thinkerwim.openbsd.amsterdam 70 i+ PACKAGE_NAME); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 1diff --git a/src/psgen.c b/src/psgen.c /git/enscript/file/src/psgen.c.gph thinkerwim.org 70 i@@ -280,12 +280,19 @@ dump_ps_header () Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i char *cp, *cp2; Err thinkerwim.openbsd.amsterdam 70 i int i, j, got; Err thinkerwim.openbsd.amsterdam 70 i+ char *ps_version_string; /* Version string for PS procsets. */ Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Dump PS header only once. */ Err thinkerwim.openbsd.amsterdam 70 i if (ps_header_dumped) Err thinkerwim.openbsd.amsterdam 70 i return; Err thinkerwim.openbsd.amsterdam 70 i ps_header_dumped = 1; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i+ /* Create version string. */ Err thinkerwim.openbsd.amsterdam 70 i+ ps_version_string = xstrdup (VERSION); Err thinkerwim.openbsd.amsterdam 70 i+ cp = strrchr (ps_version_string, '.'); Err thinkerwim.openbsd.amsterdam 70 i+ *cp = ' '; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i /* Err thinkerwim.openbsd.amsterdam 70 i * Header. Err thinkerwim.openbsd.amsterdam 70 i */ Err thinkerwim.openbsd.amsterdam 70 i@@ -295,7 +302,7 @@ dump_ps_header () Err thinkerwim.openbsd.amsterdam 70 i media->urx, media->ury)); Err thinkerwim.openbsd.amsterdam 70 i OUTPUT ((cofp, "%%%%Title: %s\n", title)); Err thinkerwim.openbsd.amsterdam 70 i OUTPUT ((cofp, "%%%%For: %s\n", passwd->pw_gecos)); Err thinkerwim.openbsd.amsterdam 70 i- OUTPUT ((cofp, "%%%%Creator: %s\n", version_string)); Err thinkerwim.openbsd.amsterdam 70 i+ OUTPUT ((cofp, "%%%%Creator: %s\n", PACKAGE_STRING)); Err thinkerwim.openbsd.amsterdam 70 i OUTPUT ((cofp, "%%%%CreationDate: %s\n", date_string)); Err thinkerwim.openbsd.amsterdam 70 i OUTPUT ((cofp, "%%%%Orientation: %s\n", Err thinkerwim.openbsd.amsterdam 70 i ((nup > 1) && nup_landscape) Err thinkerwim.openbsd.amsterdam 70 .