Merge pull request OSGeo#12226 from rouault/fix_12225

rouault · web-flow · commit 0454d8ef594c · 2025-04-30T10:25:37.000+01:00
gdal vector convert: do not emit error message when outputting to /vsistdout/
diff --git a/apps/gdalalg_abstract_pipeline.h b/apps/gdalalg_abstract_pipeline.h
@@ -18,6 +18,7 @@
 #include "cpl_conv.h"
 #include "cpl_json.h"
 #include "gdalalgorithm.h"
+#include "gdal_priv.h"
 
 #include <algorithm>
 
@@ -172,8 +173,8 @@ bool GDALAbstractPipelineAlgorithm<StepAlgorithm>::RunStep(
             const auto &filename =
                 outputArg->GDALAlgorithmArg::template Get<GDALArgDatasetValue>()
                     .GetName();
-            VSIStatBufL sStat;
-            if (VSIStatL(filename.c_str(), &sStat) == 0)
+            const char *pszType = "";
+            if (GDALDoesFileOrDatasetExist(filename.c_str(), &pszType))
             {
                 const auto overwriteArg =
                     m_steps.back()->GetArg(GDAL_ARG_NAME_OVERWRITE);
@@ -182,9 +183,9 @@ bool GDALAbstractPipelineAlgorithm<StepAlgorithm>::RunStep(
                     if (!overwriteArg->GDALAlgorithmArg::template Get<bool>())
                     {
                         CPLError(CE_Failure, CPLE_AppDefined,
-                                 "File '%s' already exists. Specify the "
+                                 "%s '%s' already exists. Specify the "
                                  "--overwrite option to overwrite it.",
-                                 filename.c_str());
+                                 pszType, filename.c_str());
                         return false;
                     }
                 }
diff --git a/apps/gdalalg_raster_calc.cpp b/apps/gdalalg_raster_calc.cpp
@@ -576,16 +576,14 @@ bool GDALRasterCalcAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
         return false;
     }
 
-    VSIStatBufL sStat;
+    const char *pszType = "";
     if (!m_overwrite && !m_outputDataset.GetName().empty() &&
-        (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 ||
-         std::unique_ptr<GDALDataset>(
-             GDALDataset::Open(m_outputDataset.GetName().c_str()))))
+        GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))
     {
         ReportError(CE_Failure, CPLE_AppDefined,
-                    "File '%s' already exists. Specify the --overwrite "
+                    "%s '%s' already exists. Specify the --overwrite "
                     "option to overwrite it.",
-                    m_outputDataset.GetName().c_str());
+                    pszType, m_outputDataset.GetName().c_str());
         return false;
     }
 
diff --git a/apps/gdalalg_raster_contour.cpp b/apps/gdalalg_raster_contour.cpp
@@ -177,16 +177,14 @@ bool GDALRasterContourAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
         aosOptions.AddString(m_outputLayerName);
     }
 
-    VSIStatBufL sStat;
+    const char *pszType = "";
     if (!m_overwrite && !m_outputDataset.GetName().empty() &&
-        (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 ||
-         std::unique_ptr<GDALDataset>(
-             GDALDataset::Open(m_outputDataset.GetName().c_str()))))
+        GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))
     {
         ReportError(CE_Failure, CPLE_AppDefined,
-                    "File '%s' already exists. Specify the --overwrite "
+                    "%s '%s' already exists. Specify the --overwrite "
                     "option to overwrite it.",
-                    m_outputDataset.GetName().c_str());
+                    pszType, m_outputDataset.GetName().c_str());
         return false;
     }
 
diff --git a/apps/gdalalg_raster_create.cpp b/apps/gdalalg_raster_create.cpp
@@ -94,18 +94,16 @@ bool GDALRasterCreateAlgorithm::RunImpl(GDALProgressFunc /* pfnProgress */,
         return false;
     }
 
-    VSIStatBufL sStat;
+    const char *pszType = "";
     if (!m_append && !m_outputDataset.GetName().empty() &&
-        (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 ||
-         std::unique_ptr<GDALDataset>(
-             GDALDataset::Open(m_outputDataset.GetName().c_str()))))
+        GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))
     {
         if (!m_overwrite)
         {
             ReportError(CE_Failure, CPLE_AppDefined,
-                        "File '%s' already exists. Specify the --overwrite "
+                        "%s '%s' already exists. Specify the --overwrite "
                         "option to overwrite it, or --append to append to it.",
-                        m_outputDataset.GetName().c_str());
+                        pszType, m_outputDataset.GetName().c_str());
             return false;
         }
         else
