Changeset 103906 in git

Timestamp:

May 5, 2010, 4:59:31 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

46395adbff400b36355a33ababfad210868c806a

Parents:

371bc5f2b1adfa76d36a0242eb9c7d7cb44b9b92

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-05-05 16:59:31+02:00

git-committer:

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

Message:

directory resources created

Files:

• coeffs/Makefile.in (modified) (1 diff)
• kernel/febase.cc (modified) (2 diffs)
• kernel/febase.h (modified) (3 diffs)
• resource/feResource.cc (moved) (moved from kernel/feResource.cc)

coeffs/Makefile.in

@@ -1 @@
-  #################################################################
+#################################################################
 ###
 ### Makefile for Singular

kernel/febase.cc

@@ -675 +675 @@
   return p;
 }
-/*****************************************************************
- *
- * File handling
- *
- *****************************************************************/
-
-FILE * feFopen(const char *path, const char *mode, char *where,
-               int useWerror, int path_only)
-{
-  char longpath[MAXPATHLEN];
-  if (path[0]=='~')
-  {
-    if (path[1] == DIR_SEP)
-    {
-      const char* home = getenv("HOME");
-#ifdef ix86_Win
-      if ((home==NULL)||(!access(home,X_OK)))
-        home = getenv("SINGHOME");
-#endif
-      if (home != NULL)
-      {
-        strcpy(longpath, home);
-        strcat(longpath, &(path[1]));
-        path = longpath;
-      }
-    }
-#if defined(HAVE_PWD_H) && defined(HAVE_GETPWNAM)
-    else
-    {
-      char* dir_sep;
-      struct passwd *pw_entry;
-      strcpy (longpath, path);
-      dir_sep = strchr(longpath, DIR_SEP);
-      if (dir_sep==NULL) 
-      {
-        Werror(" illegal ~ in filename >>%s<<",longpath);
-        return NULL;
-      }
-      *dir_sep = '\0';
-      pw_entry = getpwnam(&longpath[1]);
-      if (pw_entry != NULL)
-      {
-        strcpy(longpath, pw_entry->pw_dir);
-        dir_sep = strchr((char *)path, DIR_SEP);
-        strcat(longpath, dir_sep);
-        path = longpath;
-      }
-    }
-#endif
-  }
-  FILE * f=NULL;
-  if (! path_only)
-  {
-    struct stat statbuf;
-    if ((stat(path,&statbuf)==0)
-    && (S_ISREG(statbuf.st_mode)))
-      f = myfopen(path,mode);
-  }
-  if (where!=NULL) strcpy(where,path);
-  if ((*mode=='r') &&
-      (path[0]!=DIR_SEP) &&
-      ! (path[0] == '.' && path[1] == DIR_SEP) &&
-      (f==NULL))
-  {
-    char found = 0;
-    char* spath = feResource('s');
-    char *s;
-
-    if (where==NULL) s=(char *)omAlloc(250);
-    else             s=where;
-
-    if (spath!=NULL)
-    {
-      char *p,*q;
-      p = spath;
-      while( (q=strchr(p, fePathSep)) != NULL)
-      {
-        *q = '\0';
-        strcpy(s,p);
-        *q = fePathSep;
-        strcat(s, DIR_SEPP);
-        strcat(s, path);
-        if(!access(s, R_OK)) { found++; break; }
-        p = q+1;
-      }
-      if(!found)
-      {
-        strcpy(s,p);
-        strcat(s, DIR_SEPP);
-        strcat(s, path);
-      }
-      f=myfopen(s,mode);
-      if (f!=NULL)
-      {
-        if (where==NULL) omFree((ADDRESS)s);
-        return f;
-      }
-    }
-    else
-    {
-      if (where!=NULL) strcpy(s/*where*/,path);
-      f=myfopen(path,mode);
-    }
-    if (where==NULL) omFree((ADDRESS)s);
-  }
-  if ((f==NULL)&&(useWerror))
-    Werror("cannot open `%s`",path);
-  return f;
-}
 
 static char * feBufferStart;
@@ -1157 +1048 @@
 #endif
 
-#ifdef ix86_Win
-// Make sure that mode contains binary option
-FILE* myfopen(const char *path, const char *mode)
-{
-  char mmode[4];
-  int i;
-  int done = 0;
-
-  for (i=0;;i++)
-  {
-    mmode[i] = mode[i];
-    if (mode[i] == '\0') break;
-    if (mode[i] == 'w') done = 1;
-    if (mode[i] == 'a') done = 1;
-    if (mode[i] == 'b') done = 1;
-  }
-
-  if (! done)
-  {
-    mmode[i] = 'b';
-    mmode[i+1] = '\0';
-  }
-  return fopen(path, mmode);
-}
-#endif
-// replace "\r\n" by " \n" and "\r" by "\n"
-
-size_t myfread(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-  size_t got = fread(ptr, size, nmemb, stream) * size;
-  size_t i;
-
-  for (i=0; i<got; i++)
-  {
-    if ( ((char*) ptr)[i] == '\r')
-    {
-      if (i+1 < got && ((char*) ptr)[i+1] == '\n')
-        ((char*) ptr)[i] = ' ';
-      else
-        ((char*) ptr)[i] = '\n';
-    }
-  }
-  return got;
-}

kernel/febase.h

@@ -62 +62 @@
   #undef HAVE_FEREAD
 #endif
-
-/*
-// These are our versions of fopen and fread They are very similar to
-// the usual fopen and fread, except that on reading, they always
-// convert "\r\n" into " \n" and "\r" into "\n".
-//
-// IMPORTANT: do only use myfopen and myfread when reading text,
-// do never use fopen and fread
-*/
-#ifdef 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);
 
 enum noeof_t
@@ -230 +214 @@
 /*****************************************************************
  *
- * Resource management (feResources.cc)
- *
- *****************************************************************/
-// returns value of Resource as read-only string, or NULL
-// if Resource not found
-// issues warning, if explicitely requested (warn > 0), or
-// if warn < 0 and Resource is gotten for the first time
-// Always quiet if warn == 0
-char* feResource(const char id, int warn = -1);
-char* feResource(const char* key, int warn = -1);
-// This needs to be called before the first call to feResource
-// Initializes Resources, SearchPath, and extends PATH
-void feInitResources(char* argv0);
-// Re-inits resources, should be called after changing env. variables
-void feReInitResources();
-// Prints resources into string with StringAppend, etc
-void feStringAppendResources(int warn = -1);
-
-/*****************************************************************
- *
  * help system (fehelp.cc)
  *
@@ -273 +237 @@
 /* extern unsigned long feVersionId; */
 
-/*****************************************************************
- *
- * File Stuff
- *
- *****************************************************************/
-FILE *  feFopen(const char *path, const char *mode, char *where=NULL,
-                int useWerror=FALSE, int path_only=FALSE);
-
 char *  StringAppend(const char *fmt, ...);
 char *  StringAppendS(const char *s);