summaryrefslogtreecommitdiff
path: root/ppdc
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2016-01-27 10:47:25 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2016-01-27 10:47:52 +0900
commitef9b26ed48ff777f0ac2e84e92aa54a382d2b37e (patch)
tree13a008c6165a5ce4bd06a3b1dd53df91c8b01485 /ppdc
parent4daab3758f62250691d3994850ddd3a7faf80d5e (diff)
downloadcups-ef9b26ed48ff777f0ac2e84e92aa54a382d2b37e.tar.gz
cups-ef9b26ed48ff777f0ac2e84e92aa54a382d2b37e.tar.bz2
cups-ef9b26ed48ff777f0ac2e84e92aa54a382d2b37e.zip
Imported Upstream version 2.1.2upstream/2.1.2
Change-Id: Ia36f5862c3fcaa1f053ad69ed961e1fb9043e20b Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'ppdc')
-rw-r--r--ppdc/Dependencies284
-rw-r--r--ppdc/Makefile50
-rw-r--r--ppdc/genstrings.cxx31
-rw-r--r--ppdc/ppdc-array.cxx35
-rw-r--r--ppdc/ppdc-attr.cxx4
-rw-r--r--ppdc/ppdc-catalog.cxx161
-rw-r--r--ppdc/ppdc-choice.cxx4
-rw-r--r--ppdc/ppdc-constraint.cxx4
-rw-r--r--ppdc/ppdc-driver.cxx40
-rw-r--r--ppdc/ppdc-file.cxx4
-rw-r--r--ppdc/ppdc-filter.cxx4
-rw-r--r--ppdc/ppdc-font.cxx4
-rw-r--r--ppdc/ppdc-group.cxx4
-rw-r--r--ppdc/ppdc-import.cxx4
-rw-r--r--ppdc/ppdc-mediasize.cxx4
-rw-r--r--ppdc/ppdc-message.cxx4
-rw-r--r--ppdc/ppdc-option.cxx4
-rw-r--r--ppdc/ppdc-profile.cxx4
-rw-r--r--ppdc/ppdc-shared.cxx4
-rw-r--r--ppdc/ppdc-source.cxx124
-rw-r--r--ppdc/ppdc-string.cxx12
-rw-r--r--ppdc/ppdc-variable.cxx4
-rw-r--r--ppdc/ppdc.cxx29
-rw-r--r--ppdc/ppdhtml.cxx149
-rw-r--r--ppdc/ppdi.cxx4
-rw-r--r--ppdc/ppdmerge.cxx30
-rw-r--r--ppdc/ppdpo.cxx63
-rw-r--r--ppdc/sample.drv161
-rw-r--r--ppdc/testcatalog.cxx4
29 files changed, 577 insertions, 656 deletions
diff --git a/ppdc/Dependencies b/ppdc/Dependencies
index bcabc31..9feb967 100644
--- a/ppdc/Dependencies
+++ b/ppdc/Dependencies
@@ -1,184 +1,208 @@
ppdc-array.o: ppdc-array.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-attr.o: ppdc-attr.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-catalog.o: ppdc-catalog.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-choice.o: ppdc-choice.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-constraint.o: ppdc-constraint.cxx ppdc-private.h ppdc.h \
../cups/file.h ../cups/versioning.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
- ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
- ../cups/http-private.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/language.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/thread-private.h
-ppdc-driver.o: ppdc-driver.cxx ppdc-private.h ppdc.h ../cups/file.h \
- ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
+ ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
+ ../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ppdc-driver.o: ppdc-driver.cxx ppdc-private.h ppdc.h ../cups/file.h \
+ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-file.o: ppdc-file.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-filter.o: ppdc-filter.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-font.o: ppdc-font.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-group.o: ppdc-group.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-import.o: ppdc-import.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-mediasize.o: ppdc-mediasize.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-message.o: ppdc-message.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-option.o: ppdc-option.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-profile.o: ppdc-profile.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-shared.o: ppdc-shared.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-source.o: ppdc-source.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
- ../cups/raster.h ../data/epson.h ../data/hp.h ../data/label.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h ../cups/raster.h ../data/epson.h ../data/hp.h \
+ ../data/label.h
ppdc-string.o: ppdc-string.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc-variable.o: ppdc-variable.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
genstrings.o: genstrings.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdc.o: ppdc.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdhtml.o: ppdhtml.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdi.o: ppdi.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
ppdmerge.o: ppdmerge.cxx ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
- ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
- ../cups/http-private.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/language.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+ ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
+ ../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
+ ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+ ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
ppdpo.o: ppdpo.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
testcatalog.o: testcatalog.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
- ../config.h ../cups/debug-private.h ../cups/ipp-private.h \
- ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/language.h ../cups/pwg-private.h ../cups/cups.h \
- ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+ ../config.h ../cups/debug-private.h ../cups/array-private.h \
+ ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
+ ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/thread-private.h
diff --git a/ppdc/Makefile b/ppdc/Makefile
index c523144..7ac25ea 100644
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -1,16 +1,16 @@
#
-# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
+# "$Id: Makefile 12615 2015-05-06 20:21:51Z msweet $"
#
-# Makefile for the CUPS PPD Compiler.
+# Makefile for the CUPS PPD Compiler.
#
-# Copyright 2007-2012 by Apple Inc.
-# Copyright 2002-2006 by Easy Software Products.
+# Copyright 2007-2015 by Apple Inc.
+# Copyright 2002-2006 by Easy Software Products.
#
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law. Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file. If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
#
@@ -104,7 +104,7 @@ clean:
$(RM) $(TARGETS) $(UNITTARGETS)
$(RM) -r ppd ppd2
$(RM) sample-import.drv sample.c test.drv
- $(RM) libcupsppdc.so libcupsppdc.sl libcupsppdc.dylib
+ $(RM) libcupsppdc.so libcupsppdc.dylib
#
@@ -145,6 +145,7 @@ install-exec:
$(INSTALL_DIR) $(SYMROOT); \
for file in $(EXECTARGETS); do \
cp $$file $(SYMROOT); \
+ dsymutil $(SYMROOT)/$$file; \
done \
fi
@@ -167,7 +168,7 @@ install-libs: $(INSTALLSTATIC)
echo Installing libraries in $(LIBDIR)...
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) $(LIBCUPSPPDC) $(LIBDIR)
- if test $(LIBCUPSPPDC) = "libcupsppdc.so.1" -o $(LIBCUPSPPDC) = "libcupsppdc.sl.1"; then \
+ if test $(LIBCUPSPPDC) = "libcupsppdc.so.1"; then \
$(RM) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
$(LN) $(LIBCUPSPPDC) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
fi
@@ -178,6 +179,7 @@ install-libs: $(INSTALLSTATIC)
if test "x$(SYMROOT)" != "x"; then \
$(INSTALL_DIR) $(SYMROOT); \
cp $(LIBCUPSPPDC) $(SYMROOT); \
+ dsymutil $(SYMROOT)/$(LIBCUPSPPDC); \
fi
installstatic:
@@ -200,9 +202,6 @@ uninstall:
$(RM) $(LIBDIR)/libcupsppdc.1.dylib
$(RM) $(LIBDIR)/libcupsppdc.a
$(RM) $(LIBDIR)/libcupsppdc.dylib
- $(RM) $(LIBDIR)/libcupsppdc_s.a
- $(RM) $(LIBDIR)/libcupsppdc.sl
- $(RM) $(LIBDIR)/libcupsppdc.sl.1
$(RM) $(LIBDIR)/libcupsppdc.so
$(RM) $(LIBDIR)/libcupsppdc.so.1
-$(RMDIR) $(LIBDIR)
@@ -291,9 +290,9 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
$(COMMONLIBS) $(LIBZ)
echo Testing PPD importer...
$(RM) -r ppd ppd2 sample-import.drv
- ./ppdc-static -I ../data sample.drv
+ ./ppdc-static -l en -I ../data sample.drv
./ppdi-static -I ../data -o sample-import.drv ppd/*
- ./ppdc-static -I ../data -d ppd2 sample-import.drv
+ ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv
if diff -r ppd ppd2 >/dev/null; then \
echo PPD import OK; \
else \
@@ -332,10 +331,10 @@ testcatalog: testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
#
-# libcupsppdc.so.1, libcupsppdc.sl.1
+# libcupsppdc.so.1
#
-libcupsppdc.so.1 libcupsppdc.sl.1: $(LIBOBJS) ../cups/$(LIBCUPS)
+libcupsppdc.so.1: $(LIBOBJS) ../cups/$(LIBCUPS)
echo Linking $@...
$(DSOXX) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LINKCUPS)
$(RM) `basename $@ .1`
@@ -355,23 +354,12 @@ libcupsppdc.1.dylib: $(LIBOBJS) ../cups/$(LIBCUPS)
-current_version 1.0.0 \
-compatibility_version 1.0.0 \
-exported_symbols_list t.exp \
- $(LIBOBJS) $(LINKCUPS)
+ $(LIBOBJS) $(LINKCUPS) $(COMMONLIBS)
$(RM) libcupsppdc.dylib t.exp
$(LN) $@ libcupsppdc.dylib
#
-# libcupsppdc_s.a
-#
-
-libcupsppdc_s.a: $(LIBOBJS) ../cups/$(LIBCUPS)
- echo Creating $@...
- $(DSOXX) $(DSOFLAGS) -o libcupsppdc_s.o $(LIBOBJS) $(LINKCUPS)
- $(RM) $@
- $(AR) $(ARFLAGS) $@ libcupsppdc_s.o
-
-
-#
# libcupsppdc.la
#
@@ -400,5 +388,5 @@ include Dependencies
#
-# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
+# End of "$Id: Makefile 12615 2015-05-06 20:21:51Z msweet $".
#
diff --git a/ppdc/genstrings.cxx b/ppdc/genstrings.cxx
index f3496c7..72e9a85 100644
--- a/ppdc/genstrings.cxx
+++ b/ppdc/genstrings.cxx
@@ -1,31 +1,24 @@
//
-// "$Id: genstrings.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: genstrings.cxx 11800 2014-04-08 19:53:57Z msweet $"
//
-// GNU gettext message generator for the CUPS PPD Compiler.
+// GNU gettext message generator for the CUPS PPD Compiler.
//
-// This program is used to generate a dummy source file containing all of
-// the standard media and sample driver strings. The results are picked up
-// by GNU gettext and placed in the CUPS message catalog.
+// This program is used to generate a dummy source file containing all of
+// the standard media and sample driver strings. The results are picked up
+// by GNU gettext and placed in the CUPS message catalog.
//
-// Copyright 2008-2011 by Apple Inc.
+// Copyright 2008-2014 by Apple Inc.
//
-// These coded instructions, statements, and computer programs are the
-// property of Apple Inc. and are protected by Federal copyright
-// law. Distribution and use rights are outlined in the file "LICENSE.txt"
-// which should have been included with this file. If this file is
-// file is missing or damaged, see the license at "http://www.cups.org/".
+// These coded instructions, statements, and computer programs are the
+// property of Apple Inc. and are protected by Federal copyright
+// law. Distribution and use rights are outlined in the file "LICENSE.txt"
+// which should have been included with this file. If this file is
+// file is missing or damaged, see the license at "http://www.cups.org/".
//
// Usage:
//
// ./genstrings >sample.c
//
-// Contents:
-//
-// main() - Main entry for the PPD compiler.
-// add_ui_strings() - Add all UI strings from the driver.
-// write_cstring() - Write a translation string as a valid C string to
-// stdout.
-//
//
// Include necessary headers...
@@ -211,5 +204,5 @@ write_cstring(const char *s) /* I - String to write */
//
-// End of "$Id: genstrings.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: genstrings.cxx 11800 2014-04-08 19:53:57Z msweet $".
//
diff --git a/ppdc/ppdc-array.cxx b/ppdc/ppdc-array.cxx
index 603ceb6..5b5bacc 100644
--- a/ppdc/ppdc-array.cxx
+++ b/ppdc/ppdc-array.cxx
@@ -1,25 +1,16 @@
//
-// "$Id: ppdc-array.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-array.cxx 11558 2014-02-06 18:33:34Z msweet $"
//
-// Array class for the CUPS PPD Compiler.
+// Array class for the CUPS PPD Compiler.
//
-// Copyright 2007-2009 by Apple Inc.
-// Copyright 2002-2005 by Easy Software Products.
+// Copyright 2007-2014 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
//
-// These coded instructions, statements, and computer programs are the
-// property of Apple Inc. and are protected by Federal copyright
-// law. Distribution and use rights are outlined in the file "LICENSE.txt"
-// which should have been included with this file. If this file is
-// file is missing or damaged, see the license at "http://www.cups.org/".
-//
-// Contents:
-//
-// ppdcArray::ppdcArray() - Create a new array.
-// ppdcArray::~ppdcArray() - Destroy an array.
-// ppdcArray::add() - Add an element to an array.
-// ppdcArray::first() - Return the first element in the array.
-// ppdcArray::next() - Return the next element in the array.
-// ppdcArray::remove() - Remove an element from the array.
+// These coded instructions, statements, and computer programs are the
+// property of Apple Inc. and are protected by Federal copyright
+// law. Distribution and use rights are outlined in the file "LICENSE.txt"
+// which should have been included with this file. If this file is
+// file is missing or damaged, see the license at "http://www.cups.org/".
//
//
@@ -48,7 +39,7 @@ ppdcArray::ppdcArray(ppdcArray *a)
// Make a copy of the array...
data = new ppdcShared *[count];
- memcpy(data, a->data, count * sizeof(ppdcShared *));
+ memcpy(data, a->data, (size_t)count * sizeof(ppdcShared *));
for (int i = 0; i < count; i ++)
data[i]->retain();
@@ -98,7 +89,7 @@ ppdcArray::add(ppdcShared *d)
alloc += 10;
temp = new ppdcShared *[alloc];
- memcpy(temp, data, count * sizeof(ppdcShared *));
+ memcpy(temp, data, (size_t)count * sizeof(ppdcShared *));
delete[] data;
data = temp;
@@ -159,10 +150,10 @@ ppdcArray::remove(ppdcShared *d) // I - Data element
d->release();
if (i < count)
- memmove(data + i, data + i + 1, (count - i) * sizeof(ppdcShared *));
+ memmove(data + i, data + i + 1, (size_t)(count - i) * sizeof(ppdcShared *));
}
//
-// End of "$Id: ppdc-array.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-array.cxx 11558 2014-02-06 18:33:34Z msweet $".
//
diff --git a/ppdc/ppdc-attr.cxx b/ppdc/ppdc-attr.cxx
index 01286e7..4570f10 100644
--- a/ppdc/ppdc-attr.cxx
+++ b/ppdc/ppdc-attr.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-attr.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-attr.cxx 1378 2009-04-08 03:17:45Z msweet $"
//
// Attribute class for the CUPS PPD Compiler.
//
@@ -62,5 +62,5 @@ ppdcAttr::~ppdcAttr()
//
-// End of "$Id: ppdc-attr.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-attr.cxx 1378 2009-04-08 03:17:45Z msweet $".
//
diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx
index ab23717..35cadd6 100644
--- a/ppdc/ppdc-catalog.cxx
+++ b/ppdc/ppdc-catalog.cxx
@@ -1,29 +1,16 @@
//
-// "$Id: ppdc-catalog.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-catalog.cxx 11800 2014-04-08 19:53:57Z msweet $"
//
-// Shared message catalog class for the CUPS PPD Compiler.
+// Shared message catalog class for the CUPS PPD Compiler.
//
-// Copyright 2007-2012 by Apple Inc.
-// Copyright 2002-2006 by Easy Software Products.
+// Copyright 2007-2014 by Apple Inc.
+// Copyright 2002-2006 by Easy Software Products.
//
-// These coded instructions, statements, and computer programs are the
-// property of Apple Inc. and are protected by Federal copyright
-// law. Distribution and use rights are outlined in the file "LICENSE.txt"
-// which should have been included with this file. If this file is
-// file is missing or damaged, see the license at "http://www.cups.org/".
-//
-// Contents:
-//
-// ppdcCatalog::ppdcCatalog() - Create a shared message catalog.
-// ppdcCatalog::~ppdcCatalog() - Destroy a shared message catalog.
-// ppdcCatalog::add_message() - Add a new message.
-// ppdcCatalog::find_message() - Find a message in a catalog...
-// ppdcCatalog::load_messages() - Load messages from a .po file.
-// ppdcCatalog::save_messages() - Save the messages to a .po file.
-// get_utf8() - Get a UTF-8 character.
-// get_utf16() - Get a UTF-16 character...
-// put_utf8() - Add a UTF-8 character to a string.
-// put_utf16() - Write a UTF-16 character to a file.
+// These coded instructions, statements, and computer programs are the
+// property of Apple Inc. and are protected by Federal copyright
+// law. Distribution and use rights are outlined in the file "LICENSE.txt"
+// which should have been included with this file. If this file is
+// file is missing or damaged, see the license at "http://www.cups.org/".
//
//
@@ -50,6 +37,9 @@ typedef enum
// Local functions...
//
+#if defined(__APPLE__) && defined(CUPS_BUNDLEDIR)
+static void apple_add_message(CFStringRef key, CFStringRef val, ppdcCatalog *c);
+#endif /* __APPLE__ && CUPS_BUNDLEDIR */
static int get_utf8(char *&ptr);
static int get_utf16(cups_file_t *fp, ppdc_cs_t &cs);
static int put_utf8(int ch, char *&ptr, char *end);
@@ -64,10 +54,6 @@ ppdcCatalog::ppdcCatalog(const char *l, // I - Locale
const char *f) // I - Message catalog file
: ppdcShared()
{
- _cups_globals_t *cg = _cupsGlobals();
- // Global information
-
-
PPDC_NEW;
locale = new ppdcString(l);
@@ -80,6 +66,67 @@ ppdcCatalog::ppdcCatalog(const char *l, // I - Locale
char pofile[1024]; // Message catalog file
+#if defined(__APPLE__) && defined(CUPS_BUNDLEDIR)
+ char applelang[256]; // Apple language ID
+ CFURLRef url; // URL to cups.strings file
+ CFReadStreamRef stream = NULL; // File stream
+ CFPropertyListRef plist = NULL; // Localization file
+
+ snprintf(pofile, sizeof(pofile), CUPS_BUNDLEDIR "/Resources/%s.lproj/cups.strings", _cupsAppleLanguage(l, applelang, sizeof(applelang)));
+ if (access(pofile, 0))
+ {
+ // Try alternate lproj directory names...
+ const char *tl = l; // Temporary locale string
+
+ if (!strncmp(l, "en", 2))
+ tl = "English";
+ else if (!strncmp(l, "nb", 2) || !strncmp(l, "nl", 2))
+ tl = "Dutch";
+ else if (!strncmp(l, "fr", 2))
+ tl = "French";
+ else if (!strncmp(l, "de", 2))
+ tl = "German";
+ else if (!strncmp(l, "it", 2))
+ tl = "Italian";
+ else if (!strncmp(l, "ja", 2))
+ tl = "Japanese";
+ else if (!strncmp(l, "es", 2))
+ tl = "Spanish";
+
+ snprintf(pofile, sizeof(pofile), CUPS_BUNDLEDIR "/Resources/%s.lproj/cups.strings", tl);
+ }
+
+ url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (UInt8 *)pofile, (CFIndex)strlen(pofile), false);
+ if (url)
+ {
+ stream = CFReadStreamCreateWithFile(kCFAllocatorDefault, url);
+
+ if (stream)
+ {
+ /*
+ * Read the property list containing the localization data.
+ */
+
+ CFReadStreamOpen(stream);
+
+ plist = CFPropertyListCreateWithStream(kCFAllocatorDefault, stream, 0, kCFPropertyListImmutable, NULL, NULL);
+
+ if (plist && CFGetTypeID(plist) == CFDictionaryGetTypeID())
+ CFDictionaryApplyFunction((CFDictionaryRef)plist, (CFDictionaryApplierFunction)apple_add_message, this);
+
+ if (plist)
+ CFRelease(plist);
+
+ CFRelease(stream);
+ }
+
+ CFRelease(url);
+ }
+
+#else
+ _cups_globals_t *cg = _cupsGlobals();
+ // Global information
+
snprintf(pofile, sizeof(pofile), "%s/%s/cups_%s.po", cg->localedir, l, l);
if (load_messages(pofile) && strchr(l, '_'))
@@ -94,9 +141,10 @@ ppdcCatalog::ppdcCatalog(const char *l, // I - Locale
load_messages(pofile);
}
+#endif /* __APPLE__ && CUPS_BUNDLEDIR */
}
- if (f)
+ if (f && *f)
load_messages(f);
}
@@ -206,8 +254,8 @@ ppdcCatalog::load_messages(
else if (!strcmp(ptr, ".strings"))
{
/*
- * Read messages in OS X ".strings" format, which are UTF-16 text files of
- * the format:
+ * Read messages in OS X ".strings" format, which are either UTF-8/UTF-16
+ * text files of the format:
*
* "id" = "str";
*
@@ -610,6 +658,27 @@ ppdcCatalog::save_messages(
}
+#if defined(__APPLE__) && defined(CUPS_BUNDLEDIR)
+//
+// 'apple_add_message()' - Add a message from a localization dictionary.
+//
+
+static void
+apple_add_message(CFStringRef key, // I - Localization key
+ CFStringRef val, // I - Localized value
+ ppdcCatalog *c) // I - Message catalog
+{
+ char id[1024], // Message id
+ str[1024]; // Localized message
+
+
+ if (CFStringGetCString(key, id, sizeof(id), kCFStringEncodingUTF8) &&
+ CFStringGetCString(val, str, sizeof(str), kCFStringEncodingUTF8))
+ c->add_message(id, str);
+}
+#endif /* __APPLE__ && CUPS_BUNDLEDIR */
+
+
//
// 'get_utf8()' - Get a UTF-8 character.
//
@@ -817,7 +886,7 @@ put_utf8(int ch, // I - Unicode character
if (ptr >= end)
return (-1);
- *ptr++ = ch;
+ *ptr++ = (char)ch;
}
else if (ch < 0x800)
{
@@ -825,8 +894,8 @@ put_utf8(int ch, // I - Unicode character
if ((ptr + 1) >= end)
return (-1);
- *ptr++ = 0xc0 | (ch >> 6);
- *ptr++ = 0x80 | (ch & 0x3f);
+ *ptr++ = (char)(0xc0 | (ch >> 6));
+ *ptr++ = (char)(0x80 | (ch & 0x3f));
}
else if (ch < 0x10000)
{
@@ -834,9 +903,9 @@ put_utf8(int ch, // I - Unicode character
if ((ptr + 2) >= end)
return (-1);
- *ptr++ = 0xe0 | (ch >> 12);
- *ptr++ = 0x80 | ((ch >> 6) & 0x3f);
- *ptr++ = 0x80 | (ch & 0x3f);
+ *ptr++ = (char)(0xe0 | (ch >> 12));
+ *ptr++ = (char)(0x80 | ((ch >> 6) & 0x3f));
+ *ptr++ = (char)(0x80 | (ch & 0x3f));
}
else
{
@@ -844,10 +913,10 @@ put_utf8(int ch, // I - Unicode character
if ((ptr + 3) >= end)
return (-1);
- *ptr++ = 0xf0 | (ch >> 18);
- *ptr++ = 0x80 | ((ch >> 12) & 0x3f);
- *ptr++ = 0x80 | ((ch >> 6) & 0x3f);
- *ptr++ = 0x80 | (ch & 0x3f);
+ *ptr++ = (char)(0xf0 | (ch >> 18));
+ *ptr++ = (char)(0x80 | ((ch >> 12) & 0x3f));
+ *ptr++ = (char)(0x80 | ((ch >> 6) & 0x3f));
+ *ptr++ = (char)(0x80 | (ch & 0x3f));
}
return (0);
@@ -868,8 +937,8 @@ put_utf16(cups_file_t *fp, // I - File to write to
if (ch < 0x10000)
{
// One-word UTF-16 big-endian...
- buffer[0] = ch >> 8;
- buffer[1] = ch;
+ buffer[0] = (unsigned char)(ch >> 8);
+ buffer[1] = (unsigned char)ch;
if (cupsFileWrite(fp, (char *)buffer, 2) == 2)
return (0);
@@ -879,10 +948,10 @@ put_utf16(cups_file_t *fp, // I - File to write to
// Two-word UTF-16 big-endian...
ch -= 0x10000;
- buffer[0] = 0xd8 | (ch >> 18);
- buffer[1] = ch >> 10;
- buffer[2] = 0xdc | ((ch >> 8) & 0x03);
- buffer[3] = ch;
+ buffer[0] = (unsigned char)(0xd8 | (ch >> 18));
+ buffer[1] = (unsigned char)(ch >> 10);
+ buffer[2] = (unsigned char)(0xdc | ((ch >> 8) & 0x03));
+ buffer[3] = (unsigned char)ch;
if (cupsFileWrite(fp, (char *)buffer, 4) == 4)
return (0);
@@ -893,5 +962,5 @@ put_utf16(cups_file_t *fp, // I - File to write to
//
-// End of "$Id: ppdc-catalog.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-catalog.cxx 11800 2014-04-08 19:53:57Z msweet $".
//
diff --git a/ppdc/ppdc-choice.cxx b/ppdc/ppdc-choice.cxx
index 90872cb..e9937fe 100644
--- a/ppdc/ppdc-choice.cxx
+++ b/ppdc/ppdc-choice.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-choice.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-choice.cxx 1378 2009-04-08 03:17:45Z msweet $"
//
// Option choice class for the CUPS PPD Compiler.
//
@@ -57,5 +57,5 @@ ppdcChoice::~ppdcChoice()
//
-// End of "$Id: ppdc-choice.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-choice.cxx 1378 2009-04-08 03:17:45Z msweet $".
//
diff --git a/ppdc/ppdc-constraint.cxx b/ppdc/ppdc-constraint.cxx
index 948c329..c060979 100644
--- a/ppdc/ppdc-constraint.cxx
+++ b/ppdc/ppdc-constraint.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-constraint.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-constraint.cxx 1378 2009-04-08 03:17:45Z msweet $"
//
// Contraint class for the CUPS PPD Compiler.
//
@@ -60,5 +60,5 @@ ppdcConstraint::~ppdcConstraint()
//
-// End of "$Id: ppdc-constraint.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-constraint.cxx 1378 2009-04-08 03:17:45Z msweet $".
//
diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx
index 61b2d24..105eb9c 100644
--- a/ppdc/ppdc-driver.cxx
+++ b/ppdc/ppdc-driver.cxx
@@ -1,34 +1,16 @@
//
-// "$Id: ppdc-driver.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-driver.cxx 11558 2014-02-06 18:33:34Z msweet $"
//
-// PPD file compiler definitions for the CUPS PPD Compiler.
+// PPD file compiler definitions for the CUPS PPD Compiler.
//
-// Copyright 2007-2011 by Apple Inc.
-// Copyright 2002-2006 by Easy Software Products.
+// Copyright 2007-2014 by Apple Inc.
+// Copyright 2002-2006 by Easy Software Products.
//
-// These coded instructions, statements, and computer programs are the
-// property of Apple Inc. and are protected by Federal copyright
-// law. Distribution and use rights are outlined in the file "LICENSE.txt"
-// which should have been included with this file. If this file is
-// file is missing or damaged, see the license at "http://www.cups.org/".
-//
-// Contents:
-//
-// ppdcDriver::ppdcDriver() - Create a new printer driver.
-// ppdcDriver::~ppdcDriver() - Destroy a printer driver.
-// ppdcDriver::find_attr() - Find an attribute.
-// ppdcDriver::find_group() - Find a group.
-// ppdcDriver::find_option() - Find an option.
-// ppdcDriver::find_option_group() - Find an option and its group.
-// ppdcDriver::set_custom_size_code() - Set the custom page size code.
-// ppdcDriver::set_default_font() - Set the default font name.
-// ppdcDriver::set_default_size() - Set the default size name.
-// ppdcDriver::set_file_name() - Set the full filename.
-// ppdcDriver::set_manufacturer() - Set the manufacturer name.
-// ppdcDriver::set_model_name() - Set the model name.
-// ppdcDriver::set_pc_file_name() - Set the PC filename.
-// ppdcDriver::set_version() - Set the version string.
-// ppdcDriver::write_ppd_file() - Write a PPD file...
+// These coded instructions, statements, and computer programs are the
+// property of Apple Inc. and are protected by Federal copyright
+// law. Distribution and use rights are outlined in the file "LICENSE.txt"
+// which should have been included with this file. If this file is
+// file is missing or damaged, see the license at "http://www.cups.org/".
//
//
@@ -1333,7 +1315,7 @@ ppdcDriver::write_ppd_file(
fn->status == PPDC_FONT_ROM ? "ROM" : "Disk", lf);
cupsFilePrintf(fp, "*%% End of %s, %05d bytes.%s", pc_file_name->value,
- (int)(cupsFileTell(fp) + 25 + strlen(pc_file_name->value)),
+ (int)((size_t)cupsFileTell(fp) + 25 + strlen(pc_file_name->value)),
lf);
if (delete_cat)
@@ -1344,5 +1326,5 @@ ppdcDriver::write_ppd_file(
//
-// End of "$Id: ppdc-driver.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-driver.cxx 11558 2014-02-06 18:33:34Z msweet $".
//
diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx
index 3c243f3..0a24827 100644
--- a/ppdc/ppdc-file.cxx
+++ b/ppdc/ppdc-file.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-file.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-file.cxx 3755 2012-03-30 05:59:14Z msweet $"
//
// File class for the CUPS PPD Compiler.
//
@@ -106,5 +106,5 @@ ppdcFile::peek()
//
-// End of "$Id: ppdc-file.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-file.cxx 3755 2012-03-30 05:59:14Z msweet $".
//
diff --git a/ppdc/ppdc-filter.cxx b/ppdc/ppdc-filter.cxx
index 0b0bf4b..cc1ae00 100644
--- a/ppdc/ppdc-filter.cxx
+++ b/ppdc/ppdc-filter.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-filter.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-filter.cxx 1378 2009-04-08 03:17:45Z msweet $"
//
// Filter class for the CUPS PPD Compiler.
//
@@ -56,5 +56,5 @@ ppdcFilter::~ppdcFilter()
//
-// End of "$Id: ppdc-filter.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-filter.cxx 1378 2009-04-08 03:17:45Z msweet $".
//
diff --git a/ppdc/ppdc-font.cxx b/ppdc/ppdc-font.cxx
index d7b5f26..c5dad4d 100644
--- a/ppdc/ppdc-font.cxx
+++ b/ppdc/ppdc-font.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-font.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-font.cxx 1378 2009-04-08 03:17:45Z msweet $"
//
// Shared font class for the CUPS PPD Compiler.
//
@@ -62,5 +62,5 @@ ppdcFont::~ppdcFont()
//
-// End of "$Id: ppdc-font.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-font.cxx 1378 2009-04-08 03:17:45Z msweet $".
//
diff --git a/ppdc/ppdc-group.cxx b/ppdc/ppdc-group.cxx
index 56c847b..00d0a7c 100644
--- a/ppdc/ppdc-group.cxx
+++ b/ppdc/ppdc-group.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-group.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-group.cxx 3275 2011-05-20 07:26:13Z msweet $"
//
// Group class for the CUPS PPD Compiler.
//
@@ -99,5 +99,5 @@ ppdcGroup::find_option(const char *n) // I - Name of option
//
-// End of "$Id: ppdc-group.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-group.cxx 3275 2011-05-20 07:26:13Z msweet $".
//
diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
index 1c2a1c8..d41cbb9 100644
--- a/ppdc/ppdc-import.cxx
+++ b/ppdc/ppdc-import.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-import.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-import.cxx 3275 2011-05-20 07:26:13Z msweet $"
//
// PPD file import methods for the CUPS PPD Compiler.
//
@@ -339,5 +339,5 @@ ppdcSource::import_ppd(const char *f) // I - Filename
//
-// End of "$Id: ppdc-import.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-import.cxx 3275 2011-05-20 07:26:13Z msweet $".
//
diff --git a/ppdc/ppdc-mediasize.cxx b/ppdc/ppdc-mediasize.cxx
index 43bcf79..48afd38 100644
--- a/ppdc/ppdc-mediasize.cxx
+++ b/ppdc/ppdc-mediasize.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-mediasize.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-mediasize.cxx 1378 2009-04-08 03:17:45Z msweet $"
//
// Shared media size class for the CUPS PPD Compiler.
//
@@ -81,5 +81,5 @@ ppdcMediaSize::~ppdcMediaSize()
//
-// End of "$Id: ppdc-mediasize.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-mediasize.cxx 1378 2009-04-08 03:17:45Z msweet $".
//
diff --git a/ppdc/ppdc-message.cxx b/ppdc/ppdc-message.cxx
index 614c237..fbbe40c 100644
--- a/ppdc/ppdc-message.cxx
+++ b/ppdc/ppdc-message.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-message.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-message.cxx 1378 2009-04-08 03:17:45Z msweet $"
//
// Shared message class for the CUPS PPD Compiler.
//
@@ -54,5 +54,5 @@ ppdcMessage::~ppdcMessage()
//
-// End of "$Id: ppdc-message.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-message.cxx 1378 2009-04-08 03:17:45Z msweet $".
//
diff --git a/ppdc/ppdc-option.cxx b/ppdc/ppdc-option.cxx
index 6bbe1db..3fdc296 100644
--- a/ppdc/ppdc-option.cxx
+++ b/ppdc/ppdc-option.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-option.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-option.cxx 3275 2011-05-20 07:26:13Z msweet $"
//
// Option class for the CUPS PPD Compiler.
//
@@ -125,5 +125,5 @@ ppdcOption::set_defchoice(ppdcChoice *c) // I - Choice
//
-// End of "$Id: ppdc-option.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-option.cxx 3275 2011-05-20 07:26:13Z msweet $".
//
diff --git a/ppdc/ppdc-profile.cxx b/ppdc/ppdc-profile.cxx
index 0a63666..244e34f 100644
--- a/ppdc/ppdc-profile.cxx
+++ b/ppdc/ppdc-profile.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-profile.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-profile.cxx 1378 2009-04-08 03:17:45Z msweet $"
//
// Color profile class for the CUPS PPD Compiler.
//
@@ -61,5 +61,5 @@ ppdcProfile::~ppdcProfile()
//
-// End of "$Id: ppdc-profile.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-profile.cxx 1378 2009-04-08 03:17:45Z msweet $".
//
diff --git a/ppdc/ppdc-shared.cxx b/ppdc/ppdc-shared.cxx
index bd2983b..e6b6167 100644
--- a/ppdc/ppdc-shared.cxx
+++ b/ppdc/ppdc-shared.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-shared.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-shared.cxx 1556 2009-06-10 19:02:58Z msweet $"
//
// Shared data class for the CUPS PPD Compiler.
//
@@ -84,5 +84,5 @@ ppdcShared::retain()
//
-// End of "$Id: ppdc-shared.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-shared.cxx 1556 2009-06-10 19:02:58Z msweet $".
//
diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index 46c1bdd..85ef17e 100644
--- a/ppdc/ppdc-source.cxx
+++ b/ppdc/ppdc-source.cxx
@@ -1,59 +1,16 @@
//
-// "$Id: ppdc-source.cxx 11173 2013-07-23 12:31:34Z msweet $"
-//
-// Source class for the CUPS PPD Compiler.
-//
-// Copyright 2007-2012 by Apple Inc.
-// Copyright 2002-2007 by Easy Software Products.
-//
-// These coded instructions, statements, and computer programs are the
-// property of Apple Inc. and are protected by Federal copyright
-// law. Distribution and use rights are outlined in the file "LICENSE.txt"
-// which should have been included with this file. If this file is
-// file is missing or damaged, see the license at "http://www.cups.org/".
-//
-// Contents:
-//
-// ppdcSource::ppdcSource() - Load a driver source file.
-// ppdcSource::~ppdcSource() - Free a driver source file.
-// ppdcSource::add_include() - Add an include directory.
-// ppdcSource::find_driver() - Find a driver.
-// ppdcSource::find_include() - Find an include file.
-// ppdcSource::find_po() - Find a message catalog for the given
-// locale.
-// ppdcSource::find_size() - Find a media size.
-// ppdcSource::find_variable() - Find a variable.
-// ppdcSource::get_attr() - Get an attribute.
-// ppdcSource::get_boolean() - Get a boolean value.
-// ppdcSource::get_choice() - Get a choice.
-// ppdcSource::get_color_model() - Get an old-style color model option.
-// ppdcSource::get_color_order() - Get an old-style color order value.
-// ppdcSource::get_color_profile() - Get a color profile definition.
-// ppdcSource::get_color_space() - Get an old-style colorspace value.
-// ppdcSource::get_constraint() - Get a constraint.
-// ppdcSource::get_custom_size() - Get a custom media size definition from
-// a file.
-// ppdcSource::get_duplex() - Get a duplex option.
-// ppdcSource::get_filter() - Get a filter.
-// ppdcSource::get_float() - Get a single floating-point number.
-// ppdcSource::get_font() - Get a font definition.
-// ppdcSource::get_generic() - Get a generic old-style option.
-// ppdcSource::get_group() - Get an option group.
-// ppdcSource::get_installable() - Get an installable option.
-// ppdcSource::get_integer() - Get an integer value from a file.
-// ppdcSource::get_measurement() - Get a measurement value.
-// ppdcSource::get_option() - Get an option definition.
-// ppdcSource::get_po() - Get a message catalog.
-// ppdcSource::get_resolution() - Get an old-style resolution option.
-// ppdcSource::get_simple_profile() - Get a simple color profile definition.
-// ppdcSource::get_size() - Get a media size definition from a file.
-// ppdcSource::get_token() - Get a token from a file.
-// ppdcSource::get_variable() - Get a variable definition.
-// ppdcSource::quotef() - Write a formatted, quoted string...
-// ppdcSource::read_file() - Read a driver source file.
-// ppdcSource::scan_file() - Scan a driver source file.
-// ppdcSource::set_variable() - Set a variable.
-// ppdcSource::write_file() - Write the current source data to a file.
+// "$Id: ppdc-source.cxx 11558 2014-02-06 18:33:34Z msweet $"
+//
+// Source class for the CUPS PPD Compiler.
+//
+// Copyright 2007-2014 by Apple Inc.
+// Copyright 2002-2007 by Easy Software Products.
+//
+// These coded instructions, statements, and computer programs are the
+// property of Apple Inc. and are protected by Federal copyright
+// law. Distribution and use rights are outlined in the file "LICENSE.txt"
+// which should have been included with this file. If this file is
+// file is missing or damaged, see the license at "http://www.cups.org/".
//
//
@@ -235,9 +192,9 @@ ppdcSource::find_include(
{
// Check for the local file relative to the current directory...
if (base && *base && f[0] != '/')
- snprintf(n, nlen, "%s/%s", base, f);
+ snprintf(n, (size_t)nlen, "%s/%s", base, f);
else
- strlcpy(n, f, nlen);
+ strlcpy(n, f, (size_t)nlen);
if (!access(n, 0))
return (n);
@@ -253,7 +210,7 @@ ppdcSource::find_include(
{
for (dir = (ppdcString *)includes->first(); dir; dir = (ppdcString *)includes->next())
{
- snprintf(n, nlen, "%s/%s", dir->value, f);
+ snprintf(n, (size_t)nlen, "%s/%s", dir->value, f);
if (!access(n, 0))
return (n);
}
@@ -262,11 +219,11 @@ ppdcSource::find_include(
// Search the standard include directories...
_cups_globals_t *cg = _cupsGlobals(); // Global data
- snprintf(n, nlen, "%s/ppdc/%s", cg->cups_datadir, f);
+ snprintf(n, (size_t)nlen, "%s/ppdc/%s", cg->cups_datadir, f);
if (!access(n, 0))
return (n);
- snprintf(n, nlen, "%s/po/%s", cg->cups_datadir, f);
+ snprintf(n, (size_t)nlen, "%s/po/%s", cg->cups_datadir, f);
if (!access(n, 0))
return (n);
else
@@ -943,7 +900,7 @@ ppdcSource::get_filter(ppdcFile *fp) // I - File to read
while (isspace(*ptr))
ptr ++;
- strcpy(program, ptr);
+ strlcpy(program, ptr, sizeof(program));
}
else
{
@@ -1706,7 +1663,7 @@ ppdcSource::get_po(ppdcFile *fp) // I - File to read
if ((baseptr = strrchr(basedir, '/')) != NULL)
*baseptr = '\0';
else
- strcpy(basedir, ".");
+ strlcpy(basedir, ".", sizeof(basedir));
// Find the po file...
pofilename[0] = '\0';
@@ -1810,26 +1767,26 @@ ppdcSource::get_resolution(ppdcFile *fp)// I - File to read
if (color_order >= 0)
{
- snprintf(commptr, sizeof(command) - (commptr - command),
+ snprintf(commptr, sizeof(command) - (size_t)(commptr - command),
"/cupsColorOrder %d", color_order);
commptr += strlen(commptr);
}
if (color_space >= 0)
{
- snprintf(commptr, sizeof(command) - (commptr - command),
+ snprintf(commptr, sizeof(command) - (size_t)(commptr - command),
"/cupsColorSpace %d", color_space);
commptr += strlen(commptr);
}
if (compression >= 0)
{
- snprintf(commptr, sizeof(command) - (commptr - command),
+ snprintf(commptr, sizeof(command) - (size_t)(commptr - command),
"/cupsCompression %d", compression);
commptr += strlen(commptr);
}
- snprintf(commptr, sizeof(command) - (commptr - command), ">>setpagedevice");
+ snprintf(commptr, sizeof(command) - (size_t)(commptr - command), ">>setpagedevice");
// Return the new choice...
return (new ppdcChoice(name, text, command));
@@ -2014,7 +1971,7 @@ ppdcSource::get_token(ppdcFile *fp, // I - File to read
if (!isalnum(ch) && ch != '_')
break;
else if (nameptr < (name + sizeof(name) - 1))
- *nameptr++ = fp->get();
+ *nameptr++ = (char)fp->get();
}
if (nameptr == name)
@@ -2024,7 +1981,7 @@ ppdcSource::get_token(ppdcFile *fp, // I - File to read
{
// $$ = $
if (bufptr < bufend)
- *bufptr++ = fp->get();
+ *bufptr++ = (char)fp->get();
}
else
{
@@ -2044,7 +2001,7 @@ ppdcSource::get_token(ppdcFile *fp, // I - File to read
var = find_variable(name);
if (var)
{
- strlcpy(bufptr, var->value->value, bufend - bufptr + 1);
+ strlcpy(bufptr, var->value->value, (size_t)(bufend - bufptr + 1));
bufptr += strlen(bufptr);
}
else
@@ -2054,7 +2011,7 @@ ppdcSource::get_token(ppdcFile *fp, // I - File to read
_("ppdc: Undefined variable (%s) on line %d of "
"%s."), name, fp->line, fp->filename);
- snprintf(bufptr, bufend - bufptr + 1, "$%s", name);
+ snprintf(bufptr, (size_t)(bufend - bufptr + 1), "$%s", name);
bufptr += strlen(bufptr);
}
}
@@ -2096,7 +2053,7 @@ ppdcSource::get_token(ppdcFile *fp, // I - File to read
empty = 0;
if (bufptr < bufend)
- *bufptr++ = ch;
+ *bufptr++ = (char)ch;
}
}
else if (ch == '\'' || ch == '\"')
@@ -2112,7 +2069,7 @@ ppdcSource::get_token(ppdcFile *fp, // I - File to read
{
// Insert the opposing quote char...
if (bufptr < bufend)
- *bufptr++ = ch;
+ *bufptr++ = (char)ch;
}
else
{
@@ -2128,14 +2085,14 @@ ppdcSource::get_token(ppdcFile *fp, // I - File to read
startline = fp->line;
if (bufptr < bufend)
- *bufptr++ = ch;
+ *bufptr++ = (char)ch;
}
else if ((ch == ')' && quote == '(') || (ch == '>' && quote == '<'))
{
quote = 0;
if (bufptr < bufend)
- *bufptr++ = ch;
+ *bufptr++ = (char)ch;
}
else if (ch == '\\')
{
@@ -2145,13 +2102,13 @@ ppdcSource::get_token(ppdcFile *fp, // I - File to read
break;
if (bufptr < bufend)
- *bufptr++ = ch;
+ *bufptr++ = (char)ch;
}
else if (bufptr < bufend)
{
empty = 0;
- *bufptr++ = ch;
+ *bufptr++ = (char)ch;
if ((ch == '{' || ch == '}') && !quote)
break;
@@ -2171,7 +2128,6 @@ ppdcSource::get_token(ppdcFile *fp, // I - File to read
else
{
*bufptr = '\0';
-// puts(buffer);
return (buffer);
}
}
@@ -2292,7 +2248,7 @@ ppdcSource::quotef(cups_file_t *fp, // I - File to write to
if ((format - bufformat + 1) > (int)sizeof(tformat))
break;
- strncpy(tformat, bufformat, format - bufformat);
+ memcpy(tformat, bufformat, (size_t)(format - bufformat));
tformat[format - bufformat] = '\0';
bytes += cupsFilePrintf(fp, tformat, va_arg(ap, double));
@@ -2309,7 +2265,7 @@ ppdcSource::quotef(cups_file_t *fp, // I - File to write to
if ((format - bufformat + 1) > (int)sizeof(tformat))
break;
- strncpy(tformat, bufformat, format - bufformat);
+ memcpy(tformat, bufformat, (size_t)(format - bufformat));
tformat[format - bufformat] = '\0';
# ifdef HAVE_LONG_LONG
@@ -2327,7 +2283,7 @@ ppdcSource::quotef(cups_file_t *fp, // I - File to write to
if ((format - bufformat + 1) > (int)sizeof(tformat))
break;
- strncpy(tformat, bufformat, format - bufformat);
+ memcpy(tformat, bufformat, (size_t)(format - bufformat));
tformat[format - bufformat] = '\0';
bytes += cupsFilePrintf(fp, tformat, va_arg(ap, void *));
@@ -2341,7 +2297,7 @@ ppdcSource::quotef(cups_file_t *fp, // I - File to write to
}
else
{
- cupsFileWrite(fp, va_arg(ap, char *), width);
+ cupsFileWrite(fp, va_arg(ap, char *), (size_t)width);
bytes += width;
}
break;
@@ -2350,7 +2306,7 @@ ppdcSource::quotef(cups_file_t *fp, // I - File to write to
if ((s = va_arg(ap, char *)) == NULL)
s = (char *)"(nil)";
- slen = strlen(s);
+ slen = (int)strlen(s);
if (slen > width && prec != width)
width = slen;
@@ -2630,7 +2586,7 @@ ppdcSource::scan_file(ppdcFile *fp, // I - File to read
if ((baseptr = strrchr(basedir, '/')) != NULL)
*baseptr = '\0';
else
- strcpy(basedir, ".");
+ strlcpy(basedir, ".", sizeof(basedir));
// Find the include file...
if (find_include(inctemp, basedir, incname, sizeof(incname)))
@@ -3847,5 +3803,5 @@ ppdcSource::write_file(const char *f) // I - File to write
//
-// End of "$Id: ppdc-source.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-source.cxx 11558 2014-02-06 18:33:34Z msweet $".
//
diff --git a/ppdc/ppdc-string.cxx b/ppdc/ppdc-string.cxx
index f9dfb9e..b6e3512 100644
--- a/ppdc/ppdc-string.cxx
+++ b/ppdc/ppdc-string.cxx
@@ -1,9 +1,9 @@
//
-// "$Id: ppdc-string.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-string.cxx 3933 2012-10-01 03:01:10Z msweet $"
//
// Shared string class for the CUPS PPD Compiler.
//
-// Copyright 2007-2009 by Apple Inc.
+// Copyright 2007-2012 by Apple Inc.
// Copyright 2002-2005 by Easy Software Products.
//
// These coded instructions, statements, and computer programs are the
@@ -36,8 +36,10 @@ ppdcString::ppdcString(const char *v) // I - String
if (v)
{
- value = new char[strlen(v) + 1];
- strcpy(value, v);
+ size_t vlen = strlen(v);
+
+ value = new char[vlen + 1];
+ memcpy(value, v, vlen + 1);
}
else
value = 0;
@@ -58,5 +60,5 @@ ppdcString::~ppdcString()
//
-// End of "$Id: ppdc-string.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-string.cxx 3933 2012-10-01 03:01:10Z msweet $".
//
diff --git a/ppdc/ppdc-variable.cxx b/ppdc/ppdc-variable.cxx
index 22b926c..d60ef72 100644
--- a/ppdc/ppdc-variable.cxx
+++ b/ppdc/ppdc-variable.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-variable.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc-variable.cxx 1378 2009-04-08 03:17:45Z msweet $"
//
// Variable class for the CUPS PPD Compiler.
//
@@ -67,5 +67,5 @@ ppdcVariable::set_value(const char *v)
//
-// End of "$Id: ppdc-variable.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc-variable.cxx 1378 2009-04-08 03:17:45Z msweet $".
//
diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx
index 55990c4..d8a7c60 100644
--- a/ppdc/ppdc.cxx
+++ b/ppdc/ppdc.cxx
@@ -1,21 +1,16 @@
//
-// "$Id: ppdc.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdc.cxx 11800 2014-04-08 19:53:57Z msweet $"
//
-// PPD file compiler main entry for the CUPS PPD Compiler.
+// PPD file compiler main entry for the CUPS PPD Compiler.
//
-// Copyright 2007-2012 by Apple Inc.
-// Copyright 2002-2007 by Easy Software Products.
+// Copyright 2007-2014 by Apple Inc.
+// Copyright 2002-2007 by Easy Software Products.
//
-// These coded instructions, statements, and computer programs are the
-// property of Apple Inc. and are protected by Federal copyright
-// law. Distribution and use rights are outlined in the file "LICENSE.txt"
-// which should have been included with this file. If this file is
-// file is missing or damaged, see the license at "http://www.cups.org/".
-//
-// Contents:
-//
-// main() - Main entry for the PPD compiler.
-// usage() - Show usage and exit.
+// These coded instructions, statements, and computer programs are the
+// property of Apple Inc. and are protected by Federal copyright
+// law. Distribution and use rights are outlined in the file "LICENSE.txt"
+// which should have been included with this file. If this file is
+// file is missing or damaged, see the license at "http://www.cups.org/".
//
//
@@ -192,7 +187,7 @@ main(int argc, // I - Number of command-line arguments
catalog = new ppdcCatalog(argv[i]);
- if (catalog->messages->count == 0)
+ if (catalog->messages->count == 0 && strcmp(argv[i], "en"))
{
_cupsLangPrintf(stderr,
_("ppdc: Unable to find localization for "
@@ -344,7 +339,7 @@ main(int argc, // I - Number of command-line arguments
for (j = 0;
outname[j] && j < (int)(sizeof(pcfilename) - 1);
j ++)
- pcfilename[j] = tolower(outname[j] & 255);
+ pcfilename[j] = (char)tolower(outname[j] & 255);
pcfilename[j] = '\0';
}
@@ -464,5 +459,5 @@ usage(void)
//
-// End of "$Id: ppdc.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdc.cxx 11800 2014-04-08 19:53:57Z msweet $".
//
diff --git a/ppdc/ppdhtml.cxx b/ppdc/ppdhtml.cxx
index 89d7393..234495c 100644
--- a/ppdc/ppdhtml.cxx
+++ b/ppdc/ppdhtml.cxx
@@ -1,21 +1,16 @@
//
-// "$Id: ppdhtml.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdhtml.cxx 12633 2015-05-15 19:16:58Z msweet $"
//
-// PPD to HTML utility for the CUPS PPD Compiler.
+// PPD to HTML utility for the CUPS PPD Compiler.
//
-// Copyright 2007-2011 by Apple Inc.
-// Copyright 2002-2005 by Easy Software Products.
+// Copyright 2007-2015 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
//
-// These coded instructions, statements, and computer programs are the
-// property of Apple Inc. and are protected by Federal copyright
-// law. Distribution and use rights are outlined in the file "LICENSE.txt"
-// which should have been included with this file. If this file is
-// file is missing or damaged, see the license at "http://www.cups.org/".
-//
-// Contents:
-//
-// main() - Main entry for the PPD to HTML utility.
-// usage() - Show usage and exit.
+// These coded instructions, statements, and computer programs are the
+// property of Apple Inc. and are protected by Federal copyright
+// law. Distribution and use rights are outlined in the file "LICENSE.txt"
+// which should have been included with this file. If this file is
+// file is missing or damaged, see the license at "http://www.cups.org/".
//
//
@@ -58,7 +53,7 @@ main(int argc, // I - Number of command-line arguments
_cupsSetLocale(argv);
// Scan the command-line...
- src = 0;
+ src = new ppdcSource();
for (i = 1; i < argc; i ++)
if (argv[i][0] == '-')
@@ -97,65 +92,75 @@ main(int argc, // I - Number of command-line arguments
else
{
// Open and load the driver info file...
- src = new ppdcSource(argv[i]);
-
- // Create a composite group with all of the features from the
- // drivers in the info file...
- composite = new ppdcGroup("", "");
-
- for (d = (ppdcDriver *)src->drivers->first(); d; d = (ppdcDriver *)src->drivers->next())
- for (g = (ppdcGroup *)d->groups->first(); g; g = (ppdcGroup *)d->groups->next())
- for (o = (ppdcOption *)g->options->first(); o; o = (ppdcOption *)g->options->next())
- {
- if ((compo = composite->find_option(o->name->value)) == NULL)
- composite->add_option(new ppdcOption(o));
- }
-
- puts("<html>");
- printf("<head><title>Driver Summary for %s</title></head>\n", argv[i]);
- printf("<body><h1>Driver Summary for %s</h1>\n", argv[i]);
- printf("<p><table border='1'><thead><tr><th>Printer</th><th>Media Size</th>");
- for (compo = (ppdcOption *)composite->options->first(); compo; compo = (ppdcOption *)composite->options->next())
- printf("<th>%s</th>", compo->text->value);
- puts("</tr></thead><tbody>");
-
- // Write HTML summary...
- for (d = (ppdcDriver *)src->drivers->first(); d; d = (ppdcDriver *)src->drivers->next())
- {
- // Write the summary for this driver...
- printf("<tr valign='top'><td nowrap>%s</td><td nowrap>", d->model_name->value);
- for (size = (ppdcMediaSize *)d->sizes->first(); size;
- size = (ppdcMediaSize *)d->sizes->next())
- printf("%s<br>", size->text->value);
- printf("</td>");
-
- for (compo = (ppdcOption *)composite->options->first(); compo;
- compo = (ppdcOption *)composite->options->next())
- if ((o = d->find_option(compo->name->value)) != NULL)
- {
- printf("<td nowrap>");
- for (c = (ppdcChoice *)o->choices->first(); c;
- c = (ppdcChoice *)o->choices->next())
- printf("%s<br>", c->text->value);
- printf("</td>");
- }
- else
- printf("<td>N/A</td>");
-
- puts("</tr>");
- }
-
- puts("</tbody></table></p>");
- puts("</body>");
- puts("</html>");
- // Delete the printer driver information...
- composite->release();
- src->release();
+ src->read_file(argv[i]);
+ }
+
+ if ((d = (ppdcDriver *)src->drivers->first()) != NULL)
+ {
+ // Create a composite group with all of the features from the
+ // drivers in the info file...
+ composite = new ppdcGroup("", "");
+
+ while (d != NULL)
+ {
+ for (g = (ppdcGroup *)d->groups->first(); g; g = (ppdcGroup *)d->groups->next())
+ for (o = (ppdcOption *)g->options->first(); o; o = (ppdcOption *)g->options->next())
+ {
+ if ((compo = composite->find_option(o->name->value)) == NULL)
+ composite->add_option(new ppdcOption(o));
+ }
+
+ d = (ppdcDriver *)src->drivers->next();
}
- // If no drivers have been loaded, display the program usage message.
- if (!src)
+ puts("<html>");
+ printf("<head><title>Driver Summary for %s</title></head>\n", argv[i]);
+ printf("<body><h1>Driver Summary for %s</h1>\n", argv[i]);
+ printf("<p><table border='1'><thead><tr><th>Printer</th><th>Media Size</th>");
+ for (compo = (ppdcOption *)composite->options->first(); compo; compo = (ppdcOption *)composite->options->next())
+ printf("<th>%s</th>", compo->text->value);
+ puts("</tr></thead><tbody>");
+
+ // Write HTML summary...
+ for (d = (ppdcDriver *)src->drivers->first(); d; d = (ppdcDriver *)src->drivers->next())
+ {
+ // Write the summary for this driver...
+ printf("<tr valign='top'><td nowrap>%s</td><td nowrap>", d->model_name->value);
+ for (size = (ppdcMediaSize *)d->sizes->first(); size;
+ size = (ppdcMediaSize *)d->sizes->next())
+ printf("%s<br>", size->text->value);
+ printf("</td>");
+
+ for (compo = (ppdcOption *)composite->options->first(); compo;
+ compo = (ppdcOption *)composite->options->next())
+ if ((o = d->find_option(compo->name->value)) != NULL)
+ {
+ printf("<td nowrap>");
+ for (c = (ppdcChoice *)o->choices->first(); c;
+ c = (ppdcChoice *)o->choices->next())
+ printf("%s<br>", c->text->value);
+ printf("</td>");
+ }
+ else
+ printf("<td>N/A</td>");
+
+ puts("</tr>");
+ }
+
+ puts("</tbody></table></p>");
+ puts("</body>");
+ puts("</html>");
+
+ // Delete the printer driver information...
+ composite->release();
+ }
+ else
+ {
+ // If no drivers have been loaded, display the program usage message.
usage();
+ }
+
+ src->release();
// Return with no errors.
return (0);
@@ -182,5 +187,5 @@ usage(void)
//
-// End of "$Id: ppdhtml.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdhtml.cxx 12633 2015-05-15 19:16:58Z msweet $".
//
diff --git a/ppdc/ppdi.cxx b/ppdc/ppdi.cxx
index 2ebe410..cbc728b 100644
--- a/ppdc/ppdi.cxx
+++ b/ppdc/ppdi.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdi.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdi.cxx 3071 2011-03-23 00:05:29Z msweet $"
//
// PPD file import utility for the CUPS PPD Compiler.
//
@@ -138,5 +138,5 @@ usage(void)
//
-// End of "$Id: ppdi.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdi.cxx 3071 2011-03-23 00:05:29Z msweet $".
//
diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx
index 2564905..cc38881 100644
--- a/ppdc/ppdmerge.cxx
+++ b/ppdc/ppdmerge.cxx
@@ -1,22 +1,16 @@
//
-// "$Id: ppdmerge.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdmerge.cxx 11558 2014-02-06 18:33:34Z msweet $"
//
-// PPD file merge utility for the CUPS PPD Compiler.
+// PPD file merge utility for the CUPS PPD Compiler.
//
-// Copyright 2007-2011 by Apple Inc.
-// Copyright 2002-2007 by Easy Software Products.
+// Copyright 2007-2014 by Apple Inc.
+// Copyright 2002-2007 by Easy Software Products.
//
-// These coded instructions, statements, and computer programs are the
-// property of Apple Inc. and are protected by Federal copyright
-// law. Distribution and use rights are outlined in the file "LICENSE.txt"
-// which should have been included with this file. If this file is
-// file is missing or damaged, see the license at "http://www.cups.org/".
-//
-// Contents:
-//
-// main() - Main entry for the PPD merge utility.
-// ppd_locale() - Return the locale associated with a PPD file.
-// usage() - Show usage and exit.
+// These coded instructions, statements, and computer programs are the
+// property of Apple Inc. and are protected by Federal copyright
+// law. Distribution and use rights are outlined in the file "LICENSE.txt"
+// which should have been included with this file. If this file is
+// file is missing or damaged, see the license at "http://www.cups.org/".
//
//
@@ -302,8 +296,8 @@ main(int argc, // I - Number of command-line arguments
static const char * // O - Locale string
ppd_locale(ppd_file_t *ppd) // I - PPD file
{
- int i, // Looping var
- vlen; // Length of LanguageVersion string
+ int i; // Looping var
+ size_t vlen; // Length of LanguageVersion string
static char locale[255]; // Locale string
static struct // LanguageVersion translation table
{
@@ -375,5 +369,5 @@ usage(void)
//
-// End of "$Id: ppdmerge.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdmerge.cxx 11558 2014-02-06 18:33:34Z msweet $".
//
diff --git a/ppdc/ppdpo.cxx b/ppdc/ppdpo.cxx
index 14e96d0..ab53bf4 100644
--- a/ppdc/ppdpo.cxx
+++ b/ppdc/ppdpo.cxx
@@ -1,22 +1,16 @@
//
-// "$Id: ppdpo.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: ppdpo.cxx 12633 2015-05-15 19:16:58Z msweet $"
//
-// PPD file message catalog program for the CUPS PPD Compiler.
+// PPD file message catalog program for the CUPS PPD Compiler.
//
-// Copyright 2007-2012 by Apple Inc.
-// Copyright 2002-2005 by Easy Software Products.
+// Copyright 2007-2015 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
//
-// These coded instructions, statements, and computer programs are the
-// property of Apple Inc. and are protected by Federal copyright
-// law. Distribution and use rights are outlined in the file "LICENSE.txt"
-// which should have been included with this file. If this file is
-// file is missing or damaged, see the license at "http://www.cups.org/".
-//
-// Contents:
-//
-// main() - Main entry for the PPD compiler.
-// add_ui_strings() - Add all UI strings from the driver.
-// usage() - Show usage and exit.
+// These coded instructions, statements, and computer programs are the
+// property of Apple Inc. and are protected by Federal copyright
+// law. Distribution and use rights are outlined in the file "LICENSE.txt"
+// which should have been included with this file. If this file is
+// file is missing or damaged, see the license at "http://www.cups.org/".
//
//
@@ -58,7 +52,7 @@ main(int argc, // I - Number of command-line arguments
// Scan the command-line...
catalog = new ppdcCatalog("en");
- src = 0;
+ src = new ppdcSource();
verbose = 0;
outfile = 0;
@@ -123,23 +117,28 @@ main(int argc, // I - Number of command-line arguments
_("ppdc: Loading driver information file \"%s\"."),
argv[i]);
- src = new ppdcSource(argv[i]);
+ src->read_file(argv[i]);
+ }
- // Add UI strings...
- for (d = (ppdcDriver *)src->drivers->first();
- d;
- d = (ppdcDriver *)src->drivers->next())
- {
- if (verbose)
- _cupsLangPrintf(stderr, _("ppdc: Adding/updating UI text from %s."),
- argv[i]);
+ // If no drivers have been loaded, display the program usage message.
+ if ((d = (ppdcDriver *)src->drivers->first()) != NULL)
+ {
+ // Add UI strings...
+ while (d != NULL)
+ {
+ if (verbose)
+ _cupsLangPrintf(stderr, _("ppdc: Adding/updating UI text from %s."), argv[i]);
- add_ui_strings(d, catalog);
- }
+ add_ui_strings(d, catalog);
- // Delete the printer driver information...
- src->release();
+ d = (ppdcDriver *)src->drivers->next();
}
+ }
+ else
+ usage();
+
+ // Delete the printer driver information...
+ src->release();
// Write the message catalog...
if (!outfile)
@@ -149,10 +148,6 @@ main(int argc, // I - Number of command-line arguments
catalog->release();
- // If no drivers have been loaded, display the program usage message.
- if (!src)
- usage();
-
// Return with no errors.
return (0);
}
@@ -263,5 +258,5 @@ usage(void)
//
-// End of "$Id: ppdpo.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: ppdpo.cxx 12633 2015-05-15 19:16:58Z msweet $".
//
diff --git a/ppdc/sample.drv b/ppdc/sample.drv
index ec808d2..854e334 100644
--- a/ppdc/sample.drv
+++ b/ppdc/sample.drv
@@ -1,16 +1,16 @@
//
-// "$Id: sample.drv 3794 2012-04-23 22:44:16Z msweet $"
+// "$Id: sample.drv 12789 2015-07-20 14:51:28Z msweet $"
//
-// Driver info file for CUPS-supplied PPDs.
+// Driver info file for CUPS-supplied PPDs.
//
-// Copyright 2007-2011 by Apple Inc.
-// Copyright 1993-2006 by Easy Software Products.
+// Copyright 2007-2014 by Apple Inc.
+// Copyright 1993-2006 by Easy Software Products.
//
-// These coded instructions, statements, and computer programs are the
-// property of Apple Inc. and are protected by Federal copyright
-// law. Distribution and use rights are outlined in the file "LICENSE.txt"
-// which should have been included with this file. If this file is
-// file is missing or damaged, see the license at "http://www.cups.org/".
+// These coded instructions, statements, and computer programs are the
+// property of Apple Inc. and are protected by Federal copyright
+// law. Distribution and use rights are outlined in the file "LICENSE.txt"
+// which should have been included with this file. If this file is
+// file is missing or damaged, see the license at "http://www.cups.org/".
//
// Include necessary files...
@@ -22,26 +22,37 @@
// Localizations are provided for all of the base languages supported by
// CUPS...
-//#po da ""
-//#po de ""
-//#po es ""
-//#po et ""
-//#po fi ""
-//#po fr ""
-//#po he ""
-//#po id ""
-//#po it ""
-//#po ja ""
-//#po ko ""
-//#po nl ""
-//#po no ""
-//#po pl ""
-//#po pt ""
-//#po pt_BR ""
-//#po ru ""
-//#po sv ""
-//#po zh ""
-//#po zh_TW ""
+#po ar ""
+#po ca ""
+#po cs ""
+#po da ""
+#po de ""
+#po el ""
+#po es ""
+#po fi ""
+#po fr ""
+#po he ""
+#po hr ""
+#po hu ""
+#po id ""
+#po it ""
+#po ja ""
+#po ko ""
+#po ms ""
+#po no ""
+#po pl ""
+#po pt ""
+#po pt_PT ""
+#po ro ""
+#po ru ""
+#po sk ""
+#po sv ""
+#po th ""
+#po tr ""
+#po uk ""
+#po vi ""
+#po zh_CN ""
+#po zh_TW ""
// MediaSize sizes used by label drivers...
#media "w90h18/1.25x0.25\"" 90 18
@@ -103,12 +114,12 @@
#media "w576h468/8.00x6.50\"" 576 468
// Common stuff for all drivers...
-Attribute "cupsVersion" "" "1.6"
+Attribute "cupsVersion" "" "2.1"
Attribute "FileSystem" "" "False"
Attribute "LandscapeOrientation" "" "Plus90"
Attribute "TTRasterizer" "" "Type42"
-Copyright "Copyright 2007-2012 by Apple Inc."
+Copyright "Copyright 2007-2014 by Apple Inc."
Copyright "Copyright 1997-2007 by Easy Software Products."
Copyright ""
Copyright "These coded instructions, statements, and computer programs are the"
@@ -119,7 +130,7 @@ Copyright "file is missing or damaged, see the license at \"http://www.cups.org/
Font *
-Version "1.5"
+Version "2.1"
// Dymo Label Printer
{
@@ -206,90 +217,6 @@ Version "1.5"
*Resolution k 1 8 0 0 120x72dpi
Resolution k 1 8 0 0 240x72dpi
}
-
- // Epson Stylus Color Series
- {
- ModelName "Stylus Color Series"
- Attribute NickName "" "Epson Stylus Color Series"
- PCFileName "stcolor.ppd"
- ModelNumber $EPSON_COLOR
- ColorDevice Yes
-
- HWMargins 8.6 39.6 8.6 25.51
- *MediaSize Letter
- MediaSize Legal
- MediaSize A4
-
- Resolution - 1 0 0 0 180dpi
- *Resolution - 1 0 0 0 360dpi
- Resolution - 1 0 0 0 720dpi
-
- *ColorModel CMYK cmyk banded 1
- ColorModel Gray/Grayscale k chunky 1
- }
-
- // Epson New Stylus Color Series
- {
- ModelName "New Stylus Color Series"
- Attribute NickName "" "Epson New Stylus Color Series"
- PCFileName "stcolor2.ppd"
- ModelNumber $EPSON_ICOLOR
- ColorDevice Yes
-
- HWMargins 8.6 39.6 8.6 25.51
- *MediaSize Letter
- MediaSize Legal
- MediaSize A4
-
- Resolution - 1 0 0 0 180dpi
- *Resolution - 1 0 0 0 360dpi
- Resolution - 1 0 0 0 720dpi
-
- *ColorModel CMYK cmyk banded 1
- ColorModel Gray/Grayscale k chunky 1
- }
-
- // Epson Stylus Color Series
- {
- ModelName "Stylus Photo Series"
- Attribute NickName "" "Epson Stylus Photo Series"
- PCFileName "stphoto.ppd"
- ModelNumber $EPSON_PHOTO
- ColorDevice Yes
-
- HWMargins 8.6 39.6 8.6 25.51
- *MediaSize Letter
- MediaSize Legal
- MediaSize A4
-
- Resolution - 1 0 0 0 180dpi
- *Resolution - 1 0 0 0 360dpi
- Resolution - 1 0 0 0 720dpi
-
- *ColorModel CMYK cmykcm banded 1
- ColorModel Gray/Grayscale k chunky 1
- }
-
- // Epson New Stylus Color Series
- {
- ModelName "New Stylus Photo Series"
- Attribute NickName "" "Epson New Stylus Photo Series"
- PCFileName "stphoto2.ppd"
- ModelNumber $EPSON_IPHOTO
- ColorDevice Yes
-
- HWMargins 8.6 39.6 8.6 25.51
- *MediaSize Letter
- MediaSize Legal
- MediaSize A4
-
- Resolution - 1 0 0 0 180dpi
- *Resolution - 1 0 0 0 360dpi
- Resolution - 1 0 0 0 720dpi
-
- *ColorModel CMYK cmykcm banded 1
- ColorModel Gray/Grayscale k chunky 1
- }
}
// Generic drivers
@@ -1241,5 +1168,5 @@ Version "1.5"
}
//
-// End of "$Id: sample.drv 3794 2012-04-23 22:44:16Z msweet $".
+// End of "$Id: sample.drv 12789 2015-07-20 14:51:28Z msweet $".
//
diff --git a/ppdc/testcatalog.cxx b/ppdc/testcatalog.cxx
index 1e8ecaa..0943dcc 100644
--- a/ppdc/testcatalog.cxx
+++ b/ppdc/testcatalog.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: testcatalog.cxx 11173 2013-07-23 12:31:34Z msweet $"
+// "$Id: testcatalog.cxx 1378 2009-04-08 03:17:45Z msweet $"
//
// Test program for message catalog class.
//
@@ -59,5 +59,5 @@ main(int argc, // I - Number of command-line arguments
//
-// End of "$Id: testcatalog.cxx 11173 2013-07-23 12:31:34Z msweet $".
+// End of "$Id: testcatalog.cxx 1378 2009-04-08 03:17:45Z msweet $".
//
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 01:06:47 +0000