diff --git a/apps/gdalalg_raster_fillnodata.cpp b/apps/gdalalg_raster_fillnodata.cpp
@@ -99,16 +99,14 @@ bool GDALRasterFillNodataAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
                                             void *pProgressData)
 {
 
-    VSIStatBufL sStat;
+    const char *pszType = "";
     if (!m_overwrite && !m_outputDataset.GetName().empty() &&
-        (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 ||
-         std::unique_ptr<GDALDataset>(
-             GDALDataset::Open(m_outputDataset.GetName().c_str()))))
+        GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))
     {
         ReportError(CE_Failure, CPLE_AppDefined,
-                    "File '%s' already exists. Specify the --overwrite "
+                    "%s '%s' already exists. Specify the --overwrite "
                     "option to overwrite it.",
-                    m_outputDataset.GetName().c_str());
+                    pszType, m_outputDataset.GetName().c_str());
         return false;
     }
 
diff --git a/apps/gdalalg_raster_mosaic.cpp b/apps/gdalalg_raster_mosaic.cpp
@@ -180,16 +180,14 @@ bool GDALRasterMosaicAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
         return false;
     }
 
-    VSIStatBufL sStat;
+    const char *pszType = "";
     if (!m_overwrite && !m_outputDataset.GetName().empty() &&
-        (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 ||
-         std::unique_ptr<GDALDataset>(
-             GDALDataset::Open(m_outputDataset.GetName().c_str()))))
+        GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))
     {
         ReportError(CE_Failure, CPLE_AppDefined,
-                    "File '%s' already exists. Specify the --overwrite "
+                    "%s '%s' already exists. Specify the --overwrite "
                     "option to overwrite it.",
-                    m_outputDataset.GetName().c_str());
+                    pszType, m_outputDataset.GetName().c_str());
         return false;
     }
 
diff --git a/apps/gdalalg_raster_polygonize.cpp b/apps/gdalalg_raster_polygonize.cpp
@@ -90,18 +90,16 @@ bool GDALRasterPolygonizeAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
     auto poSrcDS = m_inputDataset.GetDatasetRef();
     CPLAssert(poSrcDS);
 
-    VSIStatBufL sStat;
+    const char *pszType = "";
     if (!m_update && !m_outputDataset.GetName().empty() &&
-        (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 ||
-         std::unique_ptr<GDALDataset>(
-             GDALDataset::Open(m_outputDataset.GetName().c_str()))))
+        GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))
     {
         if (!m_overwrite)
         {
             ReportError(CE_Failure, CPLE_AppDefined,
-                        "File '%s' already exists. Specify the --overwrite "
+                        "%s '%s' already exists. Specify the --overwrite "
                         "option to overwrite it, or --update to update it.",
-                        m_outputDataset.GetName().c_str());
+                        pszType, m_outputDataset.GetName().c_str());
             return false;
         }
         else
diff --git a/apps/gdalalg_raster_stack.cpp b/apps/gdalalg_raster_stack.cpp
@@ -175,16 +175,14 @@ bool GDALRasterStackAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
         return false;
     }
 
-    VSIStatBufL sStat;
+    const char *pszType = "";
     if (!m_overwrite && !m_outputDataset.GetName().empty() &&
-        (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 ||
-         std::unique_ptr<GDALDataset>(
-             GDALDataset::Open(m_outputDataset.GetName().c_str()))))
+        GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))
     {
         ReportError(CE_Failure, CPLE_AppDefined,
-                    "File '%s' already exists. Specify the --overwrite "
+                    "%s '%s' already exists. Specify the --overwrite "
                     "option to overwrite it.",
-                    m_outputDataset.GetName().c_str());
+                    pszType, m_outputDataset.GetName().c_str());
         return false;
     }
 
diff --git a/apps/gdalalg_raster_viewshed.cpp b/apps/gdalalg_raster_viewshed.cpp
@@ -127,16 +127,14 @@ bool GDALRasterViewshedAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
         return false;
     }
 
