[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.33 and 1.34

version 1.33, 2003/03/07 06:39:59 version 1.34, 2003/04/02 09:43:33
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.32 2003/03/07 03:12:31 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.33 2003/03/07 06:39:59 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "al.h"  #include "al.h"
Line 61 
Line 61 
 #if defined(VISUAL)  #if defined(VISUAL)
 #include <io.h>  #include <io.h>
 #include <direct.h>  #include <direct.h>
   #else
   #include <unistd.h>
   #include <string.h>
   #include <stdio.h>
 #endif  #endif
   
 #if defined(SYSV) && !defined(_IBMR2)  #if defined(SYSV) && !defined(_IBMR2)
Line 130  struct oF oF_TRUE,oF_FALSE;
Line 134  struct oF oF_TRUE,oF_FALSE;
 F F_TRUE = &oF_TRUE;  F F_TRUE = &oF_TRUE;
 F F_FALSE = &oF_FALSE;  F F_FALSE = &oF_FALSE;
   
 #if defined(__SVR4) && defined(sun)  
 char cppname[BUFSIZ] = "/usr/ccs/lib/cpp ";  
 #else  
 #if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__)  
 char cppname[BUFSIZ] = "/usr/bin/cpp ";  
 #else  
 #if defined(VISUAL)  #if defined(VISUAL)
 char cppname[BUFSIZ] = "c:\\asir\\stdlib\\cpp ";  char cppname[BUFSIZ] = "c:\\asir\\stdlib\\cpp ";
 #else  #else
 char cppname[BUFSIZ] = "/lib/cpp ";  char cppname[BUFSIZ] = "/lib/cpp ";
 #endif  #endif
 #endif  
 #endif  
 char asirname[BUFSIZ];  char asirname[BUFSIZ];
 char displayname[BUFSIZ];  char displayname[BUFSIZ];
   
Line 251  void prompt() {
Line 247  void prompt() {
 void sprompt(char *ptr)  void sprompt(char *ptr)
 {  {
         sprintf(ptr,"[%d] ",APVS->n);          sprintf(ptr,"[%d] ",APVS->n);
   }
   
   #if !defined(VISUAL)
   static int which(char *prog, char *path, char *buf, size_t size)
   {
       char *tok;
       char delim[] = ":";
       char *path2  = malloc(strlen(path)+1);
       char *name   = malloc(size);
       int  proglen = strlen(prog)+3; /* "/" + prog + " \0" */
   
       if (!name || !path2) {
           return 0;
       }
       strcpy(path2, path);
       tok = strtok(path2, delim);
       while (tok != NULL) {
           if (size >= strlen(tok)) {
               sprintf(name, "%s/%s", tok, prog);
               if (access(name, X_OK&R_OK) == 0) {
                   strcpy(buf, name);
                   strcat(buf, " ");
                   free(path2); free(name);
                   return 1;
               }
               tok = strtok(NULL, delim);
           }
       }
       free(path2); free(name);
       return 0;
   }
   #endif
   
   void cppname_init()
   {
   #if !defined(VISUAL)
       if (access(cppname, X_OK&R_OK) != 0) {
           which("cpp", "/lib:/usr/ccs/lib:/usr/bin", cppname, BUFSIZ) ||
           which("cpp", getenv("PATH"), cppname, BUFSIZ);
       }
   #endif
 }  }
   
 FILE *in_fp;  FILE *in_fp;
Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>