Changeset 8847e42 in git


Ignore:
Timestamp:
May 22, 2003, 7:31:02 PM (21 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
5ce6ea1255595c90d3186fd1f1dc5fc08a4d2896
Parents:
4b3fcec274d6cfd8b32685472181c25f60a6fc87
Message:
*hannes: FEREAD fix


git-svn-id: file:///usr/local/Singular/svn/trunk@6740 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Singular/febase.h

    r4b3fce r8847e42  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: febase.h,v 1.54 2003-04-24 16:55:53 Singular Exp $ */
     6/* $Id: febase.h,v 1.55 2003-05-22 17:31:02 Singular Exp $ */
    77/*
    88* ABSTRACT: basic i/o
     
    5858  #define HAVE_FEREAD 1
    5959#endif
     60#endif
     61#ifdef ix86_Linux
     62  #undef HAVE_FEREAD
    6063#endif
    6164
     
    274277extern  char * (*fe_fgets_stdin)(char *pr,char *s, int size);
    275278
    276 #ifdef HAVE_FEREAD
     279#ifdef HAVE_DYN_RL
    277280char * fe_fgets_stdin_drl(char *pr,char *s, int size);
    278281#endif
  • Singular/feread.cc

    r4b3fce r8847e42  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: feread.cc,v 1.50 2003-04-24 16:55:54 Singular Exp $ */
     4/* $Id: feread.cc,v 1.51 2003-05-22 17:30:27 Singular Exp $ */
    55/*
    66* ABSTRACT: input from ttys, simulating fgets
     
    3636
    3737#ifdef ix86_Linux
    38 #undef FEREAD
     38#undef HAVE_FEREAD
    3939// not compatible with glibc2
    4040#endif
     
    343343    if (res!=1)
    344344      Warn("dynamic loading failed: %d\n",res);
    345     #ifdef FEREAD
     345    #ifdef HAVE_FEREAD
    346346    fe_fgets_stdin=fe_fgets_stdin_emu;
    347347    #else
    348348    fe_fgets_stdin=fe_fgets;
    349349    #endif
    350     return fe_fgets_stdin_emu(pr,s,size);
     350    return fe_fgets_stdin(pr,s,size);
    351351  }
    352352
  • Singular/fereadl.c

    r4b3fce r8847e42  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: fereadl.c,v 1.24 2003-05-12 17:37:21 Singular Exp $ */
     4/* $Id: fereadl.c,v 1.25 2003-05-22 17:29:59 Singular Exp $ */
    55/*
    66* ABSTRACT: input from ttys, simulating fgets
     
    9393  #ifndef HAVE_ATEXIT
    9494    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
    9698  #else
    97     void fe_reset_fe (void)
     99    #ifdef HAVE_FEREAD
     100      void fe_reset_fe (void)
     101    #endif
    98102  #endif
    99103  {
     
    238242          tcgetattr (STDIN_FILENO, &fe_saved_attributes);
    239243        #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
    244250        #endif
    245251
     
    842848     to complete.  Otherwise it may be the name of a file in the current
    843849     directory. */
     850  char **m;
    844851  if ((*fe_rl_line_buffer)[start-1]=='"')
    845852    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);
    847854  if (m==NULL)
    848855  {
     
    945952  }
    946953#endif
    947 #if !defined(MSDOS) && (defined(HAVE_FEREAD) || defined(HAVE_DYN_RL))
     954#if !defined(MSDOS) && defined(HAVE_FEREAD)
    948955  #ifndef HAVE_ATEXIT
    949956  fe_reset_fe(NULL,NULL);
  • Singular/misc.cc

    r4b3fce r8847e42  
    607607              if (fe_fgets_stdin==fe_fgets_stdin_drl)
    608608                StringAppendS("dynamic readline,");
     609              #ifdef HAVE_FEREAD
    609610              else if (fe_fgets_stdin==fe_fgets_stdin_emu)
    610611                StringAppendS("emulated readline,");
     612              #endif
    611613              else
    612614                StringAppendS("unknown fgets method,");
Note: See TracChangeset for help on using the changeset viewer.