Skip to content

Commit da0ff58

Browse files
committed
Fix get_options regression (Issue #1532)
1 parent 41cde2a commit da0ff58

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

scheduler/job.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4120,7 +4120,7 @@ get_options(cupsd_job_t *job, /* I - Job */
41204120
case IPP_TAG_CHARSET :
41214121
case IPP_TAG_LANGUAGE :
41224122
case IPP_TAG_URI :
4123-
for (valptr = attr->values[i].string.text; *valptr;)
4123+
for (valptr = attr->values[i].string.text; *valptr; valptr ++)
41244124
{
41254125
/*
41264126
* Convert tabs and newlines to spaces, filter out control chars,
@@ -4135,7 +4135,7 @@ get_options(cupsd_job_t *job, /* I - Job */
41354135
{
41364136
if (strchr("\\\'\"", *valptr))
41374137
*optptr++ = '\\';
4138-
*optptr++ = *valptr++;
4138+
*optptr++ = *valptr;
41394139
}
41404140
}
41414141

test/5.5-lp.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Test the lp command.
44
#
5-
# Copyright © 2020-2024 by OpenPrinting.
5+
# Copyright © 2020-2026 by OpenPrinting.
66
# Copyright © 2007-2019 by Apple Inc.
77
# Copyright © 1997-2005 by Easy Software Products, all rights reserved.
88
#
@@ -72,8 +72,8 @@ echo ""
7272

7373
echo "LP Flood Test ($1 times in parallel)"
7474
echo ""
75-
echo " lp -d Test1 testfile.jpg"
76-
echo " lp -d Test2 testfile.jpg"
75+
echo " lp -d Test1 -t 'Flood Test N' testfile.jpg"
76+
echo " lp -d Test2 -t 'Flood Test N' testfile.jpg"
7777
i=0
7878
pids=""
7979
while test $i -lt $1; do
@@ -83,9 +83,9 @@ while test $i -lt $1; do
8383
j=`expr $j + 1`
8484
done
8585

86-
$runcups $VALGRIND ../systemv/lp -d Test1 ../examples/testfile.jpg 2>&1 &
86+
$runcups $VALGRIND ../systemv/lp -d Test1 -t "Flood Test $j" ../examples/testfile.jpg 2>&1 &
8787
pids="$pids $!"
88-
$runcups $VALGRIND ../systemv/lp -d Test2 ../examples/testfile.jpg 2>&1 &
88+
$runcups $VALGRIND ../systemv/lp -d Test2 -t "Flood Test $j" ../examples/testfile.jpg 2>&1 &
8989
pids="$pids $!"
9090

9191
i=`expr $i + 1`

0 commit comments

Comments
 (0)