diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-02-26 20:03:47 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-02-26 20:03:47 +0000 |
commit | d61c38bbed11725596d455dc50e97cefe5f74f33 (patch) | |
tree | 8a872c8d70dd33d4cdf934f7cf699f9cb097808b /converter/other/pamtosvg | |
parent | 4f182f1c2fe7adec1f733955dcff0dbafc9d73ba (diff) | |
download | netpbm-mirror-d61c38bbed11725596d455dc50e97cefe5f74f33.tar.gz netpbm-mirror-d61c38bbed11725596d455dc50e97cefe5f74f33.tar.xz netpbm-mirror-d61c38bbed11725596d455dc50e97cefe5f74f33.zip |
Fix log file name with Standard Input
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@589 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/pamtosvg')
-rw-r--r-- | converter/other/pamtosvg/pamtosvg.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/converter/other/pamtosvg/pamtosvg.c b/converter/other/pamtosvg/pamtosvg.c index c6fe2f4c..36f69b59 100644 --- a/converter/other/pamtosvg/pamtosvg.c +++ b/converter/other/pamtosvg/pamtosvg.c @@ -328,11 +328,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); @@ -349,7 +362,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); @@ -357,13 +369,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); @@ -379,8 +386,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) |