Release 10.35.40

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@596 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 16 insertions, 11 deletions

diff --git a/converter/other/pamtosvg/pamtosvg.c b/converter/other/pamtosvg/pamtosvg.c
index 84d67948..7262204c 100644
--- a/converter/other/pamtosvg/pamtosvg.c
+++ b/converter/other/pamtosvg/pamtosvg.c
@@ -327,11 +327,24 @@ filenameRoot(const char * const filename) {
 
 static void
 openLogFile(FILE **      const logFileP,
-            const char * const inputRootName) {
+            const char * const inputFileArg) {
 
     const char * logfileName;
 
-    asprintfN(&logfileName, "%s.log", inputRootName);
+    if (streq(inputFileArg, "-"))
+        asprintfN(&logfileName, "pamtosvg.log");
+    else {
+        const char * inputRootName;
+
+        inputRootName = filenameRoot(inputFileArg);
+        if (inputRootName == NULL)
+            pm_error("Can't find the root portion of file name '%s'",
+                     inputFileArg);
+    
+        asprintfN(&logfileName, "%s.log", inputRootName);
+
+        strfree(inputRootName);
+    }
 
     *logFileP = pm_openw(logfileName);
 
@@ -348,7 +361,6 @@ main(int argc, char * argv[]) {
     at_bitmap_type * bitmapP;
     at_spline_list_array_type * splinesP;
     at_progress_func progressReporter;
-    const char * inputRootName;
 
     pnm_init(&argc, argv);
 
@@ -356,13 +368,8 @@ main(int argc, char * argv[]) {
 
     ifP = pm_openr(cmdline.inputFileName);
 
-    inputRootName = filenameRoot(cmdline.inputFileName);
-    if (inputRootName == NULL)
-        pm_error("Can't find the root portion of file name '%s'",
-                 cmdline.inputFileName);
-    
     if (cmdline.log)
-        openLogFile(&log_file, inputRootName);
+        openLogFile(&log_file, cmdline.inputFileName);
 
     readImageToBitmap(ifP, &bitmapP);
     
@@ -378,8 +385,6 @@ main(int argc, char * argv[]) {
     writeSplines(splinesP, cmdline, output_svg_writer, stdout,
                  exceptionHandler);
 
-    strfree(inputRootName);
-
     pm_close(stdout);
     pm_close(ifP);
     if (cmdline.log)