refactor: restructure the user space stuff.

[lunaix-os.git] / lunaix-os / kernel / fs / iso9660 / directory.c

diff --git a/lunaix-os/kernel/fs/iso9660/directory.c b/lunaix-os/kernel/fs/iso9660/directory.c
index 1d35978b06f84b3ead66688b1b661a875bb13a38..5a06fc8b39eab5308d975ee4565359e0d0a6e530 100644 (file)
--- a/lunaix-os/kernel/fs/iso9660/directory.c
+++ b/lunaix-os/kernel/fs/iso9660/directory.c
@@ -6,7 +6,7 @@
 
 #include <klibc/string.h>
 
 
 #include <klibc/string.h>
 

-#include <sys/dirent_defs.h>
+#include <usr/lunaix/dirent_defs.h>

 
 extern struct cake_pile* drec_cache_pile;
 
 
 extern struct cake_pile* drec_cache_pile;
 


@@ -52,10 +52,12 @@ done:
         u32_t l = drec->name.len;
         while (l < (u32_t)-1 && drec->name.content[l--] != ';')
             ;
         u32_t l = drec->name.len;
         while (l < (u32_t)-1 && drec->name.content[l--] != ';')
             ;

+

         l = (l + 1) ? l : drec->name.len;
         l = MIN(l, ISO9660_IDLEN - 1);
 
         l = (l + 1) ? l : drec->name.len;
         l = MIN(l, ISO9660_IDLEN - 1);
 

-        strncpy(cache->name_val, drec->name.content, l);
+        strncpy(cache->name_val, (const char*)drec->name.content, l);
+

         cache->name = HSTR(cache->name_val, l);
         hstr_rehash(&cache->name, HSTR_FULL_HASH);
     }
         cache->name = HSTR(cache->name_val, l);
         hstr_rehash(&cache->name, HSTR_FULL_HASH);
     }