X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debugger%2Fmcs51%2Fsdcdb.c;fp=debugger%2Fmcs51%2Fsdcdb.c;h=87dee32f525f9ef2bc7b1b7922cde718138a6b27;hb=218c0cb45cb377b23593125418f8e837ee0f72d5;hp=5f764b301ccb459ff742c2a85a8cbb122a88454a;hpb=e5eda9d6a5ea34e83b0b1fdcf05db3b04b7aaac8;p=fw%2Fsdcc

diff --git a/debugger/mcs51/sdcdb.c b/debugger/mcs51/sdcdb.c
index 5f764b30..87dee32f 100644
--- a/debugger/mcs51/sdcdb.c
+++ b/debugger/mcs51/sdcdb.c
@@ -433,7 +433,7 @@ static void loadModules (void)
         switch (loop->type) {
         /* for module records do */
         case MOD_REC:
-            currMod = parseModule(loop->line,TRUE);
+            currMod = parseModule(loop->line, TRUE);
             currModName = currMod->name ;
 
             currMod->cfullname = searchDirsFname(currMod->c_name);
@@ -690,7 +690,11 @@ int cmdFile (char *s,context *cctxt)
     specialFunctionRegs();
 
     /* start the simulator & setup connection to it */
+#ifdef _WIN32
+    if (INVALID_SOCKET == sock)
+#else
     if ( sock == -1 )
+#endif
         openSimulator((char **)simArgs,nsimArgs);
     fprintf(stdout,"%s",simResponse());
     /* now send the filename to be loaded to the simulator */
@@ -1095,7 +1099,16 @@ static void parseCmdLine (int argc, char **argv)
                 continue ;
             }
 
-            filename = strtok(argv[i],".");
+            if (-1 != access(argv[i], 0)) {
+            	/* file exists: strip the cdb or ihx externsion */
+                filename = argv[i];
+            	char *p = strrchr(argv[i], '.');
+
+            	if (NULL != p &&
+                    (0 == strcmp(p, ".dcb") || 0 == strcmp(p, ".ihx")))
+                    *p = '\0';
+            }
+            filename = argv[i];
 
         }
     }