Changeset 350 for trunk/dll/grep.c

Timestamp:

Jul 26, 2006, 9:01:20 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/grep.c (modified) (17 diffs)

trunk/dll/grep.c

@@ -4 +4 @@
   $Id$
 
-  Info window
+  grep tools
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2005 Steven H. Levine
+  Copyright (c) 2001, 2006 Steven H. Levine
 
   12 Feb 03 SHL insert_grepfile: standardize EA math
@@ -15 +15 @@
   06 Jun 05 SHL Drop unused code
   24 Oct 05 SHL dononefile: do not free EA list twice
+  22 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -34 +35 @@
 
 #pragma data_seg(DATA2)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(GREP,SecsSince1980,match,mmatch,dogrep)
 #pragma alloc_text(GREP,doallsubdirs,domatchingfiles)
@@ -464 +468 @@
   /* process all matching files in a directory */
 
-  PFILEFINDBUF4  findBuffer = malloc(grep->FilesToGet * sizeof(FILEFINDBUF4));
+  PFILEFINDBUF4  findBuffer;
   PFILEFINDBUF4  pffbFile;
   register PBYTE fb;
@@ -473 +477 @@
   APIRET         rc;
 
+  findBuffer = xmalloc(grep->FilesToGet * sizeof(FILEFINDBUF4),pszSrcFile,__LINE__);
   if(!findBuffer)
     return 0;
@@ -648 +653 @@
       *p = 0;
       if(!grep->insertffb) {
-        grep->insertffb = malloc(sizeof(FILEFINDBUF4 *) *
-                                 (grep->FilesToGet + 1));
+        grep->insertffb = xmallocz(sizeof(FILEFINDBUF4 *) *
+                                   (grep->FilesToGet + 1),pszSrcFile,__LINE__);
         if(!grep->insertffb)
           return FALSE;
-        memset(grep->insertffb,0,sizeof(FILEFINDBUF4 *) *
-               (grep->FilesToGet + 1));
-        grep->dir = malloc(sizeof(CHAR *) * (grep->FilesToGet + 1));
+        grep->dir = xmallocz(sizeof(CHAR *) * (grep->FilesToGet + 1),pszSrcFile,__LINE__);
         if(!grep->dir) {
           free(grep->insertffb);
           return FALSE;
         }
-        memset(grep->dir,0,sizeof(CHAR *) * (grep->FilesToGet + 1));
-      }
-      grep->insertffb[grep->toinsert] = malloc(sizeof(FILEFINDBUF4));
+      }
+      grep->insertffb[grep->toinsert] = xmalloc(sizeof(FILEFINDBUF4),pszSrcFile,__LINE__);
       if(!grep->insertffb[grep->toinsert])
         return FALSE;
       memcpy(grep->insertffb[grep->toinsert],f,sizeof(FILEFINDBUF4));
-      grep->dir[grep->toinsert] = strdup(szDirectory);
+      grep->dir[grep->toinsert] = xstrdup(szDirectory,pszSrcFile,__LINE__);
       if(!grep->dir) {
         free(grep->insertffb[grep->toinsert]);
@@ -856 +858 @@
 
   if(grep->searchFiles) {
-    input = malloc(65537);
+    input = xmalloc(65537,pszSrcFile,__LINE__);
     if(input) {
-
       LONG len;
-
-      if((inputFile = _fsopen(filename,"rb",SH_DENYNO)) != NULL) {
+      inputFile = _fsopen(filename,"rb",SH_DENYNO);
+      if (inputFile) {
         pos = ftell(inputFile);
         while(!feof(inputFile)) {
@@ -992 +993 @@
 
   *error = 0;
-  buffer = malloc(65535);
-  if(buffer) {
+  buffer = xmalloc(65535,pszSrcFile,__LINE__);
+  if (!buffer)
+    *error = -1;
+  else {
     fp = _fsopen(filename,"rb",SH_DENYNO);
-    if(fp) {
+    if (!fp)
+      *error = -2;
+    else {
       while(!feof(fp)) {
         len = fread(buffer,1,65535,fp);
@@ -1007 +1012 @@
       DosSleep(1L);
     }
-    else
-      *error = -2;
     free(buffer);
   }
-  else
-    *error = -1;
   return CRC;
 }
@@ -1180 +1181 @@
     cntr = 50;
   i = g->dupehead;
-  while(i) {
+  while (i) {
     x++;
     i = i->next;
   }
-  if(x) {
+  if (x) {
     WinSetWindowText(g->hwndCurFile,
                      GetPString(IDS_GREPDUPESORTINGTEXT));
     DosSleep(1L);
     g->dupenames = malloc(sizeof(DUPES *) * (x + 1));
-    if(!g->nosizedupes)
+    if (!g->nosizedupes)
       g->dupesizes = malloc(sizeof(DUPES *) * (x + 1));
-    if(g->dupenames && (g->nosizedupes || g->dupesizes)) {
+    if (g->dupenames && (g->nosizedupes || g->dupesizes)) {
       i = g->dupehead;
       while(i) {
@@ -1201 +1202 @@
       }
       g->dupenames[y] = NULL;
-      if(!g->nosizedupes)
+      if (!g->nosizedupes)
         g->dupesizes[y] = NULL;
       DosSleep(1L);
@@ -1211 +1212 @@
              comparenamesq));
       DosSleep(1L);
-      if(!g->nosizedupes) {
+      if (!g->nosizedupes) {
         qsort(g->dupesizes,
               x,
@@ -1380 +1381 @@
     }
     else {
+      // Insufficient memory - fall back
       DosBeep(50,100);
       WinSetWindowText(g->hwndCurFile,
@@ -1461 +1463 @@
                              &numfiles,
                              &numalloced))
-                  goto BreakOut;
+                  goto BreakOut;                // Failed
                 if(!(i->flags & GF_INSERTED)) {
                   if(AddToList(i->name,
@@ -1467 +1469 @@
                                &numfiles,
                                &numalloced))
-                    goto BreakOut;
+                    goto BreakOut;              // Failed
                 }
                 if(g->sayfiles)
@@ -1507 +1509 @@
   DUPES *info;
 
-  if(*dir) {
-    info = malloc(sizeof(DUPES));
-    if(info) {
-      memset(info,0,sizeof(DUPES));
-      info->name = strdup(dir);
-      if(info->name) {
+  if (*dir) {
+    info = xmallocz(sizeof(DUPES),pszSrcFile,__LINE__);
+    if (!info)
+      return FALSE;
+    else {
+      info->name = xstrdup(dir,pszSrcFile,__LINE__);
+      if (!info->name) {
+        free(info);
+        return FALSE;
+      }
+      else {
         info->size = f->cbFile;
         info->date = f->fdateLastWrite;
@@ -1518 +1525 @@
         info->CRC = -1L;
         g->numfiles++;
-        if(!g->dupehead)
+        if (!g->dupehead)
           g->dupehead = info;
-        if(g->dupelast)
+        if (g->dupelast)
           g->dupelast->next = info;
         g->dupelast = info;
         info->next = NULL;
-        return TRUE;
-      }
-      else
-        free(info);
-    }
-    DosBeep(50,100);
-    return FALSE;
+      }
+    }
   }
   return TRUE;