about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2015-04-29 06:18:30 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2015-04-29 06:18:30 +0000
commit8bf6efa667b7414fddadc3a61c5de8a4802da648 (patch)
tree364cb449f8bc70e8947c8278027b97fe12b51615
parent7df75acc09a40b86739fc8f7f0e0ea2e248cd400 (diff)
downloadnetpbm-mirror-8bf6efa667b7414fddadc3a61c5de8a4802da648.tar.gz
netpbm-mirror-8bf6efa667b7414fddadc3a61c5de8a4802da648.tar.xz
netpbm-mirror-8bf6efa667b7414fddadc3a61c5de8a4802da648.zip
Fix bug: ' instead of - for default input file name
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2470 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/pgm/st4topgm.c2
-rw-r--r--doc/HISTORY4
2 files changed, 5 insertions, 1 deletions
diff --git a/converter/pgm/st4topgm.c b/converter/pgm/st4topgm.c
index e763852c..8e4660a3 100644
--- a/converter/pgm/st4topgm.c
+++ b/converter/pgm/st4topgm.c
@@ -212,7 +212,7 @@ main(int argc, const char **argv) {
     pm_proginit(&argc, argv);
 
     if (argc-1 < 1)
-        inputFileName = "'";
+        inputFileName = "-";
     else {
         inputFileName = argv[1];
         if (argc-1 > 1)
diff --git a/doc/HISTORY b/doc/HISTORY
index af284f2c..22df4eb5 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -6,6 +6,10 @@ CHANGE HISTORY
 
 not yet  BJH  Release 10.71.00
 
+              st4topgm: Fix bug: with no argument, uses file named "'" instead
+              of Standard Input.  Always present (st45topgm was new in Netpbm
+              10.70 (March 2015).
+
               ppmtorgb3: Fix buffer overflow with long input file name.
               Always present.  (ppmtorgb3 was new in X.V11R4 (November 1989).