diff options
| -rw-r--r-- | source3/lib/util_str.c | 3 | ||||
| -rw-r--r-- | source3/printing/printing.c | 24 |
2 files changed, 14 insertions, 13 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index dad0e85477..5935533cee 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -998,7 +998,7 @@ enough room! This routine looks for pattern in s and replaces it with insert. It may do multiple replacements. -any of " ; or ` in the insert string are replaced with _ +any of " ; ' or ` in the insert string are replaced with _ ****************************************************************************/ void string_sub(char *s,const char *pattern,const char *insert) { @@ -1019,6 +1019,7 @@ void string_sub(char *s,const char *pattern,const char *insert) switch (insert[i]) { case '`': case '"': + case '\'': case ';': p[i] = '_'; break; diff --git a/source3/printing/printing.c b/source3/printing/printing.c index dfb87dc6fa..87be54618b 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -411,8 +411,8 @@ static BOOL parse_lpq_aix(char *line,print_queue_struct *buf,BOOL first) /* handle the case of "(standard input)" as a filename */ string_sub(line,"standard input","STDIN"); - string_sub(line,"(","\""); - string_sub(line,")","\""); + all_string_sub(line,"(","\""); + all_string_sub(line,")","\""); for (count=0; count<10 && @@ -528,8 +528,8 @@ static BOOL parse_lpq_hpux(char * line, print_queue_struct *buf, BOOL first) if (!header_line_ok) return (False); /* incorrect header line */ /* handle the case of "(standard input)" as a filename */ string_sub(line,"standard input","STDIN"); - string_sub(line,"(","\""); - string_sub(line,")","\""); + all_string_sub(line,"(","\""); + all_string_sub(line,")","\""); for (count=0; count<2 && next_token(&line,tok[count],NULL,sizeof(tok[count])); count++) ; /* we must get 2 tokens */ @@ -666,18 +666,18 @@ static BOOL parse_lpq_qnx(char *line,print_queue_struct *buf,BOOL first) fstring tok[7]; int count=0; - DEBUG(0,("antes [%s]\n", line)); + DEBUG(4,("antes [%s]\n", line)); /* handle the case of "-- standard input --" as a filename */ string_sub(line,"standard input","STDIN"); - DEBUG(0,("despues [%s]\n", line)); - string_sub(line,"-- ","\""); - string_sub(line," --","\""); - DEBUG(0,("despues 1 [%s]\n", line)); + DEBUG(4,("despues [%s]\n", line)); + all_string_sub(line,"-- ","\""); + all_string_sub(line," --","\""); + DEBUG(4,("despues 1 [%s]\n", line)); string_sub(line,"[job #",""); string_sub(line,"]",""); - DEBUG(0,("despues 2 [%s]\n", line)); + DEBUG(4,("despues 2 [%s]\n", line)); @@ -733,8 +733,8 @@ static BOOL parse_lpq_plp(char *line,print_queue_struct *buf,BOOL first) /* handle the case of "(standard input)" as a filename */ string_sub(line,"stdin","STDIN"); - string_sub(line,"(","\""); - string_sub(line,")","\""); + all_string_sub(line,"(","\""); + all_string_sub(line,")","\""); for (count=0; count<11 && next_token(&line,tok[count],NULL,sizeof(tok[count])); count++) ; |