summarylogtreecommitdiffstats
path: root/mychanges.patch
diff options
context:
space:
mode:
authorBehnam Momeni2016-05-09 22:33:43 +0430
committerBehnam Momeni2016-05-09 22:33:43 +0430
commit39ce8638a5f46e3573293e54919a46a9614acfaa (patch)
tree4fd984de289fa390bc6c51ab33d06ef724a63026 /mychanges.patch
parent16e0934de0de77ca426d72a3ff2acdfec2aec521 (diff)
downloadaur-39ce8638a5f46e3573293e54919a46a9614acfaa.tar.gz
Updating to upstream version 4.10
Diffstat (limited to 'mychanges.patch')
-rw-r--r--mychanges.patch120
1 files changed, 54 insertions, 66 deletions
diff --git a/mychanges.patch b/mychanges.patch
index 87787043b64..c3d639e0e2e 100644
--- a/mychanges.patch
+++ b/mychanges.patch
@@ -1,7 +1,7 @@
-diff -ruN cnijfilter-source-4.00-1.orig/backendnet/backend/cnijnetlm.c cnijfilter-source-4.00-1/backendnet/backend/cnijnetlm.c
---- cnijfilter-source-4.00-1.orig/backendnet/backend/cnijnetlm.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/backendnet/backend/cnijnetlm.c 2015-08-04 22:09:45.049007011 +0430
-@@ -253,6 +253,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/backendnet/backend/cnijnetlm.c cnijfilter-source-4.10-1/backendnet/backend/cnijnetlm.c
+--- cnijfilter-source-4.10-1.orig/backendnet/backend/cnijnetlm.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/backendnet/backend/cnijnetlm.c 2016-05-09 20:25:06.263287197 +0430
+@@ -252,6 +252,7 @@
// waitpid( g_pid, NULL, 0) ; /* child process wait */
child_pid = wait(&child_status);
@@ -9,7 +9,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/backendnet/backend/cnijnetlm.c cnijfilte
if (!WIFEXITED(child_status)){
return( CANON_STS_NG ) ;
-@@ -362,6 +363,9 @@
+@@ -361,6 +362,9 @@
fds.events = POLLOUT;
pollst = poll(&fds, 1, polltime);
@@ -19,10 +19,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/backendnet/backend/cnijnetlm.c cnijfilte
if (fds.revents & POLLOUT){
fseek(tempfp, read_position, SEEK_SET);
-diff -ruN cnijfilter-source-4.00-1.orig/backendnet/lmonitor/cnijnetchk.c cnijfilter-source-4.00-1/backendnet/lmonitor/cnijnetchk.c
---- cnijfilter-source-4.00-1.orig/backendnet/lmonitor/cnijnetchk.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/backendnet/lmonitor/cnijnetchk.c 2015-08-04 22:15:53.849007431 +0430
-@@ -338,7 +338,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/backendnet/lmonitor/cnijnetchk.c cnijfilter-source-4.10-1/backendnet/lmonitor/cnijnetchk.c
+--- cnijfilter-source-4.10-1.orig/backendnet/lmonitor/cnijnetchk.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/backendnet/lmonitor/cnijnetchk.c 2016-05-09 20:25:06.263287197 +0430
+@@ -337,7 +337,7 @@
bufsize = (src[0] << 8) + src[1];
buf = (char*)&(src[2]);
@@ -31,10 +31,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/backendnet/lmonitor/cnijnetchk.c cnijfil
if (len > 1023) len = 1023;
keylen = strlen(key);
-diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/langmon.c cnijfilter-source-4.00-1/bscc2sts/src/langmon.c
---- cnijfilter-source-4.00-1.orig/bscc2sts/src/langmon.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/bscc2sts/src/langmon.c 2015-08-04 22:55:11.575676795 +0430
-@@ -259,7 +259,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/bscc2sts/src/langmon.c cnijfilter-source-4.10-1/bscc2sts/src/langmon.c
+--- cnijfilter-source-4.10-1.orig/bscc2sts/src/langmon.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/bscc2sts/src/langmon.c 2016-05-09 20:25:06.263287197 +0430
+@@ -258,7 +258,7 @@
static int print_normal()
{
@@ -43,7 +43,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/langmon.c cnijfilter-source
int r_size;
int w_size;
char *buf;
-@@ -275,7 +275,7 @@
+@@ -274,7 +274,7 @@
w_size = write(PRNT_PATH, ptr, r_size);
if(w_size < 0){
/* write error */
@@ -52,10 +52,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/langmon.c cnijfilter-source
goto print_normal_exit;
}
ptr += w_size;
-diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_print.c cnijfilter-source-4.00-1/bscc2sts/src/lm_print.c
---- cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_print.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/bscc2sts/src/lm_print.c 2015-08-05 01:20:39.122353444 +0430
-@@ -245,13 +245,17 @@
+diff -ruN cnijfilter-source-4.10-1.orig/bscc2sts/src/lm_print.c cnijfilter-source-4.10-1/bscc2sts/src/lm_print.c
+--- cnijfilter-source-4.10-1.orig/bscc2sts/src/lm_print.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/bscc2sts/src/lm_print.c 2016-05-09 20:25:06.266620531 +0430
+@@ -244,13 +244,17 @@
ptr = buf;
/* data print(output) loop */
for(;r_size > 0;r_size -= w_size){
@@ -73,10 +73,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_print.c cnijfilter-sourc
#ifdef DATA_LOG
if(log_hand >=0 && w_size > 0)
write(log_hand, ptr, w_size);
-diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_status.c cnijfilter-source-4.00-1/bscc2sts/src/lm_status.c
---- cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_status.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/bscc2sts/src/lm_status.c 2015-08-05 01:17:11.799019876 +0430
-@@ -517,7 +517,9 @@
+diff -ruN cnijfilter-source-4.10-1.orig/bscc2sts/src/lm_status.c cnijfilter-source-4.10-1/bscc2sts/src/lm_status.c
+--- cnijfilter-source-4.10-1.orig/bscc2sts/src/lm_status.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/bscc2sts/src/lm_status.c 2016-05-09 20:25:06.266620531 +0430
+@@ -516,7 +516,9 @@
int dev_path = PRNT_PATH;
short cnclerr = -1;
char *cmd_wrbuf = NULL;
@@ -86,7 +86,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_status.c cnijfilter-sour
/* write command buffer */
cmd_wrbuf = (char *)malloc(MAX_STATBUF); /* 4096 */
-@@ -580,7 +582,9 @@
+@@ -579,7 +581,9 @@
/* wait "CNCL_CHECK_START2:response" */
cnclerr = -1;
@@ -96,10 +96,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_status.c cnijfilter-sour
while( cnclerr != CNCL_OK ){
#ifdef DEBUG
fprintf(log_path, "CNCL_CHECK_START2:response @ i : %d\n",i);
-diff -ruN cnijfilter-source-4.00-1.orig/cngpij/cngpij/getipc.c cnijfilter-source-4.00-1/cngpij/cngpij/getipc.c
---- cnijfilter-source-4.00-1.orig/cngpij/cngpij/getipc.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/cngpij/cngpij/getipc.c 2015-08-04 22:42:47.449009279 +0430
-@@ -61,59 +61,57 @@
+diff -ruN cnijfilter-source-4.10-1.orig/cngpij/cngpij/getipc.c cnijfilter-source-4.10-1/cngpij/cngpij/getipc.c
+--- cnijfilter-source-4.10-1.orig/cngpij/cngpij/getipc.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/cngpij/cngpij/getipc.c 2016-05-09 20:25:06.266620531 +0430
+@@ -60,59 +60,57 @@
while( (client_fd = accept(server_fd, (struct sockaddr *)&sun, &len)) >= 0 )
{
@@ -171,7 +171,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/cngpij/cngpij/getipc.c cnijfilter-source
ret = RET_ERROR;
break;
}
-@@ -121,6 +120,8 @@
+@@ -120,6 +118,8 @@
if(client_fd < 0)
return RET_ERROR;
@@ -180,10 +180,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/cngpij/cngpij/getipc.c cnijfilter-source
close(server_fd);
unlink(sname);
-diff -ruN cnijfilter-source-4.00-1.orig/cngpijmnt/src/getipc.c cnijfilter-source-4.00-1/cngpijmnt/src/getipc.c
---- cnijfilter-source-4.00-1.orig/cngpijmnt/src/getipc.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/cngpijmnt/src/getipc.c 2015-08-04 22:50:03.965676444 +0430
-@@ -63,59 +63,57 @@
+diff -ruN cnijfilter-source-4.10-1.orig/cngpijmnt/src/getipc.c cnijfilter-source-4.10-1/cngpijmnt/src/getipc.c
+--- cnijfilter-source-4.10-1.orig/cngpijmnt/src/getipc.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/cngpijmnt/src/getipc.c 2016-05-09 20:25:06.266620531 +0430
+@@ -62,59 +62,57 @@
while( (client_fd = accept(server_fd, (struct sockaddr *)&sun, &len)) >= 0 )
{
@@ -255,7 +255,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/cngpijmnt/src/getipc.c cnijfilter-source
ret = RET_ERROR;
break;
}
-@@ -123,6 +121,8 @@
+@@ -122,6 +120,8 @@
if(client_fd < 0)
return RET_ERROR;
@@ -264,10 +264,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/cngpijmnt/src/getipc.c cnijfilter-source
close(server_fd);
unlink(sname);
-diff -ruN cnijfilter-source-4.00-1.orig/cnijnpr/src/cnijnpr.c cnijfilter-source-4.00-1/cnijnpr/src/cnijnpr.c
---- cnijfilter-source-4.00-1.orig/cnijnpr/src/cnijnpr.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/cnijnpr/src/cnijnpr.c 2015-08-04 23:39:02.832346470 +0430
-@@ -36,6 +36,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/cnijnpr/src/cnijnpr.c cnijfilter-source-4.10-1/cnijnpr/src/cnijnpr.c
+--- cnijfilter-source-4.10-1.orig/cnijnpr/src/cnijnpr.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/cnijnpr/src/cnijnpr.c 2016-05-09 20:25:06.266620531 +0430
+@@ -35,6 +35,7 @@
#include <sys/sysctl.h>
#include <config.h>
#include <fcntl.h>
@@ -275,49 +275,37 @@ diff -ruN cnijfilter-source-4.00-1.orig/cnijnpr/src/cnijnpr.c cnijfilter-source-
#include <dlfcn.h>
#include "cncl.h"
-@@ -97,7 +98,7 @@
- /* argv[8]: /dev/usb/lp0 */
- /* */
+@@ -96,7 +97,7 @@
+ /* argv[8]: /dev/usb/lp0 */
+ /* */
/**********************************************/
-int main (int argc, const char **argv)
+int main (int argc, const char *argv[])
{
int fd;
int rtn = 0 ;
-@@ -584,7 +585,7 @@
+@@ -583,7 +584,7 @@
/************************************************/
- /* get_printer_devid */
+ /* get_printer_devid */
/************************************************/
-static int get_printer_devid(fdusb)
+static int get_printer_devid(int fdusb)
{
char devid[1024];
char *ivec = NULL;
-diff -ruN cnijfilter-source-4.00-1.orig/lgmon2/src/cnijifusb.c cnijfilter-source-4.00-1/lgmon2/src/cnijifusb.c
---- cnijfilter-source-4.00-1.orig/lgmon2/src/cnijifusb.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/lgmon2/src/cnijifusb.c 2015-08-04 23:50:15.772347241 +0430
-@@ -651,7 +651,7 @@
- fprintf(stderr, "DEBUG: get_serialNum = %s, know serialnum = %s\n", tmp_serial, serial);
- #endif
-
-- if(strncmp(tmp_serial, serial, sizeof(serial))){
-+ if(strncmp(tmp_serial, serial, sizeof(tmp_serial))){
- return CN_USB_WRITE_ERROR;
- }
- #ifdef _DEBUG_MODE_
-diff -ruN cnijfilter-source-4.00-1.orig/pstocanonij/filter/pstocanonij.c cnijfilter-source-4.00-1/pstocanonij/filter/pstocanonij.c
---- cnijfilter-source-4.00-1.orig/pstocanonij/filter/pstocanonij.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/pstocanonij/filter/pstocanonij.c 2015-08-04 23:58:38.662347818 +0430
-@@ -388,7 +388,7 @@
- {
- if( !IS_BLANK(*p_code) )
- break;
+diff -ruN cnijfilter-source-4.10-1.orig/pstocanonij/filter/pstocanonij.c cnijfilter-source-4.10-1/pstocanonij/filter/pstocanonij.c
+--- cnijfilter-source-4.10-1.orig/pstocanonij/filter/pstocanonij.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/pstocanonij/filter/pstocanonij.c 2016-05-09 20:25:06.269953863 +0430
+@@ -387,7 +387,7 @@
+ {
+ if( !IS_BLANK(*p_code) )
+ break;
- *p_code++;
+ p_code++;
- }
- while( *p_code != '\0' )
- {
-@@ -1323,7 +1323,7 @@
+ }
+ while( *p_code != '\0' )
+ {
+@@ -1322,7 +1322,7 @@
int exec_filter(char *cmd_buf, int ofd, int fds[2])
{
@@ -326,7 +314,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/pstocanonij/filter/pstocanonij.c cnijfil
int child_pid = -1;
char *filter_param[4];
char shell_buf[256];
-@@ -1363,7 +1363,7 @@
+@@ -1362,7 +1362,7 @@
execv(shell_buf, filter_param);
fprintf(stderr, "execl() error\n");