(no commit message)

[imagemagick] / MagickWand / wandcli.c

diff --git a/MagickWand/wandcli.c b/MagickWand/wandcli.c
index 8363edf977fe29a634251876ebfe6169024f9cd3..79b41b9b032d68870e47b9b3d63d923ae1f0c187 100644 (file)
--- a/MagickWand/wandcli.c
+++ b/MagickWand/wandcli.c
@@ -17,7 +17,7 @@
 %                                 April 2011                                  %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -117,17 +117,19 @@ WandExport MagickCLI *AcquireMagickCLI(ImageInfo *image_info,
   /* Initialize CLI Part of MagickCLI */
   cli_wand->draw_info=CloneDrawInfo(cli_wand->wand.image_info,(DrawInfo *) NULL);
   cli_wand->quantize_info=AcquireQuantizeInfo(cli_wand->wand.image_info);
+  cli_wand->process_flags=MagickCommandOptionFlags;  /* assume "magick" CLI */
+  cli_wand->command=(const OptionInfo *)NULL;     /* no option at this time */
   cli_wand->image_list_stack=(Stack *)NULL;
   cli_wand->image_info_stack=(Stack *)NULL;
-  cli_wand->process_flags=MagickCommandOptionFlags;  /* assume "magick" CLI */
 
   /* default exception location...
      EG: sprintf(locaiton, filename, line, column);
   */
-  cli_wand->location="from \"%s\"";   /* location format: */
-  cli_wand->filename="unknown";       /* unknown source */
-  cli_wand->line=0;
-  cli_wand->column=0;
+  cli_wand->location="from \"%s\"";   /* location format using arguments: */
+                                      /*      filename, line, column */
+  cli_wand->filename="unknown";       /* script filename, unknown source */
+  cli_wand->line=0;                   /* line from script OR CLI argument */
+  cli_wand->column=0;                 /* column from script */
 
   cli_wand->signature=WandSignature;
   if (IfMagickTrue(cli_wand->wand.debug))
@@ -213,7 +215,7 @@ WandExport MagickCLI *DestroyMagickCLI(MagickCLI *cli_wand)
 %  CLICatchException() will report exceptions, either just non-fatal warnings
 %  only, or all errors, according to 'all_execeptions' boolean argument.
 %
-%  The function returns true is errors are fatal, in which case the caller
+%  The function returns true if errors are fatal, in which case the caller
 %  should abort and re-call with an 'all_exceptions' argument of true before
 %  quitting.
 %
@@ -225,6 +227,12 @@ WandExport MagickCLI *DestroyMagickCLI(MagickCLI *cli_wand)
 %    MagickBooleanType CLICatchException(MagickCLI *cli_wand,
 %              const MagickBooleanType all_exceptions );
 %
+%  Arguments are
+%
+%    o cli_wand:   The Wand CLI that holds the exception Information
+%
+%    o all_exceptions:   Report all exceptions, including the fatal one
+%
 */
 WandExport MagickBooleanType CLICatchException(MagickCLI *cli_wand,
      const MagickBooleanType all_exceptions )
@@ -245,6 +253,52 @@ WandExport MagickBooleanType CLICatchException(MagickCLI *cli_wand,
   if ( IfMagickFalse(status) || IfMagickTrue(all_exceptions) )
     CatchException(cli_wand->wand.exception); /* output and clear exceptions */
 
+  return(status);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
++   C L I L o g E v e n t                                                     %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% CLILogEvent() is a wrapper around LogMagickEvent(), adding to it the
+% location of the option that is (about) to be executed.
+%
+*/
+WandExport MagickBooleanType CLILogEvent(MagickCLI *cli_wand,
+     const LogEventType type,const char *module,const char *function,
+     const size_t line,const char *format,...)
+{
+  char
+    new_format[MaxTextExtent];
+
+  MagickBooleanType
+    status;
+
+  va_list
+    operands;
+
+  /* HACK - prepend the CLI location to format string.
+     The better way would be add more arguments to to the 'va' oparands
+     list, but that does not appear to be possible! So we do some
+     pre-formating of the location info here.
+  */
+  (void) FormatLocaleString(new_format,MaxTextExtent,cli_wand->location,
+       cli_wand->filename, cli_wand->line, cli_wand->column);
+  (void) ConcatenateMagickString(new_format," ",MaxTextExtent);
+  (void) ConcatenateMagickString(new_format,format,MaxTextExtent);
+
+  va_start(operands,format);
+  status=LogMagickEventList(type,module,function,line,new_format,operands);
+  va_end(operands);
+
+
   return(status);
 }
 \f
@@ -259,7 +313,7 @@ WandExport MagickBooleanType CLICatchException(MagickCLI *cli_wand,
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% CLIThrowException() formats and records an exception condition, adding to
+% CLIThrowException() is a wrapper around ThrowMagickException(), adding to
 % it the location of the option that caused the exception to occur.
 */
 WandExport MagickBooleanType CLIThrowException(MagickCLI *cli_wand,
@@ -279,10 +333,9 @@ WandExport MagickBooleanType CLIThrowException(MagickCLI *cli_wand,
     operands;
 
   /* HACK - append location to format string.
-     The better way would be append location formats and add more arguments to
-     operands, but that does not appear to be posible!
-     Note:  ThrowMagickExceptionList() was exported specifically for
-     the use of this function.
+     The better way would be add more arguments to to the 'va' oparands
+     list, but that does not appear to be possible! So we do some
+     pre-formating of the location info here.
   */
   (void) CopyMagickString(new_format,format,MaxTextExtent);
   (void) ConcatenateMagickString(new_format," ",MaxTextExtent);