[BACK]Return to glob.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / parse

Diff for /OpenXM_contrib2/asir2000/parse/glob.c between version 1.75 and 1.78

version 1.75, 2009/02/05 08:37:02 version 1.78, 2010/08/01 08:44:15
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.74 2008/03/19 07:05:56 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.77 2010/05/26 06:32:49 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "al.h"  #include "al.h"
Line 318  static int which(char *prog, char *path, char *buf, si
Line 318  static int which(char *prog, char *path, char *buf, si
 void cppname_init()  void cppname_init()
 {  {
 #if !defined(VISUAL)  #if !defined(VISUAL)
     if (access(cppname, X_OK&R_OK) != 0) {      char oxcpp[BUFSIZ];
       if(which("ox_cpp", getenv("PATH"), oxcpp, BUFSIZ) && access(oxcpp, X_OK&R_OK) == 0) {
           strncpy(cppname,oxcpp,BUFSIZ-1);
       }else if (access(cppname, X_OK&R_OK) != 0) {
         which("cpp", "/lib:/usr/ccs/lib:/usr/bin", cppname, BUFSIZ) ||          which("cpp", "/lib:/usr/ccs/lib:/usr/bin", cppname, BUFSIZ) ||
         which("cpp", getenv("PATH"), cppname, BUFSIZ);          which("cpp", getenv("PATH"), cppname, BUFSIZ);
     }      }
Line 529  void int_handler(int sig)
Line 532  void int_handler(int sig)
   
                 fprintf(stderr,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stderr);                  fprintf(stderr,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stderr);
                 buf[0] = '\n';                  buf[0] = '\n';
                 while ( buf[0] == '\n' )                  while ( !feof(stdin) && buf[0] == '\n' )
                         fgets(buf,BUFSIZ,stdin);                          fgets(buf,BUFSIZ,stdin);
                   if ( feof(stdin) ) {
                           clearerr(stdin);
                           continue;
                   }
                 switch ( c = buf[0] ) {                  switch ( c = buf[0] ) {
                         case 'q':                          case 'q':
                                 while ( 1 ) {                                  while ( 1 ) {
Line 774  char *get_asir_distribution();
Line 781  char *get_asir_distribution();
 char *get_gcversion()  char *get_gcversion()
 {  {
 #if defined(GC7)  #if defined(GC7)
         return "GC 7.0 copyright 1988-2007, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";          return "GC 7.1 copyright 1988-2008, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
 #else  #else
         return "GC 6.8 copyright 1988-2006, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";          return "GC 6.8 copyright 1988-2006, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
 #endif  #endif

Legend:
Removed from v.1.75  
changed lines
  Added in v.1.78

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>