Changeset 1d77df in git for kernel/febase.cc

Timestamp:

Nov 20, 2009, 6:57:14 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

894e1744dd6e6d675a7c9d8a10fe3f6051ca84b8

Parents:

e2e3ad8f623ca6b9cc80a9bab430038d51d0e8e7

Message:

*hannes: handle very long input lines better

git-svn-id: file:///usr/local/Singular/svn/trunk@12310 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/febase.cc (modified) (4 diffs)

kernel/febase.cc

@@ -18 +18 @@
 #include <ctype.h>
 #include <unistd.h>
-#ifdef NeXT
-#include <sys/file.h>
-#endif
 
 #ifdef HAVE_PWD_H
@@ -36 +33 @@
 char fe_promptstr[] ="  ";
 
+// output/print buffer:
 #define INITIAL_PRINT_BUFFER 24*1024L
+// line buffer for reading:
+// minimal value for MAX_FILE_BUFFER: 4*4096 - see Tst/Long/gcd0_l.tst
+// this is an upper limit for the size of monomials/numbers read via the interpreter
+#define MAX_FILE_BUFFER 4*4096
 static long feBufferLength=INITIAL_PRINT_BUFFER;
 static char * feBuffer=(char *)omAlloc(INITIAL_PRINT_BUFFER);
@@ -594 +596 @@
       if (currentVoice->buffer==NULL)
       {
-        currentVoice->buffer=(char *)omAlloc(4096-sizeof(ADDRESS));
+        currentVoice->buffer=(char *)omAlloc(MAX_FILE_BUFFER-sizeof(ADDRESS));
         omMarkAsStaticAddr(currentVoice->buffer);
       }
@@ -606 +608 @@
       s=fe_fgets_stdin(fe_promptstr,
                        &(currentVoice->buffer[offset]),
-                       (4096-1-sizeof(ADDRESS))-offset);
+                       omSizeOfAddr(currentVoice->buffer)-1-offset);
       int i=0;
       if (s!=NULL)
-        while((s[i]!='\0') && (i<4096)) {s[i] &= (char)127;i++;}
+        while((s[i]!='\0') /*&& (i<MAX_FILE_BUFFER)*/) {s[i] &= (char)127;i++;}
     }
     else if (currentVoice->sw==BI_file)
     {
-#ifdef DEFECT_SINGULAR
-      feShowPrompt();
-      s=fe_fgets_stdin(fe_promptstr,
-                       &(currentVoice->buffer[offset]),
-                       (4096-1-sizeof(ADDRESS))-offset);
-      int i=0;
-      if (s!=NULL)
-        while((s[i]!='\0') && (i<4096)) {s[i] &= (char)127;i++;}
-#else
-      s=fgets(currentVoice->buffer+offset,(4096-1-sizeof(ADDRESS))-offset,
+      s=fgets(currentVoice->buffer+offset,(MAX_FILE_BUFFER-1-sizeof(ADDRESS))-offset,
               currentVoice->files);
-#endif
     }
     //else /* BI_buffer */ s==NULL  => return 0