--- contrib/card.in.orig	2000-01-27 00:42:36 UTC

+++ contrib/card.in

@@ -38,7 +38,7 @@ help="Try \`$program --help' for more in

 LC_ALL="${LC_ALL-C}" export LC_ALL

 print_form_feeds=:

 RM="/bin/rm -rf"

-tmp_dir=${TMPDIR-/tmp}/$program.$$

+tmp_dir=$(mktemp -d -t ${program}) || exit 1

 tmp_file=$tmp_dir/card

 success=false

 verbose=:

@@ -190,7 +190,6 @@ fi

 # Create a tmp dir and be ready to clean up

 trap "$RM $tmp_dir" 0 1 2 15

-(umask 077 && mkdir $tmp_dir) || exit 1

 case $LC_ALL in

   fr) footer="Engendré par $version_short" ;;

--- contrib/fixps.in.orig	2000-02-21 08:16:15 UTC

+++ contrib/fixps.in

@@ -38,7 +38,7 @@ output=-	# Default is stdout

 run_gs=0

 # What action to perform: fixps, cat, check, and gs

 task=fixps

-tmpdir=/tmp/$program.$$

+tmpdir=$(mktemp -d -t ${program}) || exit 1

 verbose=echo

 # The version/usage strings

@@ -191,7 +191,6 @@ else

   trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15

 fi

-mkdir $tmpdir

 fixps_sed=$tmpdir/fixps.sed

 # If printing from stdin, save into a tmp file

--- contrib/pdiff.in.orig	1999-10-24 15:07:51 UTC

+++ contrib/pdiff.in

@@ -34,7 +34,7 @@ diff_prog=${DIFF:-diff}

 diff_options='-u'

 file=

 output=

-tmpdir=/tmp/$program.$$

+tmpdir=$(mktemp -d -t ${program}) || exit 1

 verbose=echo

 wdiff_prog=${WDIFF:-wdiff}

 wdiff_options='-w[wd- -x-wd] -y{wd+ -z+wd}'

--- contrib/psmandup.in.orig	1999-10-24 13:06:42 UTC

+++ contrib/psmandup.in

@@ -36,7 +36,7 @@ fixps=${FIXPS:-fixps}

 message=

 psselect=${PSSELECT:-psselect}

 psset=${PSSET:-psset}

-tmpdir=/tmp/$program.$$

+tmpdir=$(mktemp -d -t ${program}) || exit 1

 # These two must be kept in synch.  They are opposed.

 verbose=echo

@@ -185,8 +185,6 @@ else

   trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15

 fi

-mkdir $tmpdir

-

 # If printing from stdin, save into a tmp file

 if test $file = '-'; then

   file=$tmpdir/stdin.ps

--- contrib/psset.in.orig	1999-10-24 12:41:46 UTC

+++ contrib/psset.in

@@ -33,7 +33,7 @@ fixps=${FIXPS:-fixps}

 output=-

 pagedevices=	# `;' separated list of `key:value'

 quiet=:         # i.e., verbose

-tmpdir=${TMPDIR:-/tmp}/$program.$$

+tmpdir=$(mktemp -d -t ${program}) || exit 1

 sedscript=$tmpdir/psset.sed

 # The version/usage strings

@@ -186,8 +186,6 @@ case $# in

       exit 1;;

 esac

-mkdir $tmpdir

-

 if test -n "$debug"; then

   # Set -x now if debugging

   set -x

--- contrib/texi2dvi4a2ps.orig	2000-02-24 17:45:31 UTC

+++ contrib/texi2dvi4a2ps

@@ -91,7 +91,7 @@ oname=		# --output

 quiet=          # by default let the tools' message be displayed

 set_language=

 textra=

-tmpdir=${TMPDIR:-/tmp}/t2d$$  # avoid collisions on 8.3 filesystems.

+tmpdir=$(mktemp -d -t ${program}) || exit 1

 txincludes=     # TEXINPUTS extensions

 txiprereq=19990129 # minimum texinfo.tex version to have macro expansion

 verbose=false   # echo for verbose mode

@@ -203,9 +203,6 @@ if test -z "$debug"; then

   trap "cd / && rm -rf $tmpdir" 0 1 2 15

 fi

-# Create the temporary directory with strict rights

-(umask 077 && mkdir $tmpdir) || exit 1

-

 # Prepare the tools we might need.  This may be extra work in some

 # cases, but improves the readibility of the script.

 utildir=$tmpdir/utils

--- intl/localealias.c.orig	1999-08-31 17:29:35 UTC

+++ intl/localealias.c

@@ -329,6 +329,17 @@ read_alias_file (fname, fname_len)

 		      FREE_BLOCKS (block_list);

 		      return added;

 		    }

+		  if (string_space != new_pool)

+		    {

+		      size_t i;

+

+		      for (i = 0; i < nmap; i++)

+			{

+			  map[i].alias += new_pool - string_space;

+			  map[i].value += new_pool - string_space;

+			}

+		    }

+

 		  string_space = new_pool;

 		  string_space_max = new_size;

 		}

--- lib/options.c.orig	1999-08-31 17:42:41 UTC

+++ lib/options.c

