From: pawelz <pawelz@pld-linux.org>
Date: Tue, 4 Nov 2008 16:08:22 +0000 (+0000)
Subject: - applied upstream
X-Git-Tag: auto/th/a2ps-4_14-2~5
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fa2ps.git;a=commitdiff_plain;h=00ad53090d0a9bbeb337bda24bdfddd2e1b672b6

- applied upstream

Changed files:
    a2ps-CAN-2004-1170.patch -> 1.2
    a2ps-malloc.patch -> 1.2
    a2ps-psset.patch -> 1.2
---

diff --git a/a2ps-CAN-2004-1170.patch b/a2ps-CAN-2004-1170.patch
deleted file mode 100644
index 20971d5..0000000
--- a/a2ps-CAN-2004-1170.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -urN a2ps-4.13.orig/src/select.c a2ps-4.13/src/select.c
---- a2ps-4.13.orig/src/select.c	2004-12-13 14:32:29.582879216 +0100
-+++ a2ps-4.13/src/select.c	2004-12-13 14:33:42.773752512 +0100
-@@ -131,6 +131,36 @@
-   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 @@
-   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");
- 
diff --git a/a2ps-malloc.patch b/a2ps-malloc.patch
deleted file mode 100644
index 56c6908..0000000
--- a/a2ps-malloc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN aa/a2ps-4.13/lib/path-concat.c a2ps-4.13/lib/path-concat.c
---- aa/a2ps-4.13/lib/path-concat.c	1999-10-10 20:34:46.000000000 +0200
-+++ a2ps-4.13/lib/path-concat.c	2004-08-28 17:53:01.137958432 +0200
-@@ -31,8 +31,6 @@
- #endif
- #include <sys/types.h>
- 
--char *malloc ();
--
- #ifndef DIRECTORY_SEPARATOR
- # define DIRECTORY_SEPARATOR '/'
- #endif
diff --git a/a2ps-psset.patch b/a2ps-psset.patch
deleted file mode 100644
index 5197237..0000000
--- a/a2ps-psset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a2ps-4.13/contrib/psset.in.psset	2006-10-06 13:12:03.000000000 +0100
-+++ a2ps-4.13/contrib/psset.in	2006-10-06 13:12:09.000000000 +0100
-@@ -241,7 +241,7 @@
- # spaces with a `\' too...
- pspagedevicelen=`echo "$pspagedevice" | wc -l`
- pspagedevice=`echo "$pspagedevice" | \
-- sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^/\\\\\\/"`
-+ sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^ /\\\\\\ /"`
- 
- case $at in
-   0) # Insert last in the Setup, so that we win over other requests.