Changeset 1345 for trunk/dll/command.c

Timestamp:

Dec 19, 2008, 8:23:07 PM (17 years ago)

Author:

Gregg Young

Message:

Code cleanup address some fixmes in command.c; lengthen the command title field

File:

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

trunk/dll/command.c

@@ -66 +66 @@
   PSZ pszCmdLine;
   INT flags;
-  CHAR title[34];
+  CHAR title[100];
 }
 COMMAND;
@@ -345 +345 @@
   PSZ pszCmdLine;
   CHAR title[100];
-  CHAR flags[72];
+  CHAR flags[34];
 
   if (cmdhead)
@@ -358 +358 @@
         if (!xfgets_bstripcr(title, sizeof(title), fp, pszSrcFile, __LINE__))
           break;
-        title[34] = 0;                  // fixme to know why chopped this way?
-        bstripcr(title);
+        title[strlen(title)] = 0;                       // Match size to entry file max
         if (!*title || *title == ';')
           continue;
-        if (!xfgets(pszCmdLine, MaxComLineStrg, fp, pszSrcFile, __LINE__))
+        if (!xfgets_bstripcr(pszCmdLine, MaxComLineStrg, fp, pszSrcFile, __LINE__))
           break;                                /* error! */
-        if (!xfgets(flags, 72, fp, pszSrcFile, __LINE__))
+        if (!xfgets_bstripcr(flags, sizeof(flags), fp, pszSrcFile, __LINE__))
           break;                                /* error! */
-        pszCmdLine[MaxComLineStrg - 1] = 0;                     // fixme to know why chopped this way?
-        bstripcr(pszCmdLine);
+        pszCmdLine[strlen(pszCmdLine)] = 0;                     // fixme to know why chopped this way?
+        //bstripcr(pszCmdLine);
         flags[34] = 0;
-        bstripcr(flags);
+        //bstripcr(flags);
         if (!pszCmdLine)
           continue;
@@ -426 +425 @@
     while (info) {
       fprintf(fp,
-              ";\n%0.34s\n%0.*s\n%lu\n",
+              ";\n%0.99s\n%0.*s\n%lu\n",
               info->title, MaxComLineStrg, info->pszCmdLine, info->flags);
       info = info->next;
@@ -513 +512 @@
     WinSendDlgItemMsg(hwnd, CMD_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
     WinSendDlgItemMsg(hwnd, CMD_CL, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(1000, 0), MPVOID);
+                      MPFROM2SHORT(MaxComLineStrg - 1, 0), MPVOID);
     WinSendDlgItemMsg(hwnd, CMD_TITLE, EM_SETTEXTLIMIT,
-                      MPFROM2SHORT(33, 0), MPVOID);
+                      MPFROM2SHORT(99, 0), MPVOID);
     WinSetDlgItemText(hwnd, CMD_CL, NullStr);
     WinSetDlgItemText(hwnd, CMD_TITLE, NullStr);
@@ -844 +843 @@
     case CMD_DELETE:
       {
-        CHAR temp[34];
-
-        WinQueryDlgItemText(hwnd, CMD_TITLE, 34, temp);
+        CHAR temp[100];
+
+        WinQueryDlgItemText(hwnd, CMD_TITLE, 100, temp);
         bstrip(temp);
         if (!kill_command(temp))