Fix a whole lot of drivers to error out when trying to open a read-on…

…ly dataset in update mode (#3147) git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@17664 f0d54148-0727-0410-94bb-9a71ac55c965
judajake · Sep 21, 2009 · a4d23f6 · a4d23f6
1 parent a09084e
commit a4d23f6
Show file tree

Hide file tree

Showing 48 changed files with 595 additions and 45 deletions.
diff --git a/frmts/aigrid/aigdataset.cpp b/frmts/aigrid/aigdataset.cpp
@@ -579,6 +579,17 @@ GDALDataset *AIGDataset::Open( GDALOpenInfo * poOpenInfo )
     }
 
 /* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        AIGClose(psInfo);
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The AIG driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+/* -------------------------------------------------------------------- */
 /*      Create a corresponding GDALDataset.                             */
 /* -------------------------------------------------------------------- */
     AIGDataset 	*poDS;

diff --git a/frmts/airsar/airsardataset.cpp b/frmts/airsar/airsardataset.cpp
@@ -545,6 +545,16 @@ GDALDataset *AirSARDataset::Open( GDALOpenInfo * poOpenInfo )
         return NULL;
 
 /* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The AIRSAR driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+/* -------------------------------------------------------------------- */
 /*      Create a corresponding GDALDataset.                             */
 /* -------------------------------------------------------------------- */
     AirSARDataset 	*poDS;

diff --git a/frmts/blx/blxdataset.cpp b/frmts/blx/blxdataset.cpp
@@ -132,6 +132,18 @@ GDALDataset *BLXDataset::Open( GDALOpenInfo * poOpenInfo )
 	poDS->nBands = 1;
 	poDS->papoOverviewDS[i]->SetBand(1, new BLXRasterBand( poDS->papoOverviewDS[i], 1, i+1));
     }
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        delete poDS;
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The BLX driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
 
     return( poDS );
 }

diff --git a/frmts/bsb/bsbdataset.cpp b/frmts/bsb/bsbdataset.cpp
@@ -642,6 +642,14 @@ GDALDataset *BSBDataset::Open( GDALOpenInfo * poOpenInfo )
         pszRA = strstr((const char*)poOpenInfo->pabyHeader + i, "[JF");
     if (pszRA == NULL || pszRA - ((const char*)poOpenInfo->pabyHeader + i) > 100 )
         return NULL;
+
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The BSB driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
 
 /* -------------------------------------------------------------------- */
 /*      Create a corresponding GDALDataset.                             */

diff --git a/frmts/ceos/ceosdataset.cpp b/frmts/ceos/ceosdataset.cpp
@@ -165,6 +165,17 @@ GDALDataset *CEOSDataset::Open( GDALOpenInfo * poOpenInfo )
         return( NULL );
 
 /* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        CEOSClose(psCEOS);
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The CEOS driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+/* -------------------------------------------------------------------- */
 /*      Create a corresponding GDALDataset.                             */
 /* -------------------------------------------------------------------- */
     CEOSDataset 	*poDS;

diff --git a/frmts/ceos2/sar_ceosdataset.cpp b/frmts/ceos2/sar_ceosdataset.cpp
@@ -1580,7 +1580,17 @@ GDALDataset *SAR_CEOSDataset::Open( GDALOpenInfo * poOpenInfo )
     // value appears to be little endian.
     if( poOpenInfo->pabyHeader[0] != 0 )
         return NULL;
-
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The SAR_CEOS driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
 /* -------------------------------------------------------------------- */
 /*      Create a corresponding GDALDataset.                             */
 /* -------------------------------------------------------------------- */

diff --git a/frmts/coasp/coasp_dataset.cpp b/frmts/coasp/coasp_dataset.cpp
@@ -369,7 +369,17 @@ GDALDataset *COASPDataset::Open( GDALOpenInfo *poOpenInfo )
 {
 	if (!COASPDataset::Identify(poOpenInfo))
 		return NULL;
-
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The COASP driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
 	/* Create a fresh dataset for us to work with */
 	COASPDataset *poDS;
 	poDS = new COASPDataset();

diff --git a/frmts/cosar/cosar_dataset.cpp b/frmts/cosar/cosar_dataset.cpp
@@ -156,7 +156,17 @@ GDALDataset *COSARDataset::Open( GDALOpenInfo * pOpenInfo ) {
     if (!EQUALN((char *)pOpenInfo->pabyHeader+MAGIC1_OFFSET, "CSAR",4)) 
         return NULL;
 
-
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( pOpenInfo->eAccess == GA_Update )
+    {
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The COSAR driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+
     /* this is a cosar dataset */
     COSARDataset *pDS;
     pDS = new COSARDataset();

diff --git a/frmts/dimap/dimapdataset.cpp b/frmts/dimap/dimapdataset.cpp
@@ -245,7 +245,17 @@ GDALDataset *DIMAPDataset::Open( GDALOpenInfo * poOpenInfo )
 {
     if( !Identify( poOpenInfo ) )
         return NULL;
-
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The DIMAP driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
 /* -------------------------------------------------------------------- */
 /*      Get the metadata filename.                                      */
 /* -------------------------------------------------------------------- */

diff --git a/frmts/dods/dodsdataset2.cpp b/frmts/dods/dodsdataset2.cpp
@@ -1052,7 +1052,19 @@ DODSDataset::Open(GDALOpenInfo *poOpenInfo)
     }
 
     CSLDestroy(papszVarConstraintList);
-
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poDS != NULL && poOpenInfo->eAccess == GA_Update )
+    {
+        delete poDS;
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The DODS driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+
     return poDS;
 }
 

diff --git a/frmts/ecw/ecwdataset.cpp b/frmts/ecw/ecwdataset.cpp
@@ -1189,6 +1189,14 @@ GDALDataset *ECWDataset::Open( GDALOpenInfo * poOpenInfo )
         }
     }
 
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The DIMAP driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+
 /* -------------------------------------------------------------------- */
 /*      Create a corresponding GDALDataset.                             */
 /* -------------------------------------------------------------------- */