@@ -493,6 +493,15 @@ a2ps_handle_options (a2ps_job * job, int

 	  /* A font size is given */

 	  job->fontsize = get_length ("--font-size", cp,

 				      0.0, 0.0, "pt", range_min_strict);

+	  if (job->fontsize == 0.0) 

+	  {

+	    error (0, 0, _("invalid argument %s for -f or --font-size option"),

+	      cp);

+	    fprintf (stderr,

+	      _("Valid arguments are floats with optonal units!\n"));

+	    fprintf (stderr, _("Try `a2ps --help' for more information.\n"));

+	    exit (EXIT_FAILURE);

+	  }

 	  job->columns_requested = 0;

 	  job->lines_requested = 0;

 	}

--- lib/printers.c.orig	1999-10-11 22:01:59 UTC

+++ lib/printers.c

@@ -315,8 +315,8 @@ a2ps_printers_new (struct a2ps_common_s 

   res->ppd = NULL;		/* Printer's ppd are not read yet */

   /* Output */

-  /* Default is to send to default printer */

-  res->flag_output_is_printer = true;

+  /* Default is to send to stdout */

+  res->flag_output_is_printer = false;

   res->flag_output_name = NULL;

   res->output_is_file = true;

   res->output_name = NULL;

--- lib/printlen.c.orig	1999-08-31 17:42:42 UTC

+++ lib/printlen.c

@@ -28,14 +28,11 @@ Foundation, Inc., 59 Temple Place - Suit

 unsigned long strtoul ();

 static int

-int_printflen (const char *format, va_list *args)

+int_printflen (const char *format, va_list ap)

 {

   const char *cp;

   int total_width = 0;

   int width = 0;

-  va_list ap;

-

-  memcpy (&ap, args, sizeof (va_list));

   for (cp = format ; *cp ; cp++)

     {

@@ -99,7 +96,7 @@ int_printflen (const char *format, va_li

 int

 vprintflen (const char *format,  va_list args)

 {

-  return int_printflen (format, &args);

+  return int_printflen (format, args);

 }

 int

--- lib/title.c.orig	2015-09-25 08:26:23 UTC

+++ lib/title.c

@@ -88,6 +88,8 @@ title (stream, c, center_p, format, va_a

   if (center_p)

     for (padding = 0 ; padding < 79 - len ; padding += 2)

       putc (' ', stream);

+  va_end(args);

+  VA_START(args, format);

 # if HAVE_VPRINTF || _LIBC

   vfprintf (stream, format, args);

 # else

--- lib/xgethostname.c.orig	1999-08-28 17:11:35 UTC

+++ lib/xgethostname.c

@@ -21,6 +21,7 @@

 # include <config.h>

 #endif

+#include <sys/param.h>

 #include <sys/types.h>

 #include <errno.h>

@@ -38,7 +39,7 @@ extern int errno;

 int gethostname ();

 #ifndef INITIAL_HOSTNAME_LENGTH

-# define INITIAL_HOSTNAME_LENGTH 34

+# define INITIAL_HOSTNAME_LENGTH MAXHOSTNAMELEN

 #endif

 char *

@@ -63,7 +64,7 @@ xgethostname ()

       if (err == 0 && hostname[k] == '\0')

 	break;

 #ifdef ENAMETOOLONG

-      else if (err != 0 && errno != ENAMETOOLONG && errno != 0)

+      else if (err != 0 && errno != ENAMETOOLONG && errno != ENOMEM && errno != 0)

 	error (EXIT_FAILURE, errno, "gethostname");

 #endif

       size *= 2;

--- src/select.c.orig	1999-12-16 01:04:56 UTC

+++ src/select.c

@@ -131,6 +131,36 @@ sheets_map_load_main (void)

   return 1;

 }

+/* escapes the name of a file so that the shell groks it in 'single' q.marks. 

+   The resulting pointer has to be free()ed when not longer used. */

+char *

+shell_escape(const char *fn)

+{

+  size_t len = 0;

+  const char *inp;

+  char *retval, *outp;

+

+  for(inp = fn; *inp; ++inp)

+    switch(*inp)

+    {

+      case '\'': len += 4; break;

+      default:   len += 1; break;

+    }

+

+  outp = retval = malloc(len + 1);

+  if(!outp)

+    return NULL; /* perhaps one should do better error handling here */

+  for(inp = fn; *inp; ++inp)

+    switch(*inp)

+    {

+      case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break;

+      default:   *outp++ = *inp; break;

+    }

+  *outp = 0;

+

+  return retval;

+}

+

 /* What says file about the type of a file (result is malloc'd).  NULL

   if could not be run.  */

@@ -144,11 +174,15 @@ file_verdict_on (const uchar *filename)

   if (IS_EMPTY (job->file_command))

     return NULL;

+  filename = shell_escape(filename);

+  if(filename == NULL)

+    return NULL;

   /* Call file(1) with the correct option */

-  command = ALLOCA (char, (2

+  command = ALLOCA (char, (4

 			   + strlen (job->file_command)

 			   + ustrlen (filename)));

-  sprintf (command, "%s %s", job->file_command, (const char *) filename);

+  sprintf (command, "%s '%s'", job->file_command, (const char *) filename);

+  free(filename);

   message (msg_tool, (stderr, "Reading pipe: `%s'\n", command));

   file_out = popen (command, "r");