diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-08-04 21:07:04 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-08-04 21:07:04 +0000 |
| commit | ee571f261ae1551ae79bde94fa913835bf8462da (patch) | |
| tree | fb7cec7ebf3b5db0d1d6f7bc256c7576801e603e /cups/options.c | |
| parent | 749b1e90a80fd8245f9cb84d2f78ab65034eeb81 (diff) | |
| download | cups-ee571f261ae1551ae79bde94fa913835bf8462da.tar.gz | |
Merge easysw-1.4svn-r7834
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@905 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/options.c')
| -rw-r--r-- | cups/options.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/cups/options.c b/cups/options.c index f1f36df26..d7be9fe2f 100644 --- a/cups/options.c +++ b/cups/options.c @@ -225,7 +225,22 @@ cupsParseOptions( return (num_options); } - ptr = copyarg; + if (*copyarg == '{') + { + /* + * Remove surrounding {} so we can parse "{name=value ... name=value}"... + */ + + if ((ptr = copyarg + strlen(copyarg) - 1) > copyarg && *ptr == '}') + { + *ptr = '\0'; + ptr = copyarg + 1; + } + else + ptr = copyarg; + } + else + ptr = copyarg; /* * Skip leading spaces... |