@@ -1314,7 +1322,19 @@ GDALDataset *ECWDataset::Open( GDALOpenInfo * poOpenInfo )
 /* -------------------------------------------------------------------- */
     poDS->SetDescription( poOpenInfo->pszFilename );
     poDS->TryLoadXML();
-
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        delete poDS;
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The ECW driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+
     return( poDS );
 }
 

diff --git a/frmts/envisat/envisatdataset.cpp b/frmts/envisat/envisatdataset.cpp
@@ -603,7 +603,18 @@ GDALDataset *EnvisatDataset::Open( GDALOpenInfo * poOpenInfo )
         if( EQUAL(pszDSType,"M") )
             break;
     }
-
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        EnvisatFile_Close( hEnvisatFile );
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The ENVISAT driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
 /* -------------------------------------------------------------------- */
 /*      Create a corresponding GDALDataset.                             */
 /* -------------------------------------------------------------------- */

diff --git a/frmts/gff/gff_dataset.cpp b/frmts/gff/gff_dataset.cpp
@@ -195,7 +195,17 @@ GDALDataset *GFFDataset::Open( GDALOpenInfo *poOpenInfo )
     if (!GFFDataset::Identify(poOpenInfo)) 
         return NULL;
 
-
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The GFF driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+
     GFFDataset *poDS;
     poDS = new GFFDataset();
     /* Steal the file pointer */

diff --git a/frmts/grass/grass57dataset.cpp b/frmts/grass/grass57dataset.cpp
@@ -969,7 +969,19 @@ GDALDataset *GRASSDataset::Open( GDALOpenInfo * poOpenInfo )
 
     CSLDestroy(papszCells);
     CSLDestroy(papszMapsets);
-
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        delete poDS;
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The GRASS driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+
     return poDS;
 }
 

diff --git a/frmts/grass/grassdataset.cpp b/frmts/grass/grassdataset.cpp
@@ -562,7 +562,19 @@ GDALDataset *GRASSDataset::Open( GDALOpenInfo * poOpenInfo )
                                             papszMapsets[iBand], 
                                             papszCells[iBand] ) );
     }
-
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        delete poDS;
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The GRASS driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+
     return poDS;
 }
 

diff --git a/frmts/grib/gribdataset.cpp b/frmts/grib/gribdataset.cpp
@@ -386,6 +386,16 @@ GDALDataset *GRIBDataset::Open( GDALOpenInfo * poOpenInfo )
     free(buff);
 
 /* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The GRIB driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+/* -------------------------------------------------------------------- */
 /*      Create a corresponding GDALDataset.                             */
 /* -------------------------------------------------------------------- */
     GRIBDataset 	*poDS;

diff --git a/frmts/gsg/gs7bgdataset.cpp b/frmts/gsg/gs7bgdataset.cpp
@@ -220,7 +220,17 @@ GDALDataset *GS7BGDataset::Open( GDALOpenInfo * poOpenInfo )
     {
         return NULL;
     }
-
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The GS7BG driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
     /* ------------------------------------------------------------------- */
     /*      Create a corresponding GDALDataset.                            */
     /* ------------------------------------------------------------------- */

diff --git a/frmts/gxf/gxfdataset.cpp b/frmts/gxf/gxfdataset.cpp
@@ -287,7 +287,19 @@ GDALDataset *GXFDataset::Open( GDALOpenInfo * poOpenInfo )
 
     if( hGXF == NULL )
         return( NULL );
-
+
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+    if( poOpenInfo->eAccess == GA_Update )
+    {
+        GXFClose(hGXF);
+        CPLError( CE_Failure, CPLE_NotSupported, 
+                  "The GXF driver does not support update access to existing"
+                  " datasets.\n" );
+        return NULL;
+    }
+
 /* -------------------------------------------------------------------- */
 /*      Create a corresponding GDALDataset.                             */
 /* -------------------------------------------------------------------- */

diff --git a/frmts/hdf4/hdf4dataset.cpp b/frmts/hdf4/hdf4dataset.cpp
@@ -1081,12 +1081,27 @@ GDALDataset *HDF4Dataset::Open( GDALOpenInfo * poOpenInfo )
 /* -------------------------------------------------------------------- */
     if ( CSLCount( poDS->papszSubDatasets ) / 2 == 1 )
     {
-	char *pszSDSName;
-	pszSDSName = CPLStrdup( CSLFetchNameValue( poDS->papszSubDatasets,
-				        "SUBDATASET_1_NAME" ));
-	delete poDS;
-	poDS = (HDF4Dataset *) GDALOpen( pszSDSName, GA_ReadOnly );
-	CPLFree( pszSDSName );
+        char *pszSDSName;
+        pszSDSName = CPLStrdup( CSLFetchNameValue( poDS->papszSubDatasets,
+                            "SUBDATASET_1_NAME" ));
+        delete poDS;
+        poDS = (HDF4Dataset *) GDALOpen( pszSDSName, poOpenInfo->eAccess );
+        CPLFree( pszSDSName );
+    }
+    else
+    {
+/* -------------------------------------------------------------------- */
+/*      Confirm the requested access is supported.                      */
+/* -------------------------------------------------------------------- */
+        if( poOpenInfo->eAccess == GA_Update )
+        {
+            delete poDS;
+            CPLError( CE_Failure, CPLE_NotSupported, 
+                      "The HDF4 driver does not support update access to existing"
+                      " datasets.\n" );
+            return NULL;
+        }
+
     }
 
     return( poDS );