Changeset 989 for trunk/dll/command.c

Timestamp:

Mar 2, 2008, 12:34:12 AM (17 years ago)

Author:

Gregg Young

Message:

Refactor fm3dll.h to create command.h; broken ini is now replaced with backup or new ini as available; more variable command line ledth changes

File:

• trunk/dll/command.c (modified) (11 diffs)

trunk/dll/command.c

@@ -43 +43 @@
 #include "fm3dll.h"
 #include "pathutil.h"                   // NormalizeCmdLine
+#include "command.h"
 
 typedef struct
@@ -308 +309 @@
     next = info->next;
     xfree(info->title);
-    xfree(info->cl);
+    xfree(info->pszCmdLine);
     xfree(info);
     info = next;
@@ -319 +320 @@
   FILE *fp;
   LINKCMDS *info;
-  CHAR cl[1024];
+  PSZ pszCmdLine;
   CHAR title[100];
   CHAR flags[72];
@@ -326 +327 @@
     free_commands();
   cmdloaded = TRUE;
-  save_dir2(cl);
-  if (cl[strlen(cl) - 1] != '\\')
-    strcat(cl, "\\");
-  strcat(cl, "COMMANDS.DAT");
-  fp = _fsopen(cl, "r", SH_DENYWR);
-  if (fp) {
-    while (!feof(fp)) {
-      if (!xfgets_bstripcr(title, sizeof(title), fp, pszSrcFile, __LINE__))
-        break;
-      title[34] = 0;                    // fixme to know why chopped this way?
-      bstripcr(title);
-      if (!*title || *title == ';')
-        continue;
-      if (!xfgets(cl, sizeof(cl), fp, pszSrcFile, __LINE__))
-        break;                          /* error! */
-      if (!xfgets(flags, 72, fp, pszSrcFile, __LINE__))
-        break;                          /* error! */
-      cl[1000] = 0;                     // fixme to know why chopped this way?
-      bstripcr(cl);
-      flags[34] = 0;
-      bstripcr(flags);
-      if (!*cl)
-        continue;
-      info = xmallocz(sizeof(LINKCMDS), pszSrcFile, __LINE__);
-      if (info) {
-        info->cl = xstrdup(cl, pszSrcFile, __LINE__);
-        info->title = xstrdup(title, pszSrcFile, __LINE__);
-        info->flags = atol(flags);
-        if (!info->cl || !info->title) {
-          xfree(info->cl);
-          xfree(info->title);
-          xfree(info);
-          break;
-        }
-        if (!cmdhead)
-          cmdhead = info;
-        else {
-          cmdtail->next = info;
-          info->prev = cmdtail;
-        }
-        cmdtail = info;
-      }
-    }
-    fclose(fp);
+  pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (pszCmdLine) {
+    save_dir2(pszCmdLine);
+    if (pszCmdLine[strlen(pszCmdLine) - 1] != '\\')
+      strcat(pszCmdLine, "\\");
+    strcat(pszCmdLine, "COMMANDS.DAT");
+    fp = _fsopen(pszCmdLine, "r", SH_DENYWR);
+    if (fp) {
+      while (!feof(fp)) {
+        if (!xfgets_bstripcr(title, sizeof(title), fp, pszSrcFile, __LINE__))
+          break;
+        title[34] = 0;                  // fixme to know why chopped this way?
+        bstripcr(title);
+        if (!*title || *title == ';')
+          continue;
+        if (!xfgets(pszCmdLine, MaxComLineStrg, fp, pszSrcFile, __LINE__))
+          break;                                /* error! */
+        if (!xfgets(flags, 72, fp, pszSrcFile, __LINE__))
+          break;                                /* error! */
+        pszCmdLine[MaxComLineStrg - 1] = 0;                     // fixme to know why chopped this way?
+        bstripcr(pszCmdLine);
+        flags[34] = 0;
+        bstripcr(flags);
+        if (!pszCmdLine)
+          continue;
+        info = xmallocz(sizeof(LINKCMDS), pszSrcFile, __LINE__);
+        if (info) {
+          info->pszCmdLine = xstrdup(pszCmdLine, pszSrcFile, __LINE__);
+          info->title = xstrdup(title, pszSrcFile, __LINE__);
+          info->flags = atol(flags);
+          if (!info->pszCmdLine || !info->title) {
+            xfree(info->pszCmdLine);
+            xfree(info->title);
+            xfree(info);
+            break;
+          }
+          if (!cmdhead)
+            cmdhead = info;
+          else {
+            cmdtail->next = info;
+            info->prev = cmdtail;
+          }
+          cmdtail = info;
+        }
+      }
+      xfree(pszCmdLine);
+      fclose(fp);
+    }
   }
 }
@@ -392 +397 @@
     while (info) {
       fprintf(fp,
-              ";\n%0.34s\n%0.1000s\n%lu\n",
-              info->title, info->cl, info->flags);
+              ";\n%0.34s\n%0.*s\n%lu\n",
+              info->title, MaxComLineStrg, info->pszCmdLine, info->flags);
       info = info->next;
     }
@@ -417 +422 @@
   if (!info)
     return NULL;
-  info->cl = xstrdup(addme->pszCmdLine, pszSrcFile, __LINE__);
+  info->pszCmdLine = xstrdup(addme->pszCmdLine, pszSrcFile, __LINE__);
   info->title = xstrdup(addme->title, pszSrcFile, __LINE__);
   if (addme->flags)
     info->flags = addme->flags;
-  if (!info->cl || !info->title) {
-    xfree(info->cl);
+  if (!info->pszCmdLine || !info->title) {
+    xfree(info->pszCmdLine);
     xfree(info->title);
     xfree(info);
@@ -459 +464 @@
             cmdtail = info->prev;
         }
-        xfree(info->cl);
+        xfree(info->pszCmdLine);
         xfree(info->title);
         xfree(info);
@@ -525 +530 @@
             break;
           }
-          WinSetDlgItemText(hwnd, CMD_CL, info->cl);
+          WinSetDlgItemText(hwnd, CMD_CL, info->pszCmdLine);
           if (!(info->flags & 1023))
             WinCheckButton(hwnd, CMD_DEFAULT, TRUE);
@@ -548 +553 @@
             *env = 0;
             size = sizeof(env) - 1;
-            if (PrfQueryProfileData(fmprof, FM3Str, info->cl, env, &size) &&
+            if (PrfQueryProfileData(fmprof, FM3Str, info->pszCmdLine, env, &size) &&
                 *env)
               WinSetDlgItemText(hwnd, CMD_ENVIRON, env);
@@ -1020 +1025 @@
         fakelist[1] = NULL;
         ExecOnList(hwnd,
-                   info->cl,
+                   info->pszCmdLine,
                    flags, NULL, fakelist, GetPString(IDS_EXECCMDTITLETEXT),
                    pszSrcFile, __LINE__);
@@ -1027 +1032 @@
     else
       ExecOnList(hwnd,
-                 info->cl,
+                 info->pszCmdLine,
                  flags, NULL, list, GetPString(IDS_EXECCMDTITLETEXT),
                  pszSrcFile, __LINE__);