diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-20 07:26:13 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-20 07:26:13 +0000 |
| commit | 88f9aafc49f9c4feb55d1d10daa0e494c22946fc (patch) | |
| tree | b0084d66ec8925e4e7e04714ce2f59459413be93 /ppdc/ppdmerge.cxx | |
| parent | 321d8d57dacf00e4ae19558dc9444519f4d9ade1 (diff) | |
Merge changes from CUPS 1.5b1-r9798.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3275 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'ppdc/ppdmerge.cxx')
| -rw-r--r-- | ppdc/ppdmerge.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx index 923355c09..68f291673 100644 --- a/ppdc/ppdmerge.cxx +++ b/ppdc/ppdmerge.cxx @@ -104,18 +104,18 @@ main(int argc, // I - Number of command-line arguments ppd_status_t status; // PPD open status int curline, // Current line linenum; // Line number - - + + status = ppdLastError(&linenum); - + _cupsLangPrintf(stderr, _("%s: Unable to open PPD file: %s on line %d."), "ppdmerge", ppdErrorString(status), linenum); cupsFileRewind(infile); - + line[0] = '\0'; curline = 0; - + while (cupsFileGets(infile, line, sizeof(line))) { curline ++; @@ -128,7 +128,7 @@ main(int argc, // I - Number of command-line arguments cupsFileClose(infile); return (1); } - + // Figure out the locale... if ((locale = ppd_locale(ppd)) == NULL) { @@ -147,13 +147,13 @@ main(int argc, // I - Number of command-line arguments languages = _ppdGetLanguages(ppd); if (outname && !strcmp(inname, outname)) - { + { // Rename input filename so that we don't overwrite it... char bckname[1024]; // Backup filename - - + + snprintf(bckname, sizeof(bckname), "%s.bck", inname); - + if (rename(inname, bckname)) { _cupsLangPrintf(stderr, @@ -177,7 +177,7 @@ main(int argc, // I - Number of command-line arguments argv[i]); ppdClose(ppd); } - + // Close and move on... cupsFileClose(infile); } @@ -341,7 +341,7 @@ ppd_locale(ppd_file_t *ppd) // I - PPD file { vlen = strlen(languages[i].version); - if (!strncasecmp(ppd->lang_version, languages[i].version, vlen)) + if (!_cups_strncasecmp(ppd->lang_version, languages[i].version, vlen)) { if (ppd->lang_version[vlen] == '-' || ppd->lang_version[vlen] == '_') |