correct exit code (ImageMagick/ImageMagick#6744)

ImageMagick · Sep 28, 2023 · d730d3e · d730d3e
1 parent 834a5d4
commit d730d3e
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 8 deletions.
diff --git a/wand/compare.c b/wand/compare.c
@@ -292,7 +292,12 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
         }
     }
   if (argc < 3)
-    return(CompareUsage());
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+        "MissingArgument","%s","");
+      (void) CompareUsage();
+      return(MagickFalse);
+    }
   restore_info=image_info;
   channels=DefaultChannels;
   difference_image=NewImageList();

diff --git a/wand/composite.c b/wand/composite.c
@@ -445,7 +445,12 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
         }
     }
   if (argc < 4)
-    return(CompositeUsage());
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+        "MissingArgument","%s","");
+      (void) CompositeUsage();
+      return(MagickFalse);
+    }
   GetCompositeOptions(&composite_options);
   filename=(char *) NULL;
   format="%w,%h,%m";

diff --git a/wand/conjure.c b/wand/conjure.c
@@ -167,7 +167,12 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info,
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
   if (argc < 2)
-    return(ConjureUsage());
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+        "MissingArgument","%s","");
+      (void) ConjureUsage();
+      return(MagickFalse);
+    }
   image=NewImageList();
   number_images=0;
   option=(char *) NULL;

diff --git a/wand/convert.c b/wand/convert.c
@@ -541,7 +541,12 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
         }
     }
   if (argc < 3)
-    return(ConvertUsage());
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+        "MissingArgument","%s","");
+      (void) ConvertUsage();
+      return(MagickFalse);
+    }
   filename=(char *) NULL;
   format="%w,%h,%m";
   j=1;

diff --git a/wand/identify.c b/wand/identify.c
@@ -245,7 +245,12 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
         }
     }
   if (argc < 2)
-    return(IdentifyUsage());
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+        "MissingArgument","%s","");
+      (void) IdentifyUsage();
+      return(MagickFalse);
+    }
   count=0;
   format=NULL;
   j=1;

diff --git a/wand/mogrify.c b/wand/mogrify.c
@@ -3864,7 +3864,12 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
         }
     }
   if (argc < 2)
-    return(MogrifyUsage());
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+        "MissingArgument","%s","");
+      (void) MogrifyUsage();
+      return(MagickFalse);
+    }
   format=(char *) NULL;
   path=(char *) NULL;
   global_colormap=MagickFalse;

diff --git a/wand/montage.c b/wand/montage.c
@@ -327,7 +327,12 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
         }
     }
   if (argc < 3)
-    return(MontageUsage());
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+        "MissingArgument","%s","");
+      (void) MontageUsage();
+      return(MagickFalse);
+    }
   format="%w,%h,%m";
   first_scene=0;
   j=1;

diff --git a/wand/stream.c b/wand/stream.c
@@ -224,7 +224,12 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
         }
     }
   if (argc < 3)
-    return(StreamUsage());
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+        "MissingArgument","%s","");
+      (void) StreamUsage();
+      return(MagickFalse);
+    }
   format="%w,%h,%m";
   (void) format;
   j=1;