Changeset 12344

Timestamp:

10/06/07 00:12:37 (1 year ago)

Author:

warmerdam

Message:

Ensure .ige and .rrd get cleaned up when creating new files (#1784)

Files:

• branches/1.4/gdal/frmts/hfa/hfaopen.cpp (modified) (1 diff)

branches/1.4/gdal/frmts/hfa/hfaopen.cpp

@@ -1760 +1760 @@
-    psInfo->poRoot = new HFAEntry( psInfo, "root", "root", NULL );
-
+/* -------------------------------------------------------------------- */
+/*      If an .ige or .rrd file exists with the same base name,         */
+/*      delete them.  (#1784)                                           */
+/* -------------------------------------------------------------------- */
+    CPLString osExtension = CPLGetExtension(pszFilename);
+    if( !EQUAL(osExtension,"rrd") && !EQUAL(osExtension,"aux") )
+    {
+        CPLString osPath = CPLGetPath( pszFilename );
+        CPLString osBasename = CPLGetBasename( pszFilename );
+        VSIStatBufL sStatBuf;
+        CPLString osSupFile = CPLFormCIFilename( osPath, osBasename, "rrd" );
+
+        if( VSIStatL( osSupFile, &sStatBuf ) == 0 )
+            VSIUnlink( osSupFile );
+
+        osSupFile = CPLFormCIFilename( osPath, osBasename, "ige" );
+
+        if( VSIStatL( osSupFile, &sStatBuf ) == 0 )
+            VSIUnlink( osSupFile );
+    }
+
-    return psInfo;
-}