From: Ben Pfaff <blp@gnu.org>
Date: Sun, 31 Jan 2010 04:48:26 +0000 (-0800)
Subject: odt: Fix writing files with names different from pspp.odt.
X-Git-Tag: v0.7.4~29
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=5269c22bd135c65d5c8c9028c2ca2ae17cc6a192

odt: Fix writing files with names different from pspp.odt.
---

diff --git a/src/output/odt.c b/src/output/odt.c
index 41ef108b..88838752 100644
--- a/src/output/odt.c
+++ b/src/output/odt.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -367,8 +367,8 @@ odt_destroy (struct output_driver *driver)
   /* Zip up the directory */
   ds_init_empty (&zip_cmd);
   ds_put_format (&zip_cmd,
-		 "cd %s ; rm -f ../%s; zip -q -X ../%s mimetype; zip -q -X -u -r ../pspp.odt .",
-		 odt->dirname, odt->file_name, odt->file_name);
+		 "cd %s ; rm -f ../%s; zip -q -X ../%s mimetype; zip -q -X -u -r ../%s .",
+		 odt->dirname, odt->file_name, odt->file_name, odt->file_name);
   system (ds_cstr (&zip_cmd));
   ds_destroy (&zip_cmd);