From 6acb80e5fd8f82f6fc25bdbc3bdf508bb0895c27 Mon Sep 17 00:00:00 2001 From: morkt Date: Mon, 17 Aug 2015 07:08:49 +0400 Subject: [PATCH] (WagOpener): strip possible drive specification from file names. --- ArcFormats/ArcWAG.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ArcFormats/ArcWAG.cs b/ArcFormats/ArcWAG.cs index a9329dd7..9c1f707e 100644 --- a/ArcFormats/ArcWAG.cs +++ b/ArcFormats/ArcWAG.cs @@ -28,6 +28,7 @@ using System.Collections.Generic; using System.ComponentModel.Composition; using System.IO; using System.Linq; +using System.Text.RegularExpressions; using GameRes.Utility; namespace GameRes.Formats.Xuse @@ -161,7 +162,7 @@ namespace GameRes.Formats.Xuse Entry entry; if (!string.IsNullOrEmpty (filename)) { - filename = filename.TrimStart ('\\'); + filename = DriveRe.Replace (filename, ""); entry = FormatCatalog.Instance.CreateEntry (filename); } else @@ -178,6 +179,8 @@ namespace GameRes.Formats.Xuse return new WagArchive (file, this, dir, data_key); } + static readonly Regex DriveRe = new Regex (@"^(?:.+:)?\\+"); + public override Stream OpenEntry (ArcFile arc, Entry entry) { var warc = arc as WagArchive;