Changeset 347 for trunk/dll/copyf.c

Timestamp:

Jul 26, 2006, 7:43:28 AM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/copyf.c (modified) (24 diffs)

trunk/dll/copyf.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2005 Steven H.Levine
+  Copyright (c) 2001, 2006 Steven H.Levine
 
   14 Sep 02 SHL Drop obsolete debug code
   14 Oct 02 SHL Drop obsolete debug code
   10 Nov 02 SHL docopyf - don't forget to terminate longname
-                        optimize longname logic
+                optimize longname logic
   01 Aug 04 SHL Rework lstrip/rstrip usage
   28 May 05 SHL Drop debug code
+  14 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -21 +22 @@
 #define INCL_DOSERRORS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <io.h>
 #include <string.h>
@@ -30 +31 @@
 #include <ctype.h>
 #include <time.h>
+
 #include "fm3dll.h"
+#include "fm3str.h"
+
+static PSZ pszSrcFile = __FILE__;
 
 #ifndef WinMoveObject
@@ -49 +54 @@
 
 
-char *MakeTempName (char *buffer) {
-
+char *MakeTempName (char *buffer)
+{
   FILESTATUS3 fs3;
   APIRET      rc;
@@ -91 +96 @@
 
 
-CHAR *TruncName (CHAR *oldname,CHAR *buffer) {
-
+CHAR *TruncName (CHAR *oldname,CHAR *buffer)
+{
   CHAR       *p,*f,*s,*o;
   FILESTATUS3 fs3;
@@ -188 +193 @@
 
 
-CHAR *GetLongName (CHAR *oldname,CHAR *longname) {
-
+CHAR *GetLongName (CHAR *oldname,CHAR *longname)
+{
   if(!longname)
     return NULL;
@@ -219 +224 @@
       *value = 0;
     }
-    pgealist = malloc(sizeof(GEA2LIST) + 32);
-    if(pgealist) {
-      memset(pgealist,0,sizeof(GEA2LIST) + 32);
+    pgealist = xmallocz(sizeof(GEA2LIST) + 32,pszSrcFile,__LINE__);
+    if (pgealist) {
       pgea = &pgealist->list[0];
       strcpy(pgea->szName,LONGNAME);
@@ -227 +231 @@
       pgea->oNextEntryOffset = 0L;
       pgealist->cbList = (sizeof(GEA2LIST) + pgea->cbName);
-      pfealist = malloc(1536);
-      if(pfealist) {
-        memset(pfealist,0,1024);
+      pfealist = xmallocz(1536,pszSrcFile,__LINE__);
+      if (pfealist) {
         pfealist->cbList = 1024;
         eaop.fpGEA2List = pgealist;
@@ -258 +261 @@
 
 
-BOOL ZapLongName (char *filename) {
-
+BOOL ZapLongName (char *filename)
+{
   return WriteLongName(filename, "");
 }
 
 
-BOOL WriteLongName (CHAR *filename,CHAR *longname) {
-
+BOOL WriteLongName (CHAR *filename,CHAR *longname)
+{
   APIRET    rc;
   EAOP2     eaop;
@@ -293 +296 @@
   else
     ealen = sizeof(FEALIST) + 10;
-  if(!DosAllocMem((PPVOID)&pfealist,
-                  ealen + 32L,
-                  OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE)) {
+  rc = DosAllocMem((PPVOID)&pfealist,
+                   ealen + 32L,
+                   OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
+  if (rc)
+    Dos_Error(MB_CANCEL,rc,HWND_DESKTOP,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
+  else {
     memset(pfealist,
            0,
@@ -335 +341 @@
 
 
-BOOL AdjustWildcardName (CHAR *oldname,CHAR *newname) {
-
+BOOL AdjustWildcardName (CHAR *oldname,CHAR *newname)
+{
   BOOL ret = FALSE;
 
@@ -365 +371 @@
 
 
-CHAR default_disk (VOID) {
-
+CHAR default_disk (VOID)
+{
   ULONG ulDriveNum,ulDriveMap;
 
@@ -377 +383 @@
 #ifdef NEVER
 
-APIRET docopyallf (INT type,CHAR *oldname,CHAR *newname,...) {
-
+APIRET docopyallf (INT type,CHAR *oldname,CHAR *newname,...)
+{
   FILEFINDBUF3 fb;
   ULONG        nm;
@@ -421 +427 @@
 
 
-APIRET docopyf (INT type,CHAR *oldname,CHAR *newname,...) {
-
+APIRET docopyf (INT type,CHAR *oldname,CHAR *newname,...)
+{
   /*
    * returns:
@@ -766 +772 @@
 
     default:  /* shouldn't happen */
-      DosBeep(50,100);
+      Runtime_Error(pszSrcFile, __LINE__, "bad case %u", type);
       break;
   }
@@ -773 +779 @@
 
 
-INT make_deleteable (CHAR *filename) {
-
+INT make_deleteable (CHAR *filename)
+{
   INT ret = -1;
   FILESTATUS3 fsi;
@@ -796 +802 @@
 
 
-INT wipeallf (CHAR *string,...) {
-
+INT wipeallf (CHAR *string,...)
+{
   /* unlink everything from directory on down... */
 
@@ -820 +826 @@
   }
 
-  str = strdup(s);
+  str = xstrdup(s,pszSrcFile,__LINE__);
   if(!str)
     return -1;
@@ -832 +838 @@
       temp = *p;
       *p = 0;
-      if(IsRoot(str) || !IsFullName(str)) {   /* under no circumstances! */
+      if(IsRoot(str) || !IsFullName(str)) {
+        /* under no circumstances! */
+        Runtime_Error(pszSrcFile, __LINE__, "bad name %s", str);
         free(str);
-        DosBeep(100,250);
         return -1;
       }
@@ -856 +863 @@
   }
 
-  ss = (CHAR *)malloc(CCHMAXPATH);
-  f = (FILEFINDBUF3 *)malloc(sizeof(FILEFINDBUF3));
-  if(!ss || !f) {
-    if(ss)
-      free(ss);
-    if(f)
-      free(f);
+  ss = xmalloc(CCHMAXPATH,pszSrcFile,__LINE__);
+  f = xmalloc(sizeof(FILEFINDBUF3),pszSrcFile,__LINE__);
+  if (!ss || !f) {
+    xfree(ss);
+    xfree(f);
     free(str);
     return -1;
@@ -915 +920 @@
 
 
-INT unlink_allf (CHAR *string,...) {
-
+INT unlink_allf (CHAR *string,...)
+{
   /* wildcard delete */
 
@@ -938 +943 @@
   }
 
-  str = strdup(s);
-  if(!str)
+  str = xstrdup(s,pszSrcFile,__LINE__);
+  if (!str)
     return -1;
 
@@ -953 +958 @@
     *s = 0;
 
-  ss = (CHAR *)malloc(CCHMAXPATH);
-  f = (FILEFINDBUF3 *)malloc(sizeof(FILEFINDBUF3));
-  if(!ss || !f) {
-    if(ss)
-      free(ss);
-    if(f)
-      free(f);
+  ss = xmalloc(CCHMAXPATH,pszSrcFile,__LINE__);
+  f = xmalloc(sizeof(FILEFINDBUF3),pszSrcFile,__LINE__);
+  if (!ss || !f) {
+    xfree(ss);
+    xfree(f);
     free(str);
     return -1;
@@ -991 +994 @@
 
 
-INT unlinkf (CHAR *string,...) {
-
+INT unlinkf (CHAR *string,...)
+{
   CHAR buffer[CCHMAXPATH];
   va_list ap;