-    VSIStatBufL sStat;
+    const char *pszType = "";
     if (!m_overwrite && !m_outputDataset.GetName().empty() &&
-        (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 ||
-         std::unique_ptr<GDALDataset>(
-             GDALDataset::Open(m_outputDataset.GetName().c_str()))))
+        GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))
     {
         ReportError(CE_Failure, CPLE_AppDefined,
-                    "File '%s' already exists. Specify the --overwrite "
+                    "%s '%s' already exists. Specify the --overwrite "
                     "option to overwrite it.",
-                    m_outputDataset.GetName().c_str());
+                    pszType, m_outputDataset.GetName().c_str());
         return false;
     }
 
diff --git a/apps/gdalalg_vector_grid.cpp b/apps/gdalalg_vector_grid.cpp
@@ -307,40 +307,21 @@ bool GDALVectorGridAbstractAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
 
     GDALGridOptionsSetProgress(psOptions.get(), pfnProgress, pProgressData);
 
-    VSIStatBufL sStat;
-    std::unique_ptr<GDALDataset> poDstDS;
-    const bool fileExists =
-        VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0;
-
-    {
-        CPLErrorStateBackuper oCPLErrorHandlerPusher(CPLQuietErrorHandler);
-        poDstDS.reset(GDALDataset::Open(m_outputDataset.GetName().c_str(),
-                                        GDAL_OF_RASTER | GDAL_OF_UPDATE,
-                                        nullptr, nullptr, nullptr));
-    }
-
-    if (poDstDS)
+    const char *pszType = "";
+    if (!m_outputDataset.GetName().empty() &&
+        GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))
     {
         if (!m_overwrite)
         {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "Dataset '%s' already exists. Specify the --overwrite "
-                     "option to overwrite it",
-                     m_outputDataset.GetName().c_str());
+            ReportError(CE_Failure, CPLE_AppDefined,
+                        "%s '%s' already exists. Specify the --overwrite "
+                        "option to overwrite it, or --update to update it.",
+                        pszType, m_outputDataset.GetName().c_str());
             return false;
         }
-        else if (fileExists)
+        else
         {
-            poDstDS.reset();
-
-            // Delete the existing file
-            if (VSIUnlink(m_outputDataset.GetName().c_str()) != 0)
-            {
-                CPLError(CE_Failure, CPLE_AppDefined,
-                         "Failed to delete existing dataset '%s'.",
-                         m_outputDataset.GetName().c_str());
-                return false;
-            }
+            VSIUnlink(m_outputDataset.GetName().c_str());
         }
     }
 
diff --git a/apps/gdalalg_vector_output_abstract.cpp b/apps/gdalalg_vector_output_abstract.cpp
@@ -73,18 +73,16 @@ GDALVectorOutputAbstractAlgorithm::SetupOutputDataset()
 {
     SetupOutputDatasetRet ret;
 
-    VSIStatBufL sStat;
+    const char *pszType = "";
     if (!m_update && !m_outputDataset.GetName().empty() &&
-        (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 ||
-         std::unique_ptr<GDALDataset>(
-             GDALDataset::Open(m_outputDataset.GetName().c_str()))))
+        GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))
     {
         if (!m_overwrite)
         {
             ReportError(CE_Failure, CPLE_AppDefined,
-                        "File '%s' already exists. Specify the --overwrite "
+                        "%s '%s' already exists. Specify the --overwrite "
                         "option to overwrite it, or --update to update it.",
-                        m_outputDataset.GetName().c_str());
+                        pszType, m_outputDataset.GetName().c_str());
             return ret;
         }
         else
diff --git a/apps/ogr2ogr_lib.cpp b/apps/ogr2ogr_lib.cpp
@@ -2750,21 +2750,13 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
 
         if (psOptions->bNoOverwrite && !EQUAL(pszDest, ""))
         {
-            VSIStatBufL sStat;
-            if (VSIStatL(pszDest, &sStat) == 0)
-            {
-                CPLError(CE_Failure, CPLE_AppDefined,
-                         "File '%s' already exists. Specify the --overwrite "
-                         "option to overwrite it.",
-                         pszDest);
-                return nullptr;
-            }
-            else if (std::unique_ptr<GDALDataset>(GDALDataset::Open(pszDest)))
+            const char *pszType = "";
+            if (GDALDoesFileOrDatasetExist(pszDest, &pszType))
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
-                         "Dataset '%s' already exists. Specify the --overwrite "
+                         "%s '%s' already exists. Specify the --overwrite "
                          "option to overwrite it.",
-                         pszDest);
+                         pszType, pszDest);
                 return nullptr;
             }
         }
