From 26c8444e1814e06d460b8e6a0f7a89ab86da686f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 15 Feb 2010 17:51:56 +0000 Subject: [PATCH] * filemanip.cc (mklongpath): Simplify backslash folding. --- ChangeLog | 4 ++++ filemanip.cc | 11 ++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 650d9f6b..ebb92630 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-02-15 Corinna Vinschen + + * filemanip.cc (mklongpath): Simplify backslash folding. + 2010-02-15 Corinna Vinschen * filemanip.cc (transform_chars): Drop function. diff --git a/filemanip.cc b/filemanip.cc index efc93daf..627e04f2 100644 --- a/filemanip.cc +++ b/filemanip.cc @@ -207,7 +207,6 @@ mklongpath (wchar_t *tgt, const char *src, size_t len) wchar_t *tp, *ts; size_t ret, n; mbstate_t mb; - bool bs = false; wcscpy (tgt, L"\\\\?\\"); tp = tgt + 4; @@ -236,14 +235,8 @@ mklongpath (wchar_t *tgt, const char *src, size_t len) if (tp >= ts && *tp < 128) *tp = tfx_chars[*tp]; /* Skip multiple backslashes. */ - if (*tp != L'\\') - bs = false; - else - { - if (bs) - continue; - bs = true; - } + if (*tp == L'\\' && tp[-1] == '\\') + continue; ++ret; ++tp; --len; -- 2.43.5