summaryrefslogtreecommitdiff
path: root/ppdc
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2018-12-10 09:18:43 -0500
committerMichael R Sweet <michael.r.sweet@gmail.com>2018-12-10 09:18:43 -0500
commit70bdce1628110ad9313cf7ca7e0c0fdf19585f82 (patch)
treec2969bcedd2a3a02a7bf8e93e57e2d02b76a7865 /ppdc
parent8a763079f573af50413f90667e0d8a53a74a86ae (diff)
downloadcups-70bdce1628110ad9313cf7ca7e0c0fdf19585f82.tar.gz
Fix ppdmerge backup filename (Issue #5455)
Diffstat (limited to 'ppdc')
-rw-r--r--ppdc/ppdmerge.cxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx
index 8570948d5..94d67ff83 100644
--- a/ppdc/ppdmerge.cxx
+++ b/ppdc/ppdmerge.cxx
@@ -1,10 +1,11 @@
//
// PPD file merge utility for the CUPS PPD Compiler.
//
-// Copyright 2007-2014 by Apple Inc.
-// Copyright 2002-2007 by Easy Software Products.
+// Copyright © 2007-2018 by Apple Inc.
+// Copyright © 2002-2007 by Easy Software Products.
//
-// Licensed under Apache License v2.0. See the file "LICENSE" for more information.
+// Licensed under Apache License v2.0. See the file "LICENSE" for more
+// information.
//
//
@@ -38,6 +39,7 @@ main(int argc, // I - Number of command-line arguments
cups_array_t *ppds; // Array of PPD files
const char *inname, // First input filename
*outname; // Output filename (if any)
+ char bckname[1024]; // Backup filename
cups_file_t *infile, // Input file
*outfile; // Output file
cups_array_t *languages; // Languages in file
@@ -137,9 +139,6 @@ main(int argc, // I - Number of command-line arguments
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))