diff --git a/autotest/utilities/test_gdalalg_vector_convert.py b/autotest/utilities/test_gdalalg_vector_convert.py
@@ -164,3 +164,14 @@ def test_gdalalg_vector_convert_error_output_not_set():
         match="convert: Argument 'output' has no dataset object or dataset name",
     ):
         convert.Run()
+
+
+@pytest.mark.require_driver("GeoJSON")
+def test_gdalalg_vector_convert_vsistdout(tmp_vsimem):
+    convert = get_convert_alg()
+    convert["input"] = "../ogr/data/poly.shp"
+    convert["output"] = f"/vsistdout_redirect/{tmp_vsimem}/tmp.json"
+    convert["output-format"] = "GeoJSON"
+    assert convert.Run()
+    assert convert.Finalize()
+    assert gdal.OpenEx(f"{tmp_vsimem}/tmp.json") is not None
diff --git a/autotest/utilities/test_gdalalg_vector_grid.py b/autotest/utilities/test_gdalalg_vector_grid.py
@@ -557,7 +557,7 @@ def test_gdalalg_vector_grid_overwrite_failed_unlink(tmp_path):
         alg["input"] = get_src_ds(True)
         alg["output"] = out_filename
         alg["overwrite"] = True
-        with pytest.raises(Exception, match="Failed to delete"):
+        with pytest.raises(Exception):
             alg.Run()
     except Exception:
         os.chmod(tmp_path, 0o755)
diff --git a/gcore/gdal_misc.cpp b/gcore/gdal_misc.cpp
@@ -5799,3 +5799,42 @@ std::string GDALGetCacheDirectory()
     }
     return std::string();
 }
+
+/************************************************************************/
+/*                      GDALDoesFileOrDatasetExist()                    */
+/************************************************************************/
+
+/** Return whether a file already exists.
+ */
+bool GDALDoesFileOrDatasetExist(const char *pszName, const char **ppszType)
+{
+    VSIStatBufL sStat;
+    if (VSIStatL(pszName, &sStat) == 0)
+    {
+        if (ppszType)
+            *ppszType = "File";
+        return true;
+    }
+
+    if (GDALIdentifyDriver(pszName, nullptr))
+    {
+        if (ppszType)
+            *ppszType = "Dataset";
+        return true;
+    }
+
+    bool bExists;
+    {
+        CPLErrorStateBackuper oBackuper(CPLQuietErrorHandler);
+        bExists =
+            std::unique_ptr<GDALDataset>(GDALDataset::Open(pszName)) != nullptr;
+    }
+    if (bExists)
+    {
+        if (ppszType)
+            *ppszType = "Dataset";
+        return true;
+    }
+
+    return false;
+}
diff --git a/gcore/gdal_priv.h b/gcore/gdal_priv.h
@@ -4718,6 +4718,9 @@ GDALGetSTACCommonNameFromColorInterp(GDALColorInterp eInterp);
 
 std::string CPL_DLL GDALGetCacheDirectory();
 
+bool GDALDoesFileOrDatasetExist(const char *pszName,
+                                const char **ppszType = nullptr);
+
 // Macro used so that Identify and driver metadata methods in drivers built
 // as plugin can be duplicated in libgdal core and in the driver under different
 // names

Original file line number	Diff line number	Diff line change
`@@ -576,16 +576,14 @@ bool GDALRasterCalcAlgorithm::RunImpl(GDALProgressFunc pfnProgress,`
`576`	`576`	`return false;`
`577`	`577`	`}`
`578`	`578`
`579`		`- VSIStatBufL sStat;`
	`579`	`+ const char *pszType = "";`
`580`	`580`	`if (!m_overwrite && !m_outputDataset.GetName().empty() &&`
`581`		`- (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 \|\|`
`582`		`- std::unique_ptr<GDALDataset>(`
`583`		`- GDALDataset::Open(m_outputDataset.GetName().c_str()))))`
	`581`	`+ GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))`
