Changeset 345 for trunk/dll/cmdline.c

Timestamp:

Jul 26, 2006, 7:34:36 AM (19 years ago)

Author:

root

Message:

Check more run time errors

File:

• trunk/dll/cmdline.c (modified) (21 diffs)

trunk/dll/cmdline.c

@@ -4 +4 @@
   $Id$
 
+  User defined commands support
+
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2005 Steven H.Levine
+  Copyright (c) 2004, 2006 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
   05 Jun 05 SHL Use QWL_USER
+  22 Jul 06 SHL Check more run time errors
 
 ***********************************************************************/
@@ -14 +17 @@
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -21 +24 @@
 #include <ctype.h>
 #include <share.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -26 +30 @@
 #include "mle.h"
 
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(CMDLINE1,CmdLineDlgProc,CmdListSubProc,CmdLine2DlgProc,CmdBtnSubProc)
 #pragma alloc_text(CMDLINE2,save_cmdlines,load_cmdlines,add_cmdline,remove_cmdline,free_cmdlines)
@@ -40 +46 @@
 
 
-VOID load_cmdlines (BOOL big) {
-
+VOID load_cmdlines (BOOL big)
+{
   /* load linked list of cmdlines from CMDLINES.DAT file */
 
@@ -59 +65 @@
   strcat(s,(big) ? "CMDLINES.DAT" : "CMDMINI.DAT");
   fp = _fsopen(s,"r",SH_DENYWR);
-  if(fp) {
-    while(x < MAXNUMCLS && !feof(fp)) {
-      if(!fgets(s,sizeof(s),fp))
+  if (fp) {
+    while (x < MAXNUMCLS && !feof(fp)) {
+      if (!fgets(s,sizeof(s),fp))
         break;
       s[sizeof(s) - 1] = 0;
       bstripcr(s);
-      if(*s && *s != ';') {
-        info = malloc(sizeof(LINKCLS));
-        if(info) {
+      if (*s && *s != ';') {
+        info = xmalloc(sizeof(LINKCLS), pszSrcFile, __LINE__);
+        if (info) {
           x++;
-          info->cl = strdup(s);
-          if(info->cl) {
+          info->cl = xstrdup(s, pszSrcFile, __LINE__);
+          if (!info->cl)
+            free(info);
+          else {
             info->next = NULL;
-            if(!clhead)
+            if (!clhead)
               clhead = info;
             else
@@ -78 +86 @@
             last = info;
           }
-          else
-            free(info);
         }
       }
@@ -85 +91 @@
     fclose(fp);
   }
-  if(big)
+  if (big)
     clbig = clhead;
   else
@@ -92 +98 @@
 
 
-VOID save_cmdlines (BOOL big) {
-
+VOID save_cmdlines (BOOL big)
+{
   /* save linked list of cmdlines to CMDLINES.DAT file */
 
@@ -107 +113 @@
     strcat(s,"\\");
   strcat(s,(big) ? "CMDLINES.DAT" : "CMDMINI.DAT");
-  if(clhead) {
-    fp = fopen(s,"w");
-    if(fp) {
+  if (clhead) {
+    fp = xfopen(s,"w",pszSrcFile,__LINE__);
+    if (fp) {
       fputs(GetPString(IDS_COMMANDFILE2TEXT),fp);
       info = clhead;
@@ -121 +127 @@
   else
     unlink(s);
-  if(big)
+  if (big)
     clbig = clhead;
   else
@@ -128 +134 @@
 
 
-BOOL add_cmdline (CHAR *cl,BOOL big) {
-
+BOOL add_cmdline (CHAR *cl,BOOL big)
+{
   LINKCLS *info,*last = NULL,*clhead;
   INT      x = 0;
@@ -139 +145 @@
     load_cmdlines(big);
   info = clhead;
-  while(info) {
-    if(!stricmp(info->cl,cl))
+  while (info) {
+    if (!stricmp(info->cl,cl))
       return FALSE;
     last = info;
@@ -146 +152 @@
     x++;
   }
-  info = malloc(sizeof(LINKCLS));
-  if(info) {
-    info->cl = strdup(cl);
-    if(info->cl) {
+  info = xmalloc(sizeof(LINKCLS), pszSrcFile, __LINE__);
+  if (info) {
+    info->cl = xstrdup(cl, pszSrcFile, __LINE__);
+    if (!info->cl)
+      free(info);
+    else {
       info->next = NULL;
-      if(!clhead)
+      if (!clhead)
         clhead = info;
       else
         last->next = info;
-      if(x > MAXNUMCLS) {
+      if (x > MAXNUMCLS) {
         info = clhead;
         clhead = clhead->next;
@@ -166 +174 @@
       return TRUE;
     }
-    else
-      free(info);
   }
   return FALSE;
@@ -173 +179 @@
 
 
-BOOL remove_cmdline (CHAR *cl,BOOL big) {
-
+BOOL remove_cmdline (CHAR *cl,BOOL big)
+{
   LINKCLS *info,*last = NULL,*clhead;
 
@@ -204 +210 @@
 
 
-VOID free_cmdlines (BOOL big) {
-
+VOID free_cmdlines (BOOL big)
+{
   LINKCLS *info,*next,*clhead;
 
@@ -225 +231 @@
 
 
-MRESULT EXPENTRY CmdBtnSubProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY CmdBtnSubProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   switch(msg) {
     case WM_MOUSEMOVE:
@@ -274 +280 @@
 
 
-MRESULT EXPENTRY CmdListSubProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY CmdListSubProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   PFNWP oldproc = (PFNWP)WinQueryWindowPtr(hwnd,0);
 
@@ -302 +308 @@
 
 
-MRESULT EXPENTRY CmdLineDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY CmdLineDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   EXECARGS *ex;
 
@@ -781 +787 @@
 
 
-MRESULT EXPENTRY CmdLine2DlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY CmdLine2DlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   switch(msg) {
     case WM_INITDLG: