Fix empdump not to touch plane file when import fails

[empserver] / src / util / empdump.c

diff --git a/src/util/empdump.c b/src/util/empdump.c
index cc226a3d2705197b7c0c8a89a2e614456a2e1adf..652beb0060765952f517993a66ad0a828f488bbd 100644 (file)
--- a/src/util/empdump.c
+++ b/src/util/empdump.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -28,7 +27,7 @@
  *  empdump.c: Export/import Empire game state
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2008
+ *     Markus Armbruster, 2008-2010
  */
 
 #include <config.h>
@@ -132,10 +131,13 @@ main(int argc, char *argv[])
     global_init();
 
     for (i = 0; i < EF_MAX; i++) {
-       if (!EF_IS_GAME_STATE(i))
-           continue;
-       if (!ef_open(i, EFF_MEM | private, -1))
-           exit(1);
+       if (EF_IS_GAME_STATE(i)) {
+           if (!ef_open(i, EFF_MEM | private))
+               exit(1);
+       } else if (EF_IS_VIEW(i)) {
+           if (ef_open_view(i) < 0)
+               exit(1);
+       }
     }
 
     /* import from IMPORT */
@@ -148,7 +150,7 @@ main(int argc, char *argv[])
            exit(1);
     }
 
-    if (ef_verify() < 0)
+    if (ef_verify(0) < 0)
        exit(1);
 
     /* export to stdout */