Changeset 76388e in git

Timestamp:

May 19, 2011, 11:39:26 AM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

8d1a1ab92a3fa4bf30daf110a860313ccf3ef58c

Parents:

9737a6f42bcd9b46097b69c99ba79ee2490e3131

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-19 11:39:26+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:11+01:00

Message:

ADD: improving resource handling (searching files...)

Location:

libpolys/resources

Files:

• feFopen.cc (modified) (4 diffs)
• feFopen.h (modified) (3 diffs)

libpolys/resources/feFopen.cc

@@ -24 +24 @@
 
 FILE * feFopen(const char *path, const char *mode, char *where,
-               int useWerror, int path_only)
+               BOOLEAN useWerror, BOOLEAN path_only)
 {
   char longpath[MAXPATHLEN];
@@ -80 +80 @@
     char *s;
 
-    if (where==NULL) s=(char *)omAlloc(250);
+    if (where==NULL) s=(char *)omAlloc(250 * sizeof(char));
     else             s=where;
 
@@ -122 +122 @@
 }
 
-#ifdef ix86_Win
 // Make sure that mode contains binary option
 FILE* myfopen(const char *path, const char *mode)
 {
+#if (defined(CYGWIN) || defined(ix86_Win))
   char mmode[4];
   int i;
@@ -145 +145 @@
   }
   return fopen(path, mmode);
+#else
+  return fopen(path, mode);
+#endif
 }
-#endif
 // replace "\r\n" by " \n" and "\r" by "\n"
 

libpolys/resources/feFopen.h

@@ -1 +1 @@
 #ifndef FEFOPEN_H
 #define FEFOPEN_H
+
+#include <misc/auxiliary.h>
+
 /*****************************************************************
  *
@@ -6 +9 @@
  *
  *****************************************************************/
-FILE *  feFopen(const char *path, const char *mode, char *where=NULL,
-                int useWerror=FALSE, int path_only=FALSE);
+FILE*feFopen(const char *path, const char *mode, char *where=NULL, BOOLEAN useWerror=FALSE, BOOLEAN path_only=FALSE);
 
 /*
@@ -17 +19 @@
 // do never use fopen and fread
 */
-#if (defined(CYGWIN) || defined(ix86_Win))
 
 FILE *myfopen(const char *path, const char *mode);
-
-#else
-
-#define myfopen fopen
-
-#endif
 
 size_t myfread(void *ptr, size_t size, size_t nmemb, FILE *stream);