about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2016-09-01 14:14:32 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2016-09-01 14:14:32 +0000
commit07431300cd6722ab783dcda1d7be5844984f9364 (patch)
treeffccc18d23e6d0061333c1b3e7538fbd11bb1f67
parent278737f6381baa2bef0625899b6df7e10768a610 (diff)
downloadnetpbm-mirror-07431300cd6722ab783dcda1d7be5844984f9364.tar.gz
netpbm-mirror-07431300cd6722ab783dcda1d7be5844984f9364.tar.xz
netpbm-mirror-07431300cd6722ab783dcda1d7be5844984f9364.zip
Release 10.75.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2816 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/tifftopnm.c1
-rw-r--r--doc/HISTORY10
-rwxr-xr-xeditor/pnmquantall3
-rw-r--r--version.mk2
4 files changed, 14 insertions, 2 deletions
diff --git a/converter/other/tifftopnm.c b/converter/other/tifftopnm.c
index f9e602ff..58efe1fd 100644
--- a/converter/other/tifftopnm.c
+++ b/converter/other/tifftopnm.c
@@ -52,6 +52,7 @@
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
+#include <sys/wait.h>  /* WIFSIGNALED, etc. */
 
 #include "pm_c_util.h"
 #include "shhopt.h"
diff --git a/doc/HISTORY b/doc/HISTORY
index 97c7acb4..560c04c2 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,16 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+16.09.01 BJH  Release 10.75.02
+
+              pnmquantall: Fix failure when temporary file location is
+              not the same filesystem as the output file.
+
+              pnmquantall: Fix incorrect handling of when the Pnmremap or
+              the final rename fails.
+
+              Build: tifftopnm.c: fix undefined WIFSIGNALED, etc. in 
+
 16.08.13 BJH  Release 10.75.01
 
               giftopnm: Fix bug: crash on little-endian computers that can't
diff --git a/editor/pnmquantall b/editor/pnmquantall
index 844fc13d..274ce62d 100755
--- a/editor/pnmquantall
+++ b/editor/pnmquantall
@@ -56,6 +56,7 @@ use strict;
 use warnings;
 use English;
 use Fcntl;  # gets open flags
+use File::Copy;
 
 my $TRUE=1; my $FALSE = 0;
 
@@ -176,7 +177,7 @@ sub remapFiles($$$$) {
                 my $newFileName = $inFileName . $ext;
 
                 unlink($newFileName);
-                rename($outputFileName, $newFileName)
+                File::Copy::move($outputFileName, $newFileName)
                     or $errorR = "Rename to '$newFileName' failed.";
             }
         }
diff --git a/version.mk b/version.mk
index fc99db50..bd5a39ab 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 75
-NETPBM_POINT_RELEASE = 1
+NETPBM_POINT_RELEASE = 2