From 7011f260617859384379cb9a351eb49983a4b7d1 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 16 Mar 2017 07:44:38 +0100
Subject: dosfs: Fix long file name padding

Close #2934.
---
 cpukit/libfs/src/dosfs/msdos_misc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/libfs/src/dosfs/msdos_misc.c b/cpukit/libfs/src/dosfs/msdos_misc.c
index 321d1be656..3ea462d017 100644
--- a/cpukit/libfs/src/dosfs/msdos_misc.c
+++ b/cpukit/libfs/src/dosfs/msdos_misc.c
@@ -1760,10 +1760,11 @@ msdos_add_file (
 #endif
         for (i = 0; i < MSDOS_LFN_LEN_PER_ENTRY; ++i)
         {
-            if (!(*n == 0 && *(n+1) == 0))
+            if (*n != 0 || *(n + 1) != 0)
             {
                 *p = *n;
-                *(p+1) = *(n+1);
+                *(p + 1) = *(n + 1);
+                n += MSDOS_NAME_LFN_BYTES_PER_CHAR;
             }
             else
             {
@@ -1771,7 +1772,6 @@ msdos_add_file (
                 p [1] = fill;
                 fill = 0xff;
             }
-            n += MSDOS_NAME_LFN_BYTES_PER_CHAR;
 #if MSDOS_FIND_PRINT
             printf ( "'%c''%c'", *p, *(p+1) );
 #endif
-- 
cgit v1.2.3