From 28b11afe093d8a0ed71bdeeffcd3c9f2bd663e15 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 23 May 2010 00:08:53 +0200 Subject: Imported Upstream version 4.0-20090308 --- ChangeLog | 11 +++++++++++ VERSION.full | 2 +- foomatic-rip.1.in | 4 ++-- foomaticrip.c | 2 +- renderer.c | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e565b2d..69712ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2009-03-07 Till Kamppeter + + * foomatic-rip.1.in: Fixed typos. + + * renderer.c: When doing the massaging of the remderer command line + foomatic-rip inserts 'gs' at the wrong place in command lines of + Foomatic 3.x-generated PPD files for the "Postscript" driver, leading + to duplicate calls of Ghostscript (bug #316). + + * foomaticrip.c: Fixed buffer overflow (bug #311). + 2009-02-11 Lars Uebernickel * foomaticrip.c: The value of the "execpath" variable in the config file was not used fully: Only the characters leading up to the first diff --git a/VERSION.full b/VERSION.full index ff2ce95..c103a43 100644 --- a/VERSION.full +++ b/VERSION.full @@ -1 +1 @@ -4.0.0.200 +4.0.0.201 diff --git a/foomatic-rip.1.in b/foomatic-rip.1.in index 10178fe..95891bc 100644 --- a/foomatic-rip.1.in +++ b/foomatic-rip.1.in @@ -149,7 +149,7 @@ Put a line into the PPD file, right after \fB*PPD-Adobe: "4.3"\fR, where \fI\fR is a command into which you wnat to re-direct the -output data. Due to the restictions of PPD files \fB<\fR, \fB>\fR, and +output data. Due to the restrictions of PPD files \fB<\fR, \fB>\fR, and \fB"\fR are not allowed in the \fI\fR, replace them as follows: @@ -183,7 +183,7 @@ listening on port \fB9100\fR you need this: \fB*FoomaticRIPPostPipe: "| /usr/bin/nc -w 1 printer 9100"\fR Note the "-w 1" in the "nc" command line, it makes "nc" exiting -immediately after the data is tranferred to the printer. +immediately after the data is transferred to the printer. \fB*FoomaticRIPPostPipe: "| rlpr -Plp@printserver"\fR diff --git a/foomaticrip.c b/foomaticrip.c index 37d0822..2db5cb8 100644 --- a/foomaticrip.c +++ b/foomaticrip.c @@ -937,7 +937,7 @@ int print_file(const char *filename, int convert) } } - n = fread(buf, 1, sizeof(buf), file); + n = fread(buf, 1, sizeof(buf) - 1, file); buf[n] = '\0'; type = guess_file_type(buf, n, &startpos); if (startpos > 0) { diff --git a/renderer.c b/renderer.c index 57f7281..f003206 100644 --- a/renderer.c +++ b/renderer.c @@ -86,7 +86,7 @@ void massage_gs_commandline(dstr_t *cmd) or ''"'"'xy' or 'xy'"'"'' or ... */ /* dstrreplace(cmd, "'", "'\"'\"'"); TODO tbd */ - dstrremove(gscmd, start, 2); /* Remove 'gs' */ + dstrremove(gscmd, 0, 2); /* Remove 'gs' */ if (gswithoutputredirection) { dstrprepend(gscmd, " -sstdout=%stderr "); -- cgit v1.2.3