`584`	`582`	`{`
`585`	`583`	`ReportError(CE_Failure, CPLE_AppDefined,`
`586`		`- "File '%s' already exists. Specify the --overwrite "`
	`584`	`+ "%s '%s' already exists. Specify the --overwrite "`
`587`	`585`	`"option to overwrite it.",`
`588`		`- m_outputDataset.GetName().c_str());`
	`586`	`+ pszType, m_outputDataset.GetName().c_str());`
`589`	`587`	`return false;`
`590`	`588`	`}`
`591`	`589`
Original file line number	Diff line number	Diff line change
`@@ -177,16 +177,14 @@ bool GDALRasterContourAlgorithm::RunImpl(GDALProgressFunc pfnProgress,`
`177`	`177`	`aosOptions.AddString(m_outputLayerName);`
`178`	`178`	`}`
`179`	`179`
`180`		`- VSIStatBufL sStat;`
	`180`	`+ const char *pszType = "";`
`181`	`181`	`if (!m_overwrite && !m_outputDataset.GetName().empty() &&`
`182`		`- (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 \|\|`
`183`		`- std::unique_ptr<GDALDataset>(`
`184`		`- GDALDataset::Open(m_outputDataset.GetName().c_str()))))`
	`182`	`+ GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))`
`185`	`183`	`{`
`186`	`184`	`ReportError(CE_Failure, CPLE_AppDefined,`
`187`		`- "File '%s' already exists. Specify the --overwrite "`
	`185`	`+ "%s '%s' already exists. Specify the --overwrite "`
`188`	`186`	`"option to overwrite it.",`
`189`		`- m_outputDataset.GetName().c_str());`
	`187`	`+ pszType, m_outputDataset.GetName().c_str());`
`190`	`188`	`return false;`
`191`	`189`	`}`
`192`	`190`
Original file line number	Diff line number	Diff line change
`@@ -94,18 +94,16 @@ bool GDALRasterCreateAlgorithm::RunImpl(GDALProgressFunc /* pfnProgress */,`
`94`	`94`	`return false;`
`95`	`95`	`}`
`96`	`96`
`97`		`- VSIStatBufL sStat;`
	`97`	`+ const char *pszType = "";`
`98`	`98`	`if (!m_append && !m_outputDataset.GetName().empty() &&`
`99`		`- (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 \|\|`
`100`		`- std::unique_ptr<GDALDataset>(`
`101`		`- GDALDataset::Open(m_outputDataset.GetName().c_str()))))`
	`99`	`+ GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))`
`102`	`100`	`{`
`103`	`101`	`if (!m_overwrite)`
`104`	`102`	`{`
`105`	`103`	`ReportError(CE_Failure, CPLE_AppDefined,`
`106`		`- "File '%s' already exists. Specify the --overwrite "`
	`104`	`+ "%s '%s' already exists. Specify the --overwrite "`
`107`	`105`	`"option to overwrite it, or --append to append to it.",`
`108`		`- m_outputDataset.GetName().c_str());`
	`106`	`+ pszType, m_outputDataset.GetName().c_str());`
`109`	`107`	`return false;`
`110`	`108`	`}`
`111`	`109`	`else`
Original file line number	Diff line number	Diff line change
`@@ -99,16 +99,14 @@ bool GDALRasterFillNodataAlgorithm::RunImpl(GDALProgressFunc pfnProgress,`
`99`	`99`	`void *pProgressData)`
`100`	`100`	`{`
`101`	`101`
`102`		`- VSIStatBufL sStat;`
	`102`	`+ const char *pszType = "";`
`103`	`103`	`if (!m_overwrite && !m_outputDataset.GetName().empty() &&`
`104`		`- (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 \|\|`
`105`		`- std::unique_ptr<GDALDataset>(`
`106`		`- GDALDataset::Open(m_outputDataset.GetName().c_str()))))`
	`104`	`+ GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))`
`107`	`105`	`{`
`108`	`106`	`ReportError(CE_Failure, CPLE_AppDefined,`
`109`		`- "File '%s' already exists. Specify the --overwrite "`
	`107`	`+ "%s '%s' already exists. Specify the --overwrite "`
`110`	`108`	`"option to overwrite it.",`
`111`		`- m_outputDataset.GetName().c_str());`
	`109`	`+ pszType, m_outputDataset.GetName().c_str());`
`112`	`110`	`return false;`
`113`	`111`	`}`
`114`	`112`
Original file line number	Diff line number	Diff line change
`@@ -180,16 +180,14 @@ bool GDALRasterMosaicAlgorithm::RunImpl(GDALProgressFunc pfnProgress,`
`180`	`180`	`return false;`
`181`	`181`	`}`
`182`	`182`
`183`		`- VSIStatBufL sStat;`
	`183`	`+ const char *pszType = "";`
`184`	`184`	`if (!m_overwrite && !m_outputDataset.GetName().empty() &&`
`185`		`- (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 \|\|`
`186`		`- std::unique_ptr<GDALDataset>(`
`187`		`- GDALDataset::Open(m_outputDataset.GetName().c_str()))))`
	`185`	`+ GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))`
`188`	`186`	`{`
`189`	`187`	`ReportError(CE_Failure, CPLE_AppDefined,`
`190`		`- "File '%s' already exists. Specify the --overwrite "`
	`188`	`+ "%s '%s' already exists. Specify the --overwrite "`
`191`	`189`	`"option to overwrite it.",`
`192`		`- m_outputDataset.GetName().c_str());`
	`190`	`+ pszType, m_outputDataset.GetName().c_str());`
`193`	`191`	`return false;`
`194`	`192`	`}`
`195`	`193`
Original file line number	Diff line number	Diff line change
`@@ -175,16 +175,14 @@ bool GDALRasterStackAlgorithm::RunImpl(GDALProgressFunc pfnProgress,`
`175`	`175`	`return false;`
`176`	`176`	`}`
`177`	`177`
`178`		`- VSIStatBufL sStat;`
	`178`	`+ const char *pszType = "";`
`179`	`179`	`if (!m_overwrite && !m_outputDataset.GetName().empty() &&`
`180`		`- (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 \|\|`
`181`		`- std::unique_ptr<GDALDataset>(`
`182`		`- GDALDataset::Open(m_outputDataset.GetName().c_str()))))`
	`180`	`+ GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))`
`183`	`181`	`{`
`184`	`182`	`ReportError(CE_Failure, CPLE_AppDefined,`
`185`		`- "File '%s' already exists. Specify the --overwrite "`
	`183`	`+ "%s '%s' already exists. Specify the --overwrite "`
`186`	`184`	`"option to overwrite it.",`
`187`		`- m_outputDataset.GetName().c_str());`
	`185`	`+ pszType, m_outputDataset.GetName().c_str());`
`188`	`186`	`return false;`
`189`	`187`	`}`
`190`	`188`
Original file line number	Diff line number	Diff line change
`@@ -127,16 +127,14 @@ bool GDALRasterViewshedAlgorithm::RunImpl(GDALProgressFunc pfnProgress,`
`127`	`127`	`return false;`
`128`	`128`	`}`
`129`	`129`
`130`		`- VSIStatBufL sStat;`
	`130`	`+ const char *pszType = "";`
`131`	`131`	`if (!m_overwrite && !m_outputDataset.GetName().empty() &&`
`132`		`- (VSIStatL(m_outputDataset.GetName().c_str(), &sStat) == 0 \|\|`
`133`		`- std::unique_ptr<GDALDataset>(`
`134`		`- GDALDataset::Open(m_outputDataset.GetName().c_str()))))`
	`132`	`+ GDALDoesFileOrDatasetExist(m_outputDataset.GetName().c_str(), &pszType))`
`135`	`133`	`{`
`136`	`134`	`ReportError(CE_Failure, CPLE_AppDefined,`
`137`		`- "File '%s' already exists. Specify the --overwrite "`
	`135`	`+ "%s '%s' already exists. Specify the --overwrite "`
`138`	`136`	`"option to overwrite it.",`
`139`		`- m_outputDataset.GetName().c_str());`
	`137`	`+ pszType, m_outputDataset.GetName().c_str());`
`140`	`138`	`return false;`
`141`	`139`	`}`
`142`	`140`