[Freedos-cvs] SF.net SVN: freedos:[1623] freecom/trunk

[<bar...@us...>]

Revision: 1623
          http://freedos.svn.sourceforge.net/freedos/?rev=1623&view=rev
Author:   bartoldeman
Date:     2011-06-05 23:55:13 +0000 (Sun, 05 Jun 2011)

Log Message:
-----------
Eliminate read() by using _read() everywhere.

Modified Paths:
--------------
    freecom/trunk/cmd/dir.c
    freecom/trunk/lib/messages.c
    freecom/trunk/lib/res_r.c
    freecom/trunk/tools/ptchsize.c

Modified: freecom/trunk/cmd/dir.c
===================================================================
--- freecom/trunk/cmd/dir.c	2011-06-05 16:24:44 UTC (rev 1622)
+++ freecom/trunk/cmd/dir.c	2011-06-05 23:55:13 UTC (rev 1623)
@@ -298,7 +298,7 @@
 {
   /* skip blank lines and any initial spaces, also exit early on any read error */
   do {
-    if (read(fDescription, buf, 1) != 1)
+    if (_read(fDescription, buf, 1) != 1)
     {
       /*printf("[read error]\n");*/
       *buf = '\0';
@@ -313,7 +313,7 @@
       maxlen--;
       buf++;
     }
-    if (read(fDescription, buf, 1) != 1)
+    if (_read(fDescription, buf, 1) != 1)
       break;
   } while ( (*buf!='\r') && (*buf!='\n') && 
             (*buf!=0x4/*Ctrl-D*/) && (*buf!=26/*Ctrl-Z*/) &&
@@ -324,7 +324,7 @@
   if (!fn) 
     while ( (*buf!='\r') && (*buf!='\n') )
     {
-      if (read(fDescription, buf, 1) != 1)
+      if (_read(fDescription, buf, 1) != 1)
         break;
     }
 
@@ -1022,7 +1022,7 @@
   path[pathlen - 1] = '\\';
 #ifdef FEATURE_DESCRIPT_ION
   strcpy(&path[pathlen], "DESCRIPT.ION");
-  descriptionExists = ((fDescription = open(path, O_RDONLY | O_BINARY)) >= 0);
+  descriptionExists = ((fDescription = _open(path, O_RDONLY)) >= 0);
 #endif
   strcpy(&path[pathlen], pattern);
 

Modified: freecom/trunk/lib/messages.c
===================================================================
--- freecom/trunk/lib/messages.c	2011-06-05 16:24:44 UTC (rev 1622)
+++ freecom/trunk/lib/messages.c	2011-06-05 23:55:13 UTC (rev 1623)
@@ -120,7 +120,7 @@
 	}
 
 	error = 0;
-	if(read(fd, fdid, sizeof(STRINGS_ID) - 1) != sizeof(STRINGS_ID) - 1)
+	if(_read(fd, fdid, sizeof(STRINGS_ID) - 1) != sizeof(STRINGS_ID) - 1)
 		error = 1;
 
 	if (memcmp(fdid, STRINGS_ID, sizeof(STRINGS_ID) - 1)) {
@@ -133,8 +133,8 @@
 
 		/* Read the strings dimensionating parameters */
 	if(error
-	 || read(fd, &strCnt, sizeof(strCnt)) != sizeof(strCnt)
-	 || read(fd, &len, sizeof(len)) != sizeof(len)) { /* Read error */
+	 || _read(fd, &strCnt, sizeof(strCnt)) != sizeof(strCnt)
+	 || _read(fd, &len, sizeof(len)) != sizeof(len)) { /* Read error */
 	 	*ls = STRINGS_READ_ERROR;
 	 	return 0;			/* Continue searching */
 	}

Modified: freecom/trunk/lib/res_r.c
===================================================================
--- freecom/trunk/lib/res_r.c	2011-06-05 16:24:44 UTC (rev 1622)
+++ freecom/trunk/lib/res_r.c	2011-06-05 23:55:13 UTC (rev 1623)
@@ -83,7 +83,10 @@
 #include <io.h>		/* filelength */
 
 #include "../include/resource.h"
-
+#ifndef PTCHSIZE
+#include "../include/misc.h"
+#endif
+ 
 int enumFileResources(const char *const fnam
 	, res_majorid_t id
 	, res_callbackp_t fct
@@ -98,7 +101,11 @@
 		return -1;
 
 	rc = 0;
+#ifdef PTCHSIZE
 	if((fd = open(fnam, O_RDONLY | O_BINARY)) < 0) {
+#else
+	if((fd = _open(fnam, O_RDONLY)) < 0) {
+#endif
 	 	rc = -1;
 	 	dprintf(("[RES: Failed to open file: %s]\n", fnam));
 #ifdef DEBUG
@@ -114,7 +121,7 @@
 		if(pos <= sizeof(res)				/* file corruption */
 		 		/* read and verify the resource ID block */
 		 || lseek(fd, pos -= sizeof(res), SEEK_SET) < 0		/* seek error */
-	     || read(fd, &res, sizeof(res)) != sizeof(res)		/* read error */
+	     || _read(fd, &res, sizeof(res)) != sizeof(res)		/* read error */
 		 					/* file corruption as magic string is missing */
 		 || memcmp(res.res_cookie, RES_COOKIE, sizeof(res.res_cookie)) != 0
 		 		/* file corruption: not that many bytes left in file */

Modified: freecom/trunk/tools/ptchsize.c
===================================================================
--- freecom/trunk/tools/ptchsize.c	2011-06-05 16:24:44 UTC (rev 1622)
+++ freecom/trunk/tools/ptchsize.c	2011-06-05 23:55:13 UTC (rev 1623)
@@ -32,6 +32,7 @@
 	unsigned long heapPos;
 } ival;
 
+#define PTCHSIZE
 #include "../lib/res_r.c"		/* make a single file project */
 
 int getInfo (res_majorid_t major,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.