X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=sdk%2Ftools%2Fmkhive%2Fmkhive.c;h=b7e370117fd5fcce020ae698e2108fe078f31ff9;hp=ad667fd43f5815a75eb106c2576ccf3d1ca66556;hb=da019b0fc57ac4c6b9a161332a576693c6e8ccd9;hpb=efbe071e02e10a29e173b7f4c44959aaea5cf857

diff --git a/sdk/tools/mkhive/mkhive.c b/sdk/tools/mkhive/mkhive.c
index ad667fd43f5..b7e370117fd 100644
--- a/sdk/tools/mkhive/mkhive.c
+++ b/sdk/tools/mkhive/mkhive.c
@@ -26,6 +26,8 @@
  *                  Hermès Bélusca-Maïto
  */
 
+/* INCLUDES *****************************************************************/
+
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
@@ -48,6 +50,7 @@
 #define DIR_SEPARATOR_STRING "\\"
 #endif
 
+/* FUNCTIONS ****************************************************************/
 
 void usage(void)
 {
@@ -91,7 +94,8 @@ void convert_path(char *dst, char *src)
 int main(int argc, char *argv[])
 {
     INT ret;
-    UINT i;
+    INT i;
+    PSTR ptr;
     BOOL UpperCaseFileName = FALSE;
     PCSTR HiveList = NULL;
     CHAR DestPath[PATH_MAX] = "";
@@ -106,15 +110,15 @@ int main(int argc, char *argv[])
     printf("Binary hive maker\n");
 
     /* Read the options */
-    for (i = 1; i < argc && (*argv[i] == '-' || *argv[i] == '/'); i++)
+    for (i = 1; i < argc && *argv[i] == '-'; i++)
     {
-        if (argv[i][1] == '?' && argv[i][1] == 0)
+        if (argv[i][1] == '?' && argv[i][2] == 0)
         {
             usage();
             return 0;
         }
 
-        if (argv[i][1] == 'u' && argv[i][1] == 0)
+        if (argv[i][1] == 'u' && argv[i][2] == 0)
         {
             UpperCaseFileName = TRUE;
         }
@@ -173,6 +177,9 @@ int main(int argc, char *argv[])
 
         strcpy(FileName, DestPath);
         strcat(FileName, DIR_SEPARATOR_STRING);
+
+        ptr = FileName + strlen(FileName);
+
         strcat(FileName, RegistryHives[i].HiveName);
 
         /* Exception for the special setup registry hive */
@@ -183,15 +190,13 @@ int main(int argc, char *argv[])
         /* Adjust file name case if needed */
         if (UpperCaseFileName)
         {
-            PSTR ptr = FileName;
-            while (*ptr)
-                *ptr++ = toupper(*ptr);
+            for (; *ptr; ++ptr)
+                *ptr = toupper(*ptr);
         }
         else
         {
-            PSTR ptr = FileName;
-            while (*ptr)
-                *ptr++ = tolower(*ptr);
+            for (; *ptr; ++ptr)
+                *ptr = tolower(*ptr);
         }
 
         if (!ExportBinaryHive(FileName, RegistryHives[i].CmHive))