Changeset 8847e42 in git
- Timestamp:
- May 22, 2003, 7:31:02 PM (21 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 5ce6ea1255595c90d3186fd1f1dc5fc08a4d2896
- Parents:
- 4b3fcec274d6cfd8b32685472181c25f60a6fc87
- Location:
- Singular
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/febase.h
r4b3fce r8847e42 4 4 * Computer Algebra System SINGULAR * 5 5 ****************************************/ 6 /* $Id: febase.h,v 1.5 4 2003-04-24 16:55:53Singular Exp $ */6 /* $Id: febase.h,v 1.55 2003-05-22 17:31:02 Singular Exp $ */ 7 7 /* 8 8 * ABSTRACT: basic i/o … … 58 58 #define HAVE_FEREAD 1 59 59 #endif 60 #endif 61 #ifdef ix86_Linux 62 #undef HAVE_FEREAD 60 63 #endif 61 64 … … 274 277 extern char * (*fe_fgets_stdin)(char *pr,char *s, int size); 275 278 276 #ifdef HAVE_ FEREAD279 #ifdef HAVE_DYN_RL 277 280 char * fe_fgets_stdin_drl(char *pr,char *s, int size); 278 281 #endif -
Singular/feread.cc
r4b3fce r8847e42 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: feread.cc,v 1.5 0 2003-04-24 16:55:54Singular Exp $ */4 /* $Id: feread.cc,v 1.51 2003-05-22 17:30:27 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT: input from ttys, simulating fgets … … 36 36 37 37 #ifdef ix86_Linux 38 #undef FEREAD38 #undef HAVE_FEREAD 39 39 // not compatible with glibc2 40 40 #endif … … 343 343 if (res!=1) 344 344 Warn("dynamic loading failed: %d\n",res); 345 #ifdef FEREAD345 #ifdef HAVE_FEREAD 346 346 fe_fgets_stdin=fe_fgets_stdin_emu; 347 347 #else 348 348 fe_fgets_stdin=fe_fgets; 349 349 #endif 350 return fe_fgets_stdin _emu(pr,s,size);350 return fe_fgets_stdin(pr,s,size); 351 351 } 352 352 -
Singular/fereadl.c
r4b3fce r8847e42 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: fereadl.c,v 1.2 4 2003-05-12 17:37:21Singular Exp $ */4 /* $Id: fereadl.c,v 1.25 2003-05-22 17:29:59 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT: input from ttys, simulating fgets … … 93 93 #ifndef HAVE_ATEXIT 94 94 int on_exit(void (*f)(int, void *), void *arg); 95 void fe_reset_fe (int i, void *v) 95 #ifdef HAVE_FEREAD 96 void fe_reset_fe (int i, void *v) 97 #endif 96 98 #else 97 void fe_reset_fe (void) 99 #ifdef HAVE_FEREAD 100 void fe_reset_fe (void) 101 #endif 98 102 #endif 99 103 { … … 238 242 tcgetattr (STDIN_FILENO, &fe_saved_attributes); 239 243 #endif 240 #ifdef HAVE_ATEXIT 241 atexit(fe_reset_fe); 242 #else 243 on_exit(fe_reset_fe,NULL); 244 #ifdef HAVE_FEREAD 245 #ifdef HAVE_ATEXIT 246 atexit(fe_reset_fe); 247 #else 248 on_exit(fe_reset_fe,NULL); 249 #endif 244 250 #endif 245 251 … … 842 848 to complete. Otherwise it may be the name of a file in the current 843 849 directory. */ 850 char **m; 844 851 if ((*fe_rl_line_buffer)[start-1]=='"') 845 852 return (*fe_completion_matches) (text, *fe_filename_completion_function); 846 char **m=(*fe_completion_matches) (text, command_generator);853 m=(*fe_completion_matches) (text, command_generator); 847 854 if (m==NULL) 848 855 { … … 945 952 } 946 953 #endif 947 #if !defined(MSDOS) && (defined(HAVE_FEREAD) || defined(HAVE_DYN_RL))954 #if !defined(MSDOS) && defined(HAVE_FEREAD) 948 955 #ifndef HAVE_ATEXIT 949 956 fe_reset_fe(NULL,NULL); -
Singular/misc.cc
r4b3fce r8847e42 607 607 if (fe_fgets_stdin==fe_fgets_stdin_drl) 608 608 StringAppendS("dynamic readline,"); 609 #ifdef HAVE_FEREAD 609 610 else if (fe_fgets_stdin==fe_fgets_stdin_emu) 610 611 StringAppendS("emulated readline,"); 612 #endif 611 613 else 612 614 StringAppendS("unknown fgets method,");
Note: See TracChangeset
for help on using the changeset viewer.