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

« back to all changes in this revision

Viewing changes to scheduler/quotas.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: quotas.c 8383 2009-02-23 01:06:14Z mike $"
3
 
 *
4
 
 *   Quota routines for the Common UNIX Printing System (CUPS).
5
 
 *
6
 
 *   Copyright 2007-2009 by Apple Inc.
 
2
 * "$Id: quotas.c 9793 2011-05-20 03:49:49Z mike $"
 
3
 *
 
4
 *   Quota routines for the CUPS scheduler.
 
5
 *
 
6
 *   Copyright 2007-2011 by Apple Inc.
7
7
 *   Copyright 1997-2007 by Easy Software Products.
8
8
 *
9
9
 *   These coded instructions, statements, and computer programs are the
119
119
                  "cupsdUpdateQuota: p=%s username=%s pages=%d k=%d",
120
120
                  p->name, username, pages, k);
121
121
 
122
 
#if defined(__APPLE__) && defined(HAVE_DLFCN_H)
123
 
 /*
124
 
  * Use Apple PrintService quota enforcement if installed (X Server only)
125
 
  */
126
 
 
127
 
  if (AppleQuotas && PSQUpdateQuotaProc)
128
 
  { 
129
 
    q->page_count = (*PSQUpdateQuotaProc)(p->name, p->info, username, pages, 0);
130
 
 
131
 
    return (q);
132
 
  }
133
 
#endif /* __APPLE__ && HAVE_DLFCN_H */
134
 
 
135
122
  curtime = time(NULL);
136
123
 
137
124
  if (curtime < q->next_update)
159
146
    * We only care about the current printer/class and user...
160
147
    */
161
148
 
162
 
    if (strcasecmp(job->dest, p->name) != 0 ||
163
 
        strcasecmp(job->username, q->username) != 0)
 
149
    if (_cups_strcasecmp(job->dest, p->name) != 0 ||
 
150
        _cups_strcasecmp(job->username, q->username) != 0)
164
151
      continue;
165
152
 
166
153
   /*
248
235
compare_quotas(const cupsd_quota_t *q1, /* I - First quota record */
249
236
               const cupsd_quota_t *q2) /* I - Second quota record */
250
237
{
251
 
  return (strcasecmp(q1->username, q2->username));
 
238
  return (_cups_strcasecmp(q1->username, q2->username));
252
239
}
253
240
 
254
241
 
255
242
/*
256
 
 * End of "$Id: quotas.c 8383 2009-02-23 01:06:14Z mike $".
 
243
 * End of "$Id: quotas.c 9793 2011-05-20 03:49:49Z mike $".
257
244
 */