update for HEAD-2003021201

[reactos.git] / lib / crtdll / stdlib / makepath.c

diff --git a/lib/crtdll/stdlib/makepath.c b/lib/crtdll/stdlib/makepath.c
index ebc59aa..da9e543 100644 (file)
--- a/lib/crtdll/stdlib/makepath.c
+++ b/lib/crtdll/stdlib/makepath.c
@@ -1,33 +1,29 @@
 /* $Id$
  */
-#include <crtdll/stdlib.h>
-#include <crtdll/string.h>
+#include <msvcrt/stdlib.h>
+#include <msvcrt/string.h>
 
 void _makepath(char *path, const char *drive, const char *dir, const char *fname, const char *ext)
 {
   int dir_len;
 
-  if ((drive != NULL) && (*drive))
-    {
+    if ((drive != NULL) && (*drive)) {
       strcpy(path, drive);
       strcat(path, ":");
+    } else {
+        (*path)=0;
     }
-  else
-    (*path)=0;
 
-  if (dir != NULL)
-    {
+    if (dir != NULL) {
       strcat(path, dir);
       dir_len = strlen(dir);
       if (dir_len && *(dir + dir_len - 1) != '\\')
        strcat(path, "\\");
     }
 
-  if (fname != NULL)
-    {
+    if (fname != NULL) {
       strcat(path, fname);
-      if (ext != NULL && *ext != 0)
-       {
+        if (ext != NULL && *ext != 0) {
          if (*ext != '.')
            strcat(path, ".");
        strcat(path, ext);