~ubuntu-branches/ubuntu/oneiric/cups/oneiric-proposed

« back to all changes in this revision

Viewing changes to driver/commandtoescpx.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, Till Kamppeter, Martin Pitt
  • Date: 2011-08-07 12:53:12 UTC
  • mfrom: (1.2.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20110807125312-s323cyb3oqaxaemo
Tags: 1.5.0-1
[ Till Kamppeter ]
* New upstream release
* debian/patches/usb-backend-no-segfault-on-bad-device-id.patch,
  debian/patches/usb-backend-accept-old-usblp-uris.patch,
  debian/patches/use-ps2write-ghostscript-device-for-pdftops-filter.patch:
  Removed, included upstream.
* debian/patches/poppler-based-pdftops-fixes.patch,
  debian/patches/do-not-emit-ps-level-3-with-poppler.patch: Replaced patch
  by a new one only containing the parts which remain after removing the
  parts included upstream.
* debian/patches/pidfile.patch,
  debian/patches/ppd-poll-with-client-conf.patch,
  debian/patches/cups-avahi.patch,
  debian/patches/drop_unnecessary_dependencies.patch,
  debian/patches/do-not-broadcast-with-hostnames.patch,
  debian/patches/ppdc-dynamic-linking.patch,
  debian/patches/pstops-based-workflow-only-for-printing-ps-on-a-ps-printer.patch:
  Manually regenerated to adapt to upstream changes.
* debian/patches/manpage-translations.patch,
  debian/patches/rootbackends-worldreadable.patch,
  debian/patches/no-conffile-timestamp.patch,
  debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch,
  debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch,
  debian/patches/configure-default-browse-protocols.patch,
  debian/patches/logfiles_adm_readable.patch,
  debian/patches/confdirperms.patch,
  debian/patches/printer-filtering.patch,
  debian/patches/show-compile-command-lines.patch,
  debian/patches/log-debug-history-nearly-unlimited.patch:
  Refreshed using quilt.
* debian/patches/default-ripcache-size-auto.patch: Dropped, as once,
  Ghostscript 9.04 is ignoring the cache size value as it crashes easily
  otherwise (Ghostscript upstream bug #691586) and second, CUPS defaults to
  more reasonable 128 MB (now only used for imagetops).
* debian/patches/support-gzipped-charmaps.patch: Dropped, as the SBCS and
  VBCS character maps are not used any more by CUPS.
* debian/rules: Enable threads in the ./configure command line, as otherwise
  CUPS 1.5.0 does not build at all.
* debian/local/filters/pdf-filters/filter/pdftoijs.cxx,
  debian/local/filters/pdf-filters/filter/pdftoraster.cxx,
  debian/local/filters/pdf-filters/pdftoopvp/pdftoopvp.cxx,
  debian/local/filters/pdf-filters/pdftopdf/pdftopdf.cxx: Under CUPS 1.5.x.
  all programs using the PPD API of CUPS need to explicitly include
  "<cups/ppd.h>". Updated the PDF filter add-on package.
* debian/local/filters/pdf-filters/addtocups: Make the addition of the
  pdftopdf and pdftoopvp directories also work with CUPS 1.5.x.
* debian/local/filters/pdf-filters/addtocups,
  debian/local/filters/pdf-filters/removefromcups: Added a symbolic link
  cups/i18n.h, so that texttopdf builds.
* debian/cups-client.install: Install the new ipptool and its sample
  files and manpages.
* debian/cups-client.install: Commented out lines for dropped man page
  translations: ipptool, lppasswd, client.conf, ipptoolfile, cupsenable,
  lpadmin, lpinfo, cupsreject, cupsdisable, cupsaccept
* debian/cups-common.install, debian/rules: The /usr/share/cups/charmaps
  directory got removed from CUPS.
* debian/libcups2-dev.install: cups/i18n.h got renamed to
  cups/language-private.h. Install this as /usr/include/cups/i18n.h.
* debian/libcups2.symbols, debian/libcupsmime1.symbols: Updated.
* debian/cups.lintian-overrides, debian/cups.postinst, debian/cups.prerm,
  debian/cups.templates, debian/local/apparmor-profile: The "scsi"
  CUPS backend got dropped upstream, removed its treatment from these files.

[ Martin Pitt ]
* Add Serbian (Cyrillic) debconf translations, thanks Zlatan Todoric.
  (Closes: #635105)
* Add Serbian (Latin) debconf translations, thanks Zlatan Todoric.
  (Closes: #635108)
* debian/local/apparmor-profile: Allow access to serial printers on USB
  adapters. (LP: #677432)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*
2
 
 * "$Id: commandtoescpx.c 7306 2008-02-15 00:52:38Z mike $"
 
2
 * "$Id: commandtoescpx.c 9793 2011-05-20 03:49:49Z mike $"
3
3
 *
4
4
 *   Advanced EPSON ESC/P command filter for CUPS.
5
5
 *
6
 
 *   Copyright 2007 by Apple Inc.
 
6
 *   Copyright 2007-2011 by Apple Inc.
7
7
 *   Copyright 1993-2005 by Easy Software Products.
8
8
 *
9
9
 *   These coded instructions, statements, and computer programs are the
22
22
 * Include necessary headers...
23
23
 */
24
24
 
25
 
#include <cups/cups.h>
 
25
#include <cups/cups-private.h>
26
26
#include "driver.h"
27
 
#include <cups/string.h>
28
27
#include "data/escp.h"
29
28
 
30
29
 
54
53
    * and return.
55
54
    */
56
55
 
57
 
    fputs("ERROR: commandtoescpx job-id user title copies options [file]\n", stderr);
 
56
    _cupsLangPrintf(stderr,
 
57
                    _("Usage: %s job-id user title copies options [file]"),
 
58
                    argv[0]);
58
59
    return (1);
59
60
  }
60
61
 
135
136
    * Parse the command...
136
137
    */
137
138
 
138
 
    if (strncasecmp(lineptr, "Clean", 5) == 0)
 
139
    if (_cups_strncasecmp(lineptr, "Clean", 5) == 0)
139
140
    {
140
141
     /*
141
142
      * Clean heads...
143
144
 
144
145
      cupsWritePrintData("CH\002\000\000\000", 6);
145
146
    }
146
 
    else if (strncasecmp(lineptr, "PrintAlignmentPage", 18) == 0)
 
147
    else if (_cups_strncasecmp(lineptr, "PrintAlignmentPage", 18) == 0)
147
148
    {
148
149
     /*
149
150
      * Print alignment page...
158
159
      putchar(phase >> 8);
159
160
      feedpage = 1;
160
161
    }
161
 
    else if (strncasecmp(lineptr, "PrintSelfTestPage", 17) == 0)
 
162
    else if (_cups_strncasecmp(lineptr, "PrintSelfTestPage", 17) == 0)
162
163
    {
163
164
     /*
164
165
      * Print version info and nozzle check...
168
169
      cupsWritePrintData("NC\002\000\000\000", 6);
169
170
      feedpage = 1;
170
171
    }
171
 
    else if (strncasecmp(lineptr, "ReportLevels", 12) == 0)
 
172
    else if (_cups_strncasecmp(lineptr, "ReportLevels", 12) == 0)
172
173
    {
173
174
     /*
174
175
      * Report ink levels...
176
177
 
177
178
      cupsWritePrintData("IQ\001\000\001", 5);
178
179
    }
179
 
    else if (strncasecmp(lineptr, "SetAlignment", 12) == 0)
 
180
    else if (_cups_strncasecmp(lineptr, "SetAlignment", 12) == 0)
180
181
    {
181
182
     /*
182
183
      * Set head alignment...
240
241
 
241
242
 
242
243
/*
243
 
 * End of "$Id: commandtoescpx.c 7306 2008-02-15 00:52:38Z mike $".
 
244
 * End of "$Id: commandtoescpx.c 9793 2011-05-20 03:49:49Z mike $".
244
245
 */