diff options
| -rw-r--r-- | .SRCINFO | 37 | ||||
| -rw-r--r-- | PKGBUILD | 68 | ||||
| -rw-r--r-- | buildfiles.patch | 55 | ||||
| -rw-r--r-- | cnijfilter-e510.install | 22 | ||||
| -rw-r--r-- | cups.patch | 35 | ||||
| -rw-r--r-- | libpng15.patch | 23 | ||||
| -rw-r--r-- | mychanges.patch | 369 |
7 files changed, 609 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..268f68f753e2 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,37 @@ +# Generated by mksrcinfo v8 +# Wed Dec 30 11:11:58 UTC 2015 +pkgbase = cnijfilter-e510 + pkgdesc = Canon IJ Printer Driver (For PIXMA E510 series) + pkgver = 3.80 + pkgrel = 1 + url = https://www.canon-europe.com/support/consumer_products/products/printers/inkjet/other_pixma/pixma_e514.aspx + install = cnijfilter-e510.install + arch = i686 + arch = x86_64 + license = custom + makedepends = autoconf>=2.13 + makedepends = automake>=1.6 + makedepends = tar + makedepends = make + depends = cnijfilter-common=4.00 + source = http://gdlp01.c-wss.com/gds/6/0100005266/01/cnijfilter-source-3.80-2.tar.gz + source = libpng15.patch + source = cups.patch + source = buildfiles.patch + source = mychanges.patch + sha512sums = 693dad98b8e69bb4bbad3c62a600b0be5073e8765756cd57722038089387ffe532d01daf5a74d3a8aa93fdc14f7de0326b8aa67acce24d105b0dcb25dfd94be5 + sha512sums = 0d8310867f45721150a870170172d3a0688bfba0267f627a630c105ff965d31f25dbcc31d3795874325bcb8eaeee395bf32b0648a743ff663dea6f977ab9070e + sha512sums = b46027090fc03f1b6503b4532881dfb49bf69eff342d4eedca6ed8e39f896de0ff8f8c5ae3dc8e9b5645a3dd1029390668a48737ce01d58d1b01b899fad56b4c + sha512sums = c4f36bce601cfc7a88933c480843c945daf0ae71dd07cf261bcd46017b350b9f870c8df5461ee82222e495a118d671b54b510ae42476fc89c38610b2a7c80d8c + sha512sums = 1cf54862db74f928a3a1ad0316b9940b843dbc4cae95bbb3d93ab317d248788cf844103bc006b4670c27b0f13952301b5907476a6c7d13ebb0cb5c0a942d6182 + depends_i686 = gtk2 + depends_i686 = libxml2 + makedepends_i686 = gcc + makedepends_i686 = popt + depends_x86_64 = lib32-gtk2 + depends_x86_64 = lib32-libxml2 + makedepends_x86_64 = gcc-multilib + makedepends_x86_64 = lib32-popt + +pkgname = cnijfilter-e510 + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..eb194c2f2509 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer: Roman Beslik <me@beroal.in.ua> +# Contributor: Behnam Momeni <sbmomeni [at the] gmail [dot] com> + +pkgname=('cnijfilter-e510') +_pkgname=cnijfilter +_model=e510 +_model_dir=403 + +pkgver=3.80 +pkgrel=1 +_pkgreview=2 + +pkgdesc="Canon IJ Printer Driver (For PIXMA E510 series)" +url="https://www.canon-europe.com/support/consumer_products/products/printers/inkjet/other_pixma/pixma_e514.aspx" + +arch=('i686' 'x86_64') +license=('custom') + +makedepends_x86_64=('gcc-multilib' 'lib32-popt') +depends_x86_64=('lib32-gtk2' 'lib32-libxml2') + +makedepends_i686=('gcc' 'popt') +depends_i686=('gtk2' 'libxml2') + +makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make') +depends=("${_pkgname}-common=4.00") + +install=cnijfilter-${_model}.install + +source=("http://gdlp01.c-wss.com/gds/6/0100005266/01/${_pkgname}-source-${pkgver}-${_pkgreview}.tar.gz" + "libpng15.patch" + "cups.patch" + "buildfiles.patch" + "mychanges.patch") +sha512sums=('693dad98b8e69bb4bbad3c62a600b0be5073e8765756cd57722038089387ffe532d01daf5a74d3a8aa93fdc14f7de0326b8aa67acce24d105b0dcb25dfd94be5' + '0d8310867f45721150a870170172d3a0688bfba0267f627a630c105ff965d31f25dbcc31d3795874325bcb8eaeee395bf32b0648a743ff663dea6f977ab9070e' + 'b46027090fc03f1b6503b4532881dfb49bf69eff342d4eedca6ed8e39f896de0ff8f8c5ae3dc8e9b5645a3dd1029390668a48737ce01d58d1b01b899fad56b4c' + 'c4f36bce601cfc7a88933c480843c945daf0ae71dd07cf261bcd46017b350b9f870c8df5461ee82222e495a118d671b54b510ae42476fc89c38610b2a7c80d8c' + '1cf54862db74f928a3a1ad0316b9940b843dbc4cae95bbb3d93ab317d248788cf844103bc006b4670c27b0f13952301b5907476a6c7d13ebb0cb5c0a942d6182') + +prepare() { + cd ${srcdir} + tar xzf ${_pkgname}-source-${pkgver}-${_pkgreview}.tar.gz + cd ${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview} + + patch -p1 -i ${srcdir}/libpng15.patch + patch -p1 -i ${srcdir}/cups.patch + patch -p1 -i ${srcdir}/buildfiles.patch + patch -p1 -i ${srcdir}/mychanges.patch +} + +build() { + cd ${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview} + + export CC="gcc -m32" + make ${_model} +} + +package() { + cd ${srcdir}/cnijfilter-source-${pkgver}-${_pkgreview} + make PACKAGEDIR=${pkgdir} install${_model} + + install -d ${pkgdir}/usr/lib32/bjlib + install -m 644 ${_model_dir}/database/* ${pkgdir}/usr/lib32/bjlib/ + install -s -m 755 ${_model_dir}/libs_bin32/*.so.* ${pkgdir}/usr/lib32/ + + install -D LICENSE-cnijfilter-${pkgver}EN.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-cnijfilter-${pkgver}EN.txt +} diff --git a/buildfiles.patch b/buildfiles.patch new file mode 100644 index 000000000000..e000decce0ee --- /dev/null +++ b/buildfiles.patch @@ -0,0 +1,55 @@ +diff -aur cnijfilter-source-3.20-1/Makefile cnijfilter-source-3.20-1.new/Makefile +--- cnijfilter-source-3.20-1/Makefile 2009-04-06 14:19:22.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/Makefile 2015-06-24 18:40:20.695615264 +0430 +@@ -14,3 +14,12 @@ + install : + target=install; $(scripts) + ++e510 : ++ for dir in "lgmon" "ppd" "cnijfilter" "maintenance" "cngpijmon"; do \ ++ (cd $$dir; ./autogen.sh --prefix=/usr --program-suffix=e510 --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \ ++ done ++ ++installe510 : ++ for dir in "ppd" "cnijfilter" "maintenance" "lgmon" "cngpijmon"; do \ ++ (cd $$dir; make install DESTDIR=${PACKAGEDIR}) || exit 1; \ ++ done +diff -ruN cnijfilter-source-4.00-1.orig/lgmon/configure.in cnijfilter-source-4.00-1/backendnet/configure.in +--- cnijfilter-source-4.00-1.orig/lgmon/configure.in 2013-07-17 06:03:45.000000000 +0430 ++++ cnijfilter-source-4.00-1/lgmon/configure.in 2015-08-04 16:54:42.385652052 +0430 +@@ -43,7 +43,8 @@ + esac + AC_SUBST(CNCL_LIB_ID) + +-ARC=`getconf LONG_BIT` ++#ARC=`getconf LONG_BIT` ++ARC=32 + AC_SUBST(ARC) + + AC_PROG_CC +diff -ruN cnijfilter-source-4.00-1.orig/cnijfilter/configure.in cnijfilter-source-4.00-1/cnijfilter/configure.in +--- cnijfilter-source-4.00-1.orig/cnijfilter/configure.in 2013-07-17 06:03:45.000000000 +0430 ++++ cnijfilter-source-4.00-1/cnijfilter/configure.in 2015-08-04 16:55:56.955652143 +0430 +@@ -43,7 +43,8 @@ + esac + AC_SUBST(CNCL_LIB_ID) + +-ARC=`getconf LONG_BIT` ++#ARC=`getconf LONG_BIT` ++ARC=32 + AC_SUBST(ARC) + + AC_PROG_CC +diff -ruN cnijfilter-source-4.00-1.orig/maintenance/configure.in cnijfilter-source-4.00-1/backendnet/configure.in +--- cnijfilter-source-4.00-1.orig/maintenance/configure.in 2013-07-17 06:03:45.000000000 +0430 ++++ cnijfilter-source-4.00-1/maintenance/configure.in 2015-08-04 16:54:42.385652052 +0430 +@@ -19,7 +19,8 @@ + XML2_CFLAGS=`xml2-config --cflags` + AC_SUBST(XML2_CFLAGS) + +-ARC=`getconf LONG_BIT` ++#ARC=`getconf LONG_BIT` ++ARC=32 + AC_SUBST(ARC) + + AC_OUTPUT([ diff --git a/cnijfilter-e510.install b/cnijfilter-e510.install new file mode 100644 index 000000000000..e7fd3db5dc54 --- /dev/null +++ b/cnijfilter-e510.install @@ -0,0 +1,22 @@ +post_install() { + if [ -x /sbin/ldconfig ]; then + /sbin/ldconfig /usr/lib32 + fi + echo "You need to add the printer by visiting <http://localhost:631/> after starting the cups service." +} +post_upgrade() { + if [ -x /sbin/ldconfig ]; then + /sbin/ldconfig /usr/lib32 + fi +} +post_remove() { + if [ -x /sbin/ldconfig ]; then + /sbin/ldconfig /usr/lib32 + fi + MODELNUM=362 + for LIBS in "libcnbpcmcm" "libcnbpcnclapi" "libcnbpcnclbjcmd" "libcnbpcnclui" "libcnbpess" "libcnbpo"; do + if [ -h /usr/lib32/${LIBS}${MODELNUM}.so ]; then + rm -f /usr/lib32/${LIBS}${MODELNUM}.so + fi + done +} diff --git a/cups.patch b/cups.patch new file mode 100644 index 000000000000..1480fc00e0f6 --- /dev/null +++ b/cups.patch @@ -0,0 +1,35 @@ +diff -Nur cnijfilter-source-3.20-1.orig/backend/src/cnij_backend_common.c cnijfilter-source-3.20-1/backend/src/cnij_backend_common.c +--- cnijfilter-source-3.20-1.orig/backend/src/cnij_backend_common.c 2009-05-27 07:46:41.000000000 +0200 ++++ cnijfilter-source-3.20-1/backend/src/cnij_backend_common.c 2012-08-15 15:28:06.172143834 +0200 +@@ -38,6 +38,7 @@ + // CUPS Header + #include <cups/cups.h> + #include <cups/ipp.h> ++#include <cups/ppd.h> + + // Header file for CANON + #include "cnij_backend_common.h" +diff -Nur cnijfilter-source-3.20-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source-3.20-1/cngpij/cngpij/bjcups.c +--- cnijfilter-source-3.20-1.orig/cngpij/cngpij/bjcups.c 2009-06-11 06:10:32.000000000 +0200 ++++ cnijfilter-source-3.20-1/cngpij/cngpij/bjcups.c 2012-08-15 15:28:06.173143833 +0200 +@@ -21,6 +21,7 @@ + #include <config.h> + #endif // HAVE_CONFIG_H + ++#define _IPP_PRIVATE_STRUCTURES 1 + #include <cups/cups.h> + #include <cups/language.h> + #include <cups/ppd.h> +diff -Nur cnijfilter-source-3.20-1.orig/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.20-1/cngpijmon/src/bjcupsmon_cups.c +--- cnijfilter-source-3.20-1.orig/cngpijmon/src/bjcupsmon_cups.c 2009-04-24 08:12:49.000000000 +0200 ++++ cnijfilter-source-3.20-1/cngpijmon/src/bjcupsmon_cups.c 2012-08-15 15:28:54.618141976 +0200 +@@ -18,8 +18,9 @@ + */ + + /*** Includes ***/ ++#define _IPP_PRIVATE_STRUCTURES 1 + #include <cups/cups.h> + #include <cups/ppd.h> + #include <cups/language.h> + #include <sys/types.h> + #include <unistd.h> diff --git a/libpng15.patch b/libpng15.patch new file mode 100644 index 000000000000..f5b3a1b13db5 --- /dev/null +++ b/libpng15.patch @@ -0,0 +1,23 @@ +diff -aur cnijfilter-source-3.20-1/cnijfilter/src/bjfimage.c cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c +--- cnijfilter-source-3.20-1/cnijfilter/src/bjfimage.c 2009-03-26 06:11:05.000000000 +0100 ++++ cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c 2012-02-10 09:33:52.512334139 +0100 +@@ -1520,8 +1520,8 @@ + short tmpformat; + short retbyte = 0; + short bpp = 3; +- long width = 0; +- long length = 0; ++ png_uint_32 width = 0; ++ png_uint_32 length = 0; + long rstep = 0; + long RasterLength = 0; + long i; +@@ -1574,7 +1574,7 @@ + goto onErr; + } + +- if (setjmp (png_p->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_p))) + { + png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL); + goto onErr; diff --git a/mychanges.patch b/mychanges.patch new file mode 100644 index 000000000000..aff96396724c --- /dev/null +++ b/mychanges.patch @@ -0,0 +1,369 @@ +diff -aur cnijfilter-source-3.20-1/backendnet/backend/cnijnetlm.c cnijfilter-source-3.20-1.new/backendnet/backend/cnijnetlm.c +--- cnijfilter-source-3.20-1/backendnet/backend/cnijnetlm.c 2009-05-21 14:21:18.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/backendnet/backend/cnijnetlm.c 2013-07-26 00:12:36.279988102 +0430 +@@ -256,6 +256,7 @@ + + // waitpid( g_pid, NULL, 0) ; /* child process wait */ + child_pid = wait(&child_status); ++ (void) child_pid; + + if (!WIFEXITED(child_status)){ + return( CANON_STS_NG ) ; +@@ -365,6 +366,10 @@ + fds.events = POLLOUT; + + pollst = poll(&fds, 1, polltime); ++ if (pollst == -1) { ++ goto error; ++ } ++ + + if (fds.revents & POLLOUT){ + fseek(tempfp, read_position, SEEK_SET); +diff -aur cnijfilter-source-3.20-1/backendnet/lmonitor/cnijnetchk.c cnijfilter-source-3.20-1.new/backendnet/lmonitor/cnijnetchk.c +--- cnijfilter-source-3.20-1/backendnet/lmonitor/cnijnetchk.c 2009-06-08 15:19:07.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/backendnet/lmonitor/cnijnetchk.c 2013-07-26 00:12:36.283321388 +0430 +@@ -288,7 +290,7 @@ + bufsize = (src[0] << 8) + src[1]; + buf = (char*)&(src[2]); + +- len = strlen(buf); ++ len = strnlen(buf, bufsize); + if (len > 1023) len = 1023; + + keylen = strlen(key); +diff -aur cnijfilter-source-3.20-1/backendnet/lmonitor/cnijnetprn.c cnijfilter-source-3.20-1.new/backendnet/lmonitor/cnijnetprn.c +--- cnijfilter-source-3.20-1/backendnet/lmonitor/cnijnetprn.c 2009-06-15 11:39:28.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/backendnet/lmonitor/cnijnetprn.c 2013-07-26 00:12:36.283321388 +0430 +@@ -255,6 +256,8 @@ + if (CNNL_Config(hnd, CNNL_CONFIG_SET_VERSION, &latest_version, ¶m_size) != CNNL_RET_SUCCESS){ + goto error_open; + } ++ ++ goto find_printer; + + find_printer: + /* --------------------------------------------------------------------- +@@ -652,7 +655,7 @@ + unsigned long d_time; + fd_set fds; + struct timeval timeout; +- int errorcount=0; ++// int errorcount=0; + + while (!(mode & CNNL_JOB_CANCELLED)){ + timeout.tv_sec = 3; +@@ -677,7 +680,7 @@ + mode |= CNNL_JOB_ERROR; + return 0; + } else { +- errorcount=0; ++// errorcount=0; + } + } + } +diff -aur cnijfilter-source-3.20-1/cngpij/cngpij/getipc.c cnijfilter-source-3.20-1.new/cngpij/cngpij/getipc.c +--- cnijfilter-source-3.20-1/cngpij/cngpij/getipc.c 2009-04-23 14:26:50.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/cngpij/cngpij/getipc.c 2013-07-26 00:12:36.283321388 +0430 +@@ -61,12 +61,18 @@ + + while( (client_fd = accept(server_fd, (struct sockaddr *)&sun, &len)) >= 0 ) + { ++#define READ_FD_AND_BREAK_UPON_ERROR(FD, BUF, LEN) \ ++ if ( read(FD, BUF, LEN) == -1 ) \ ++ { \ ++ ret = RET_ERROR; \ ++ break; \ ++ } + /* read command first */ +- read(client_fd, buf, IPCCMDLEN); ++ READ_FD_AND_BREAK_UPON_ERROR(client_fd, buf, IPCCMDLEN); + + if( strcmp(buf, "PRINT") == 0 ) + { /* PRINT command */ +- read(client_fd, pipc, sizeof(IPCU)); ++ READ_FD_AND_BREAK_UPON_ERROR(client_fd, pipc, sizeof(IPCU)); + close(client_fd); + ret = RET_PRINT; + break; +@@ -79,28 +85,28 @@ + } + else if( strcmp(buf, "PDATA") == 0 ) + { /* PDATA command (for maintenance) */ +- read(client_fd, pipc, sizeof(IPCU)); ++ READ_FD_AND_BREAK_UPON_ERROR(client_fd, pipc, sizeof(IPCU)); + close(client_fd); + ret = RET_PDATA; + break; + } + else if( strcmp(buf, "POWEROFF") == 0 ) + { /* POWEROFF (for maintenance. added in 09_2h) */ +- read(client_fd, pipc, sizeof(IPCU)); ++ READ_FD_AND_BREAK_UPON_ERROR(client_fd, pipc, sizeof(IPCU)); + close(client_fd); + ret = RET_POWEROFF; + break; + } + else if( strcmp(buf, "FDATA") == 0 ) + { /* FDATA command (for maintenance) */ +- read(client_fd, pipc, sizeof(IPCU)); ++ READ_FD_AND_BREAK_UPON_ERROR(client_fd, pipc, sizeof(IPCU)); + close(client_fd); + ret = RET_FDATA; + break; + } + else if( strcmp(buf, "WDATA") == 0 ) + { /* WDATA command (for maintenance) */ +- read(client_fd, pipc, sizeof(IPCU)); ++ READ_FD_AND_BREAK_UPON_ERROR(client_fd, pipc, sizeof(IPCU)); + close(client_fd); + ret = RET_WDATA; + break; +diff -aur cnijfilter-source-3.20-1/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c cnijfilter-source-3.20-1.new/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c +--- cnijfilter-source-3.20-1/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c 2009-06-08 11:42:52.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c 2015-06-24 19:26:47.455618449 +0430 +@@ -35,6 +35,7 @@ + #include <net/if.h> + #include <sys/sysctl.h> + #include <config.h> + #include <fcntl.h> ++#include <unistd.h> + + #include <dlfcn.h> + #include "cncl.h" +@@ -85,7 +86,7 @@ + /* argv[6]: modelID */ + /* */ + /**********************************************/ +-int main (int argc, const char **argv) ++int main (int argc, char *argv[]) + { + int fd; + int rtn = 0 ; +diff -aur cnijfilter-source-3.20-1/cnijfilter/src/getipc.c cnijfilter-source-3.20-1.new/cnijfilter/src/getipc.c +--- cnijfilter-source-3.20-1/cnijfilter/src/getipc.c 2009-03-26 09:41:05.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/cnijfilter/src/getipc.c 2013-07-26 00:12:36.286654674 +0430 +@@ -63,12 +63,19 @@ + if (listen(s, 5)) + return RET_ERROR; + +- while ((c = accept(s, (struct sockaddr *)&sun, &adrlen)) >= 0) { ++ while ((c = accept(s, (struct sockaddr *)&sun, &adrlen)) >= 0) ++ { ++#define READ_FD_AND_BREAK_UPON_ERROR(FD, BUF, LEN) \ ++ if ( read(FD, BUF, LEN) == -1 ) \ ++ { \ ++ ret = RET_ERROR; \ ++ break; \ ++ } + /* read command first */ +- read(c, buf, IPCCMDLEN); ++ READ_FD_AND_BREAK_UPON_ERROR(c, buf, IPCCMDLEN); + + if (strcmp(buf, "PRINT") == 0) { /* PRINT command */ +- read(c, pipc, sizeof(IPCU)); ++ READ_FD_AND_BREAK_UPON_ERROR(c, pipc, sizeof(IPCU)); + close(c); + ret = RET_PRINT; + break; +@@ -79,13 +86,13 @@ + break; + } + else if (strcmp(buf, "PDATA") == 0) { /* PDATA command (for maintenance) */ +- read(c, pipc, sizeof(IPCU)); ++ READ_FD_AND_BREAK_UPON_ERROR(c, pipc, sizeof(IPCU)); + close(c); + ret = RET_PDATA; + break; + } + else if (strcmp(buf, "FDATA") == 0) { /* FDATA command (to print testpattern) */ +- read(c, pipc, sizeof(IPCU)); ++ READ_FD_AND_BREAK_UPON_ERROR(c, pipc, sizeof(IPCU)); + close(c); + ret = RET_FDATA; + break; +diff -aur cnijfilter-source-3.20-1/lgmon/src/560ifunc.c cnijfilter-source-3.20-1.new/lgmon/src/560ifunc.c +--- cnijfilter-source-3.20-1/lgmon/src/560ifunc.c 2009-04-24 10:49:35.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/560ifunc.c 2013-07-26 00:12:36.286654674 +0430 +@@ -103,7 +103,7 @@ + } + + } +- return(OK); ++ return ret; + } + + +diff -aur cnijfilter-source-3.20-1/lgmon/src/850ifunc.c cnijfilter-source-3.20-1.new/lgmon/src/850ifunc.c +--- cnijfilter-source-3.20-1/lgmon/src/850ifunc.c 2009-04-24 10:49:35.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/850ifunc.c 2013-07-26 00:12:36.286654674 +0430 +@@ -103,7 +103,7 @@ + } + + } +- return(OK); ++ return ret; + } + + +diff -aur cnijfilter-source-3.20-1/lgmon/src/860ifunc.c cnijfilter-source-3.20-1.new/lgmon/src/860ifunc.c +--- cnijfilter-source-3.20-1/lgmon/src/860ifunc.c 2009-04-24 10:49:35.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/860ifunc.c 2013-07-26 00:12:36.286654674 +0430 +@@ -103,7 +103,7 @@ + } + + } +- return(OK); ++ return ret; + } + + +diff -aur cnijfilter-source-3.20-1/lgmon/src/950ifunc.c cnijfilter-source-3.20-1.new/lgmon/src/950ifunc.c +--- cnijfilter-source-3.20-1/lgmon/src/950ifunc.c 2009-04-24 10:49:35.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/950ifunc.c 2013-07-26 00:12:36.286654674 +0430 +@@ -145,7 +145,7 @@ + } + + } +- return(OK); ++ return ret; + } + + +diff -aur cnijfilter-source-3.20-1/lgmon/src/990ifunc.c cnijfilter-source-3.20-1.new/lgmon/src/990ifunc.c +--- cnijfilter-source-3.20-1/lgmon/src/990ifunc.c 2009-04-24 10:49:35.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/990ifunc.c 2013-07-26 00:12:36.286654674 +0430 +@@ -145,7 +145,7 @@ + } + + } +- return(OK); ++ return ret; + } + + +diff -aur cnijfilter-source-3.20-1/lgmon/src/ip3100func.c cnijfilter-source-3.20-1.new/lgmon/src/ip3100func.c +--- cnijfilter-source-3.20-1/lgmon/src/ip3100func.c 2009-04-24 10:49:35.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/ip3100func.c 2013-07-26 00:12:36.289987934 +0430 +@@ -103,7 +103,7 @@ + } + + } +- return(OK); ++ return ret; + } + + +diff -aur cnijfilter-source-3.20-1/lgmon/src/ip4100func.c cnijfilter-source-3.20-1.new/lgmon/src/ip4100func.c +--- cnijfilter-source-3.20-1/lgmon/src/ip4100func.c 2009-04-24 10:49:35.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/ip4100func.c 2013-07-26 00:12:36.289987934 +0430 +@@ -103,7 +103,7 @@ + } + + } +- return(OK); ++ return ret; + } + + +diff -aur cnijfilter-source-3.20-1/lgmon/src/ip8600func.c cnijfilter-source-3.20-1.new/lgmon/src/ip8600func.c +--- cnijfilter-source-3.20-1/lgmon/src/ip8600func.c 2009-04-24 10:49:35.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/ip8600func.c 2013-07-26 00:12:36.289987934 +0430 +@@ -145,7 +145,7 @@ + } + + } +- return(OK); ++ return ret; + } + + +diff -aur cnijfilter-source-3.20-1/lgmon/src/langmon.c cnijfilter-source-3.20-1.new/lgmon/src/langmon.c +--- cnijfilter-source-3.20-1/lgmon/src/langmon.c 2009-05-01 05:29:17.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/langmon.c 2013-07-26 00:12:36.289987934 +0430 +@@ -255,7 +259,7 @@ + + static int print_normal() + { +- int error = 0; ++// int error = 0; + int r_size; + int w_size; + char *buf; +@@ -274,7 +279,7 @@ + w_size = write(PRNT_PATH, ptr, r_size); + if(w_size < 0){ + /* write error */ +- error = -1; ++// error = -1; + goto print_normal_exit; + } + ptr += w_size; +diff -aur cnijfilter-source-3.20-1/lgmon/src/lm_print.c cnijfilter-source-3.20-1.new/lgmon/src/lm_print.c +--- cnijfilter-source-3.20-1/lgmon/src/lm_print.c 2009-05-18 09:44:51.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/lm_print.c 2013-07-26 00:12:36.289987934 +0430 +@@ -245,13 +245,17 @@ + ptr = buf; + /* data print(output) loop */ + for(;r_size > 0;r_size -= w_size){ ++#ifdef DEBUG + int err; ++#endif + + signal_block(sigmask); /* signal block */ + get_printer_sem(sem_id); /* printer lock */ + + w_size = p_dvacs->ptdev_write(dev_path, ptr, r_size); /* data write -> printer */ ++#ifdef DEBUG + err = errno; ++#endif + #ifdef DATA_LOG + if(log_hand >=0 && w_size > 0) + write(log_hand, ptr, w_size); +diff -aur cnijfilter-source-3.20-1/lgmon/src/lm_status.c cnijfilter-source-3.20-1.new/lgmon/src/lm_status.c +--- cnijfilter-source-3.20-1/lgmon/src/lm_status.c 2009-07-28 12:46:33.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/lm_status.c 2013-07-26 00:12:36.289987934 +0430 +@@ -445,7 +445,9 @@ + int dev_path = PRNT_PATH; + short cnclerr = -1; + char *cmd_wrbuf = NULL; ++#ifdef DEBUG + short i=0; ++#endif + + /* write command buffer */ + cmd_wrbuf = (char *)malloc(MAX_STATBUF); /* 4096 */ +@@ -506,7 +508,9 @@ + + /* wait "CNCL_CHECK_START2:response" */ + cnclerr = -1; ++#ifdef DEBUG + i = 0; ++#endif + while( cnclerr != CNCL_OK ){ + #ifdef DEBUG + fprintf(log_path, "CNCL_CHECK_START2:response @ i : %d\n",i); +diff -aur cnijfilter-source-3.20-1/lgmon/src/lm_sub.c cnijfilter-source-3.20-1.new/lgmon/src/lm_sub.c +--- cnijfilter-source-3.20-1/lgmon/src/lm_sub.c 2009-07-28 12:46:33.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/lgmon/src/lm_sub.c 2013-07-26 00:12:36.289987934 +0430 +@@ -788,7 +788,8 @@ + //fflush(log_path); + #endif + if( ret3 == CNCL_OK ){ +- memset( buf, 0, sizeof(buf) ); ++// memset( buf, 0, sizeof(buf) ); ++ memset( buf, 0, MAX_STATBUF ); + memcpy( &buf[0], &buf2[0], MAX_STATBUF ); + } + else +diff -aur cnijfilter-source-3.20-1/pstocanonij/filter/pstocanonij.c cnijfilter-source-3.20-1.new/pstocanonij/filter/pstocanonij.c +--- cnijfilter-source-3.20-1/pstocanonij/filter/pstocanonij.c 2009-04-23 14:29:38.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/pstocanonij/filter/pstocanonij.c 2013-07-26 00:12:36.296654567 +0430 +@@ -1198,6 +1198,7 @@ + close(fds[0]); + } + } ++ (void) status; + return child_pid